Don't conditionalize prototypes; delete macros supporting it. (Maybe overdone;

don't worry about restoring them when importing new versions of code.)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13792 dc483132-0cff-0310-8789-dd5450dbe970

191 files changed, 2848 insertions, 2866 deletions

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 8a6f53a..ef35cc9 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* krlogin.c: Make prototypes unconditional.
+
 2001-09-13  Ken Raeburn  <raeburn@mit.edu>
 
 	* krlogin.c (try_normal): Permit "rsh" as well as "rlogin" as the
diff --git a/src/appl/bsd/krlogin.c b/src/appl/bsd/krlogin.c
index 88151d9..60d31f6 100644
--- a/src/appl/bsd/krlogin.c
+++ b/src/appl/bsd/krlogin.c
@@ -257,11 +257,11 @@ struct	winsize winsize;
 char	*host=0;			/* external, so it can be
 					   reached from confirm_death() */
 
-krb5_sigtype	sigwinch KRB5_PROTOTYPE((int));
-int server_message KRB5_PROTOTYPE((int));
-void oob KRB5_PROTOTYPE((void));
-krb5_sigtype	lostpeer KRB5_PROTOTYPE((int));
-void setsignal KRB5_PROTOTYPE((int sig, krb5_sigtype (*act)()));
+krb5_sigtype	sigwinch (int);
+int server_message (int);
+void oob (void);
+krb5_sigtype	lostpeer (int);
+void setsignal (int sig, krb5_sigtype (*act)());
 static int read_wrapper(int fd, char *buf, int size, int *got_esc);
 static void prf(char *f);
 void try_normal(char **);
@@ -784,8 +784,8 @@ static int confirm_death ()
 #define CRLF "\r\n"
 
 int	child;
-krb5_sigtype	catchild KRB5_PROTOTYPE((int));
-krb5_sigtype	writeroob KRB5_PROTOTYPE((int));
+krb5_sigtype	catchild (int);
+krb5_sigtype	writeroob (int);
 
 int	defflags, tabflag;
 int	deflflags;
diff --git a/src/appl/gss-sample/ChangeLog b/src/appl/gss-sample/ChangeLog
index 11cab8b..7a65670 100644
--- a/src/appl/gss-sample/ChangeLog
+++ b/src/appl/gss-sample/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* gss-misc.c, gss-misc.h: Make prototypes unconditional.
+
 2001-09-01  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (SRCS): Use srcdir.
diff --git a/src/appl/gss-sample/gss-misc.c b/src/appl/gss-sample/gss-misc.c
index 9af6db4..78e5d2f 100644
--- a/src/appl/gss-sample/gss-misc.c
+++ b/src/appl/gss-sample/gss-misc.c
@@ -54,7 +54,7 @@ gss_buffer_desc empty_token_buf = { 0, (void *) "" };
 gss_buffer_t empty_token = &empty_token_buf;
 
 static void display_status_1
-	PROTOTYPE( (char *m, OM_uint32 code, int type) );
+	(char *m, OM_uint32 code, int type);
 
 static int write_all(int fildes, char *buf, unsigned int nbyte)
 {
diff --git a/src/appl/gss-sample/gss-misc.h b/src/appl/gss-sample/gss-misc.h
index 82c55bd..35b3b73 100644
--- a/src/appl/gss-sample/gss-misc.h
+++ b/src/appl/gss-sample/gss-misc.h
@@ -33,15 +33,15 @@
 extern FILE *display_file;
 
 int send_token
-	PROTOTYPE( (int s, int flags, gss_buffer_t tok) );
+	(int s, int flags, gss_buffer_t tok);
 int recv_token
-	PROTOTYPE( (int s, int *flags, gss_buffer_t tok) );
+	(int s, int *flags, gss_buffer_t tok);
 void display_status
-	PROTOTYPE( (char *msg, OM_uint32 maj_stat, OM_uint32 min_stat) );
+	(char *msg, OM_uint32 maj_stat, OM_uint32 min_stat);
 void display_ctx_flags
-	PROTOTYPE( (OM_uint32 flags) );
+	(OM_uint32 flags);
 void print_token
-	PROTOTYPE( (gss_buffer_t tok) );
+	(gss_buffer_t tok);
 
 /* Token types */
 #define TOKEN_NOOP		(1<<0)
diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog
index 5d774f5..d831b2a 100644
--- a/src/appl/gssftp/ftp/ChangeLog
+++ b/src/appl/gssftp/ftp/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* cmds.c, ftp.c, ftp_var.h, glob.c, main.c, ruserpass.c, secure.c,
+	secure.h: Make prototypes unconditional.  Don't define PROTOTYPE
+	macro.
+
 2001-08-21  Ken Raeburn  <raeburn@mit.edu>
 
 	* glob.c (amatch, case '*'): Treat multiple asterisks the same as
diff --git a/src/appl/gssftp/ftp/cmds.c b/src/appl/gssftp/ftp/cmds.c
index 4a242d6..807da58 100644
--- a/src/appl/gssftp/ftp/cmds.c
+++ b/src/appl/gssftp/ftp/cmds.c
@@ -92,13 +92,13 @@ jmp_buf jabort;
 extern	char *auth_type;
 extern int do_auth();
 
-static int globulize PROTOTYPE((char **));
-static int confirm PROTOTYPE((char *, char *));
-static int getit PROTOTYPE((int, char **, int, char *));
-static sigtype mabort PROTOTYPE((int));
-static void quote1 PROTOTYPE((char *, int, char **));
-static char *dotrans PROTOTYPE((char *));
-static char *domap PROTOTYPE((char *));
+static int globulize (char **);
+static int confirm (char *, char *);
+static int getit (int, char **, int, char *);
+static sigtype mabort (int);
+static void quote1 (char *, int, char **);
+static char *dotrans (char *);
+static char *domap (char *);
 
 /*
  * `Another' gets another argument, and stores the new argc and argv.
diff --git a/src/appl/gssftp/ftp/ftp.c b/src/appl/gssftp/ftp/ftp.c
index e5027da..610318b 100644
--- a/src/appl/gssftp/ftp/ftp.c
+++ b/src/appl/gssftp/ftp/ftp.c
@@ -154,15 +154,15 @@ unsigned char *ucbuf;
 #include "secure.h"
 
 #ifdef GSSAPI
-void user_gss_error PROTOTYPE((OM_uint32, OM_uint32, char *));
+void user_gss_error (OM_uint32, OM_uint32, char *);
 #endif
 
-static void proxtrans PROTOTYPE((char *, char *, char *));
-static int initconn PROTOTYPE((void));
-static void ptransfer PROTOTYPE((char *, long, struct timeval *, struct timeval *));
-static void abort_remote PROTOTYPE((FILE *));
-static void tvsub PROTOTYPE((struct timeval *, struct timeval *, struct timeval *));
-static char *gunique PROTOTYPE((char *));
+static void proxtrans (char *, char *, char *);
+static int initconn (void);
+static void ptransfer (char *, long, struct timeval *, struct timeval *);
+static void abort_remote (FILE *);
+static void tvsub (struct timeval *, struct timeval *, struct timeval *);
+static char *gunique (char *);
 
 struct	sockaddr_in hisctladdr;
 struct	sockaddr_in hisdataaddr;
@@ -190,7 +190,7 @@ extern int connected;
 #define herror()	printf("unknown host\n")
 
 FILE	*cin, *cout;
-FILE	*dataconn PROTOTYPE((char *));
+FILE	*dataconn (char *);
 
 char *
 hookup(host, port)
diff --git a/src/appl/gssftp/ftp/ftp_var.h b/src/appl/gssftp/ftp/ftp_var.h
index 0f95ca4..469e506 100644
--- a/src/appl/gssftp/ftp/ftp_var.h
+++ b/src/appl/gssftp/ftp/ftp_var.h
@@ -173,114 +173,110 @@ extern	char *mktemp();
 
 extern int command(char *, ...);
 
-#ifndef PROTOTYPE
-#define PROTOTYPE(x) x
-#endif
-
-char *remglob PROTOTYPE((char **, int));
-int another PROTOTYPE((int *, char ***, char *));
-void makeargv PROTOTYPE((void));
-void setpeer PROTOTYPE((int, char **));
-void setclevel PROTOTYPE((int, char **));
-void setdlevel PROTOTYPE((int, char **));
-void ccc PROTOTYPE((void));
-void setclear PROTOTYPE((void));
-void setsafe PROTOTYPE((void));
-void setprivate PROTOTYPE((void));
-void settype PROTOTYPE((int, char **));
-void changetype PROTOTYPE((int, int));
-void setbinary PROTOTYPE((void));
-void setascii PROTOTYPE((void));
-void settenex PROTOTYPE((void));
-void set_mode  PROTOTYPE((int, char **));
-void setform  PROTOTYPE((int, char **));
-void setstruct  PROTOTYPE((int, char **));
-void siteidle  PROTOTYPE((int, char **));
-void put  PROTOTYPE((int, char **));
-void mput  PROTOTYPE((int, char **));
-void reget  PROTOTYPE((int, char **));
-void get  PROTOTYPE((int, char **));
-void mget  PROTOTYPE((int, char **));
-void status  PROTOTYPE((int, char **));
-void setbell PROTOTYPE((void));
-void settrace PROTOTYPE((void));
-void sethash PROTOTYPE((void));
-void setverbose PROTOTYPE((void));
-void setport PROTOTYPE((void));
-void setprompt PROTOTYPE((void));
-void setglob PROTOTYPE((void));
-void setdebug PROTOTYPE((int, char **));
-void cd PROTOTYPE((int, char **));
-void lcd PROTOTYPE((int, char **));
-void delete_file PROTOTYPE((int, char **));
-void mdelete PROTOTYPE((int, char **));
-void renamefile PROTOTYPE((int, char **));
-void ls PROTOTYPE((int, char **));
-void mls PROTOTYPE((int, char **));
-void shell PROTOTYPE((int, char **));
-void user PROTOTYPE((int, char **));
-void pwd PROTOTYPE((void));
-void makedir PROTOTYPE((int, char **));
-void removedir PROTOTYPE((int, char **));
-void quote PROTOTYPE((int, char **));
-void site PROTOTYPE((int, char **));
-void do_chmod PROTOTYPE((int, char **));
-void do_umask PROTOTYPE((int, char **));
-void setidle PROTOTYPE((int, char **));
-void rmthelp PROTOTYPE((int, char **));
-void quit PROTOTYPE((void));
-void disconnect PROTOTYPE((void));
-void fatal PROTOTYPE((char *));
-void account PROTOTYPE((int, char **));
-void doproxy PROTOTYPE((int, char **));
-void setcase PROTOTYPE((void));
-void setcr PROTOTYPE((void));
-void setntrans PROTOTYPE((int, char **));
-void setnmap PROTOTYPE((int, char **));
-void setsunique PROTOTYPE((void));
-void setrunique PROTOTYPE((void));
-void cdup PROTOTYPE((void));
-void restart PROTOTYPE((int, char **));
-void syst PROTOTYPE((void));
-void macdef PROTOTYPE((int, char **));
-void sizecmd PROTOTYPE((int, char **));
-void modtime PROTOTYPE((int, char **));
-void rmtstatus PROTOTYPE((int, char **));
-void newer PROTOTYPE((int, char **));
-void setpassive PROTOTYPE((void));
+char *remglob (char **, int);
+int another (int *, char ***, char *);
+void makeargv (void);
+void setpeer (int, char **);
+void setclevel (int, char **);
+void setdlevel (int, char **);
+void ccc (void);
+void setclear (void);
+void setsafe (void);
+void setprivate (void);
+void settype (int, char **);
+void changetype (int, int);
+void setbinary (void);
+void setascii (void);
+void settenex (void);
+void set_mode  (int, char **);
+void setform  (int, char **);
+void setstruct  (int, char **);
+void siteidle  (int, char **);
+void put  (int, char **);
+void mput  (int, char **);
+void reget  (int, char **);
+void get  (int, char **);
+void mget  (int, char **);
+void status  (int, char **);
+void setbell (void);
+void settrace (void);
+void sethash (void);
+void setverbose (void);
+void setport (void);
+void setprompt (void);
+void setglob (void);
+void setdebug (int, char **);
+void cd (int, char **);
+void lcd (int, char **);
+void delete_file (int, char **);
+void mdelete (int, char **);
+void renamefile (int, char **);
+void ls (int, char **);
+void mls (int, char **);
+void shell (int, char **);
+void user (int, char **);
+void pwd (void);
+void makedir (int, char **);
+void removedir (int, char **);
+void quote (int, char **);
+void site (int, char **);
+void do_chmod (int, char **);
+void do_umask (int, char **);
+void setidle (int, char **);
+void rmthelp (int, char **);
+void quit (void);
+void disconnect (void);
+void fatal (char *);
+void account (int, char **);
+void doproxy (int, char **);
+void setcase (void);
+void setcr (void);
+void setntrans (int, char **);
+void setnmap (int, char **);
+void setsunique (void);
+void setrunique (void);
+void cdup (void);
+void restart (int, char **);
+void syst (void);
+void macdef (int, char **);
+void sizecmd (int, char **);
+void modtime (int, char **);
+void rmtstatus (int, char **);
+void newer (int, char **);
+void setpassive (void);
 
 /* ftp.c */
-void sendrequest PROTOTYPE((char *, char *, char *, int));
-void recvrequest PROTOTYPE((char *, char *volatile, char *, char *, int));
-int login PROTOTYPE((char *));
-void setpbsz PROTOTYPE((unsigned int));
-void pswitch PROTOTYPE((int));
-int getreply PROTOTYPE((int));
-void reset PROTOTYPE((void));
-char *hookup PROTOTYPE((char *, int));
-int do_auth PROTOTYPE((void));
+void sendrequest (char *, char *, char *, int);
+void recvrequest (char *, char *volatile, char *, char *, int);
+int login (char *);
+void setpbsz (unsigned int);
+void pswitch (int);
+int getreply (int);
+void reset (void);
+char *hookup (char *, int);
+int do_auth (void);
 
 /* glob.c */
-void blkfree PROTOTYPE((char **));
+void blkfree (char **);
 
 /* domacro.c */
-void domacro PROTOTYPE((int, char **));
+void domacro (int, char **);
 
 
 /* main.c */
-void help PROTOTYPE((int, char **));
-struct cmd *getcmd PROTOTYPE((char *));
+void help (int, char **);
+struct cmd *getcmd (char *);
 
 
 /* ruserpass.c */
-int ruserpass PROTOTYPE((char *, char **, char **, char **));
+int ruserpass (char *, char **, char **, char **);
 
 /* radix.h */
-int radix_encode PROTOTYPE((unsigned char *, unsigned char *, int *, int));
-char *radix_error PROTOTYPE((int));
+int radix_encode (unsigned char *, unsigned char *, int *, int);
+char *radix_error (int);
 
 /* getpass.c */
-char *mygetpass PROTOTYPE((char *));
+char *mygetpass (char *);
 
 /* glob.c */
-char **ftpglob PROTOTYPE((char *));
+char **ftpglob (char *);
diff --git a/src/appl/gssftp/ftp/glob.c b/src/appl/gssftp/ftp/glob.c
index 4b760f2..b33de3a 100644
--- a/src/appl/gssftp/ftp/glob.c
+++ b/src/appl/gssftp/ftp/glob.c
@@ -81,22 +81,22 @@ static	short gflag;
 char	**ftpglob();
 char	*globerr;
 char	*home;
-static	char *strspl PROTOTYPE((char *, char *)), *strend PROTOTYPE((char *));
-char	**copyblk PROTOTYPE((char **));
-
-static void acollect PROTOTYPE((char *)), addpath PROTOTYPE((int)), 
-  collect PROTOTYPE((char *)), expand PROTOTYPE((char *)), 
-  Gcat PROTOTYPE((char *, char *));
-static void ginit PROTOTYPE((char **)), matchdir PROTOTYPE((char *)),
-  rscan PROTOTYPE((char **, int (*f)())), sort PROTOTYPE((void));
-static int amatch PROTOTYPE((char *, char *)), 
-  execbrc PROTOTYPE((char *, char *)), match PROTOTYPE((char *, char *));
-static int digit PROTOTYPE((int)), letter PROTOTYPE((int)),
-  any PROTOTYPE((int, char *));
+static	char *strspl (char *, char *), *strend (char *);
+char	**copyblk (char **);
+
+static void acollect (char *), addpath (int), 
+  collect (char *), expand (char *), 
+  Gcat (char *, char *);
+static void ginit (char **), matchdir (char *),
+  rscan (char **, int (*f)()), sort (void);
+static int amatch (char *, char *), 
+  execbrc (char *, char *), match (char *, char *);
+static int digit (int), letter (int),
+  any (int, char *);
 #ifndef _WIN32
-static int gethdir PROTOTYPE((char *));
+static int gethdir (char *);
 #endif
-static int tglob PROTOTYPE((int ));
+static int tglob (int );
 
 static	int globcnt;
 
diff --git a/src/appl/gssftp/ftp/main.c b/src/appl/gssftp/ftp/main.c
index 4f2cc59..1b0ae85 100644
--- a/src/appl/gssftp/ftp/main.c
+++ b/src/appl/gssftp/ftp/main.c
@@ -82,7 +82,7 @@ static char sccsid[] = "@(#)main.c	5.18 (Berkeley) 3/1/91";
 uid_t	getuid();
 #endif
 
-sigtype	intr PROTOTYPE((int)), lostpeer PROTOTYPE((int));
+sigtype	intr (int), lostpeer (int);
 extern	char *home;
 char	*getlogin();
 #ifdef KRB5_KRB4_COMPAT
@@ -91,8 +91,8 @@ struct servent staticsp;
 extern char realm[];
 #endif /* KRB5_KRB4_COMPAT */
 
-static void cmdscanner PROTOTYPE((int));
-static char *slurpstring PROTOTYPE((void));
+static void cmdscanner (int);
+static char *slurpstring (void);
 
 
 int 
diff --git a/src/appl/gssftp/ftp/ruserpass.c b/src/appl/gssftp/ftp/ruserpass.c
index fb9c723..acfabfa 100644
--- a/src/appl/gssftp/ftp/ruserpass.c
+++ b/src/appl/gssftp/ftp/ruserpass.c
@@ -57,7 +57,7 @@ static char sccsid[] = "@(#)ruserpass.c	5.3 (Berkeley) 3/1/91";
 #define MAXHOSTNAMELEN 64
 #endif
 
-static int token PROTOTYPE((void));
+static int token (void);
 static	FILE *cfile;
 
 #define	DEFAULT	1
diff --git a/src/appl/gssftp/ftp/secure.c b/src/appl/gssftp/ftp/secure.c
index 95c6ec8..d23e358 100644
--- a/src/appl/gssftp/ftp/secure.c
+++ b/src/appl/gssftp/ftp/secure.c
@@ -58,7 +58,7 @@ typedef unsigned long ftp_uint32;
 typedef long ftp_int32;
 #endif
 
-static int secure_putbuf PROTOTYPE((int, unsigned char *, unsigned int));
+static int secure_putbuf (int, unsigned char *, unsigned int);
 
 extern struct	sockaddr_in hisaddr;
 extern struct	sockaddr_in myaddr;
diff --git a/src/appl/gssftp/ftp/secure.h b/src/appl/gssftp/ftp/secure.h
index 458daef..5d1bd0b 100644
--- a/src/appl/gssftp/ftp/secure.h
+++ b/src/appl/gssftp/ftp/secure.h
@@ -5,15 +5,11 @@
 #define myaddr		data_addr
 #define hisaddr		hisdataaddr
 
-#ifndef PROTOTYPE
-#define PROTOTYPE(x) x
-#endif
-
-int secure_flush PROTOTYPE((int));
-int secure_putc PROTOTYPE((int, FILE *));
-int secure_getc PROTOTYPE((FILE *));
-int secure_write PROTOTYPE((int, unsigned char *, unsigned int));
-int secure_read PROTOTYPE((int, char *, unsigned int));
-void secure_gss_error PROTOTYPE((OM_uint32 maj_stat, OM_uint32 min_stat, char *s));
+int secure_flush (int);
+int secure_putc (int, FILE *);
+int secure_getc (FILE *);
+int secure_write (int, unsigned char *, unsigned int);
+int secure_read (int, char *, unsigned int);
+void secure_gss_error (OM_uint32 maj_stat, OM_uint32 min_stat, char *s);
 
 void secure_error(char *, ...);
diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog
index 3d358c2..ebec349 100644
--- a/src/appl/gssftp/ftpd/ChangeLog
+++ b/src/appl/gssftp/ftpd/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* ftpd_var.h, secure.h: Make prototypes unconditional.
+
 2001-08-03  Mitchell Berger  <mitchb@mit.edu>
 
 	* ftpd.M: Update the usage line and option descriptions to be in sync
diff --git a/src/appl/gssftp/ftpd/ftpd_var.h b/src/appl/gssftp/ftpd/ftpd_var.h
index 72580e7..07fb14a 100644
--- a/src/appl/gssftp/ftpd/ftpd_var.h
+++ b/src/appl/gssftp/ftpd/ftpd_var.h
@@ -38,8 +38,8 @@
 #endif
 
 /* radix.c */
-char *radix_error PROTOTYPE((int));
-int radix_encode PROTOTYPE((unsigned char *, unsigned char *, int *, int));
+char *radix_error (int);
+int radix_encode (unsigned char *, unsigned char *, int *, int);
 
 /* ftpd.c */
 void ack(char *);
diff --git a/src/appl/gssftp/ftpd/secure.h b/src/appl/gssftp/ftpd/secure.h
index 2a0cb9d..97fd0c7 100644
--- a/src/appl/gssftp/ftpd/secure.h
+++ b/src/appl/gssftp/ftpd/secure.h
@@ -5,12 +5,12 @@
 #define myaddr		data_source
 #define hisaddr		data_dest
 
-int secure_flush PROTOTYPE((int));
-int secure_putc PROTOTYPE((int, FILE *));
-int secure_getc PROTOTYPE((FILE *));
-int secure_write PROTOTYPE((int, unsigned char *, unsigned int));
-int secure_read PROTOTYPE((int, char *, unsigned int));
-void secure_gss_error PROTOTYPE((OM_uint32 maj_stat, OM_uint32 min_stat, char *s));
+int secure_flush (int);
+int secure_putc (int, FILE *);
+int secure_getc (FILE *);
+int secure_write (int, unsigned char *, unsigned int);
+int secure_read (int, char *, unsigned int);
+void secure_gss_error (OM_uint32 maj_stat, OM_uint32 min_stat, char *s);
 
 #if defined(STDARG) || (defined(__STDC__) && ! defined(VARARGS)) || defined(HAVE_STDARG_H)
 void secure_error(char *, ...);
diff --git a/src/appl/simple/client/ChangeLog b/src/appl/simple/client/ChangeLog
index ada2764..b1d04e3 100644
--- a/src/appl/simple/client/ChangeLog
+++ b/src/appl/simple/client/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* sim_client.c: Make prototypes unconditional.
+
 2001-06-18  Ezra Peisach  <epeisach@mit.edu>
 
 	* sim_client.c (main): Cast argument to isupper()/tolower() to int.
diff --git a/src/appl/simple/client/sim_client.c b/src/appl/simple/client/sim_client.c
index 6da92fa..32750e5 100644
--- a/src/appl/simple/client/sim_client.c
+++ b/src/appl/simple/client/sim_client.c
@@ -57,7 +57,7 @@ extern char *malloc();
 
 #define MSG "hi there!"			/* message text */
 
-void usage KRB5_PROTOTYPE((char *));
+void usage (char *);
 
 void
 usage(name)
diff --git a/src/appl/telnet/libtelnet/ChangeLog b/src/appl/telnet/libtelnet/ChangeLog
index 67c3a18..37af30f 100644
--- a/src/appl/telnet/libtelnet/ChangeLog
+++ b/src/appl/telnet/libtelnet/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* auth-proto.h, auth.h, enc-proto.h, enc_des.c, encrypt.c,
+	encrypt.h, kerberos.c, key-proto.h, misc-proto.h, misc.h,
+	setenv.c: Make prototypes unconditional.  Don't define P().
+
 2001-07-23  Ezra Peisach  <epeisach@mit.edu>
 
 	* enc_des.c (fb64_start): Remove variable set but never used.
diff --git a/src/appl/telnet/libtelnet/auth-proto.h b/src/appl/telnet/libtelnet/auth-proto.h
index 16a827c..17a6b78 100644
--- a/src/appl/telnet/libtelnet/auth-proto.h
+++ b/src/appl/telnet/libtelnet/auth-proto.h
@@ -56,59 +56,51 @@
  * or implied warranty.
  */
 
-#if	!defined(P)
-#ifdef	__STDC__
-#define	P(x)	x
-#else
-#define	P(x)	()
-#endif
-#endif
-
 #if	defined(AUTHENTICATION)
-Authenticator *findauthenticator P((int, int));
+Authenticator *findauthenticator (int, int);
 
-void auth_init P((char *, int));
-int auth_cmd P((int, char **));
-void auth_request P((void));
-void auth_send P((unsigned char *, int));
-void auth_send_retry P((void));
-void auth_is P((unsigned char *, int));
-void auth_reply P((unsigned char *, int));
-void auth_finished P((Authenticator *, int));
-int auth_wait P((char *));
-int auth_must_encrypt P((void));
-void auth_disable_name P((char *));
-void auth_gen_printsub P((unsigned char *, int, unsigned char *, int));
+void auth_init (char *, int);
+int auth_cmd (int, char **);
+void auth_request (void);
+void auth_send (unsigned char *, int);
+void auth_send_retry (void);
+void auth_is (unsigned char *, int);
+void auth_reply (unsigned char *, int);
+void auth_finished (Authenticator *, int);
+int auth_wait (char *);
+int auth_must_encrypt (void);
+void auth_disable_name (char *);
+void auth_gen_printsub (unsigned char *, int, unsigned char *, int);
 
 
-int getauthmask P((char *, int *));
-int auth_enable P((char *));
-int auth_disable P((char *));
-int auth_onoff P((char *, int));
-int auth_togdebug P((int));
-int auth_status P((void));
-void auth_name P((unsigned char *, int));
-int auth_sendname P((unsigned char *, int));
-void auth_debug P((int));
-void auth_printsub P((unsigned char *, int, unsigned char *, int));
+int getauthmask (char *, int *);
+int auth_enable (char *);
+int auth_disable (char *);
+int auth_onoff (char *, int);
+int auth_togdebug (int);
+int auth_status (void);
+void auth_name (unsigned char *, int);
+int auth_sendname (unsigned char *, int);
+void auth_debug (int);
+void auth_printsub (unsigned char *, int, unsigned char *, int);
 
 
 #ifdef	KRB4
-int kerberos4_init P((Authenticator *, int));
-int kerberos4_send P((Authenticator *));
-void kerberos4_is P((Authenticator *, unsigned char *, int));
-void kerberos4_reply P((Authenticator *, unsigned char *, int));
-int kerberos4_status P((Authenticator *, char *, int));
-void kerberos4_printsub P((unsigned char *, int, unsigned char *, int));
+int kerberos4_init (Authenticator *, int);
+int kerberos4_send (Authenticator *);
+void kerberos4_is (Authenticator *, unsigned char *, int);
+void kerberos4_reply (Authenticator *, unsigned char *, int);
+int kerberos4_status (Authenticator *, char *, int);
+void kerberos4_printsub (unsigned char *, int, unsigned char *, int);
 #endif
 
 #ifdef	KRB5
-int kerberos5_init P((Authenticator *, int));
-int kerberos5_send P((Authenticator *));
-void kerberos5_is P((Authenticator *, unsigned char *, int));
-void kerberos5_reply P((Authenticator *, unsigned char *, int));
-int kerberos5_status P((Authenticator *, char *, int));
-void kerberos5_printsub P((unsigned char *, int, unsigned char *, int));
-void kerberos5_cleanup P((void));
+int kerberos5_init (Authenticator *, int);
+int kerberos5_send (Authenticator *);
+void kerberos5_is (Authenticator *, unsigned char *, int);
+void kerberos5_reply (Authenticator *, unsigned char *, int);
+int kerberos5_status (Authenticator *, char *, int);
+void kerberos5_printsub (unsigned char *, int, unsigned char *, int);
+void kerberos5_cleanup (void);
 #endif
 #endif
diff --git a/src/appl/telnet/libtelnet/auth.h b/src/appl/telnet/libtelnet/auth.h
index f7d869c..450c7ab 100644
--- a/src/appl/telnet/libtelnet/auth.h
+++ b/src/appl/telnet/libtelnet/auth.h
@@ -65,23 +65,15 @@
 #define	AUTH_USER	3	/* We know he name */
 #define	AUTH_VALID	4	/* We know him, and he needs no password */
 
-#if	!defined(P)
-#ifdef	__STDC__
-#define P(x)	x
-#else
-#define P(x)	()
-#endif
-#endif
-
 typedef struct XauthP {
 	int	type;
 	int	way;
-	int	(*init) P((struct XauthP *, int));
-	int	(*send) P((struct XauthP *));
-	void	(*is) P((struct XauthP *, unsigned char *, int));
-	void	(*reply) P((struct XauthP *, unsigned char *, int));
-	int	(*status) P((struct XauthP *, char *, int));
-	void	(*printsub) P((unsigned char *, int, unsigned char *, int));
+	int	(*init) (struct XauthP *, int);
+	int	(*send) (struct XauthP *);
+	void	(*is) (struct XauthP *, unsigned char *, int);
+	void	(*reply) (struct XauthP *, unsigned char *, int);
+	int	(*status) (struct XauthP *, char *, int);
+	void	(*printsub) (unsigned char *, int, unsigned char *, int);
 } Authenticator;
 
 #include "auth-proto.h"
diff --git a/src/appl/telnet/libtelnet/enc-proto.h b/src/appl/telnet/libtelnet/enc-proto.h
index c096690..4361e4a 100644
--- a/src/appl/telnet/libtelnet/enc-proto.h
+++ b/src/appl/telnet/libtelnet/enc-proto.h
@@ -55,98 +55,90 @@
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
  */
-#if	!defined(P)
-#ifdef	__STDC__
-#define	P(x)	x
-#else
-#define	P(x)	()
-#endif
-#endif
-
 #ifdef	ENCRYPTION
-void encrypt_init P((char *, int));
-Encryptions *findencryption P((int));
-Encryptions *finddecryption P((int));
-void encrypt_send_supprt P((void));
-void encrypt_auto P((int));
-void decrypt_auto P((int));
-void encrypt_debug P((int));
-void encrypt_is P((unsigned char *, int));
-void encrypt_reply P((unsigned char *, int));
-void encrypt_start_input P((int));
-void encrypt_session_key P((Session_Key *, int));
-void encrypt_end_input P((void));
-void encrypt_start_output P((int));
-void encrypt_end_output P((void));
-void encrypt_send_request_start P((void));
-void encrypt_send_request_end P((void));
-void encrypt_send_end P((void));
-void encrypt_wait P((void));
-int encrypt_is_encrypting P((void));
-int EncryptAutoEnc P((int));
-int EncryptAutoDec P((int));
-int EncryptEnable P((char *, char *));
-int EncryptDisable P((char *, char *));
-int EncryptDebug P((int));
-int EncryptType P((char *, char *));
-int EncryptStart P((char *));
-int EncryptStartInput P((void));
-int EncryptStartOutput P((void));
-int EncryptStop P((char *));
-int EncryptStopInput P((void));
-int EncryptStopOutput P((void));
-int EncryptStatus P((void));
-int EncryptVerbose P((int));
-void encrypt_send_support P((void));
-void encrypt_send_keyid P((int, unsigned char *, int, int));
-int net_write P((unsigned char *, int));
-void encrypt_gen_printsub P((unsigned char *, int, unsigned char *, int));
-void encrypt_printsub P((unsigned char *, int, unsigned char *, int));
+void encrypt_init (char *, int);
+Encryptions *findencryption (int);
+Encryptions *finddecryption (int);
+void encrypt_send_supprt (void);
+void encrypt_auto (int);
+void decrypt_auto (int);
+void encrypt_debug (int);
+void encrypt_is (unsigned char *, int);
+void encrypt_reply (unsigned char *, int);
+void encrypt_start_input (int);
+void encrypt_session_key (Session_Key *, int);
+void encrypt_end_input (void);
+void encrypt_start_output (int);
+void encrypt_end_output (void);
+void encrypt_send_request_start (void);
+void encrypt_send_request_end (void);
+void encrypt_send_end (void);
+void encrypt_wait (void);
+int encrypt_is_encrypting (void);
+int EncryptAutoEnc (int);
+int EncryptAutoDec (int);
+int EncryptEnable (char *, char *);
+int EncryptDisable (char *, char *);
+int EncryptDebug (int);
+int EncryptType (char *, char *);
+int EncryptStart (char *);
+int EncryptStartInput (void);
+int EncryptStartOutput (void);
+int EncryptStop (char *);
+int EncryptStopInput (void);
+int EncryptStopOutput (void);
+int EncryptStatus (void);
+int EncryptVerbose (int);
+void encrypt_send_support (void);
+void encrypt_send_keyid (int, unsigned char *, int, int);
+int net_write (unsigned char *, int);
+void encrypt_gen_printsub (unsigned char *, int, unsigned char *, int);
+void encrypt_printsub (unsigned char *, int, unsigned char *, int);
 
 
-void encrypt_request_start P((unsigned char *, int));
-void encrypt_request_end P((void));
-void encrypt_enc_keyid P((unsigned char *, int));
-void encrypt_dec_keyid P((unsigned char *, int));
-void encrypt_support P((unsigned char *, int));
-void encrypt_start P((unsigned char *, int));
-void encrypt_end P((void));
+void encrypt_request_start (unsigned char *, int);
+void encrypt_request_end (void);
+void encrypt_enc_keyid (unsigned char *, int);
+void encrypt_dec_keyid (unsigned char *, int);
+void encrypt_support (unsigned char *, int);
+void encrypt_start (unsigned char *, int);
+void encrypt_end (void);
 
 
 #ifdef	TELENTD
-void encrypt_wait P((void));
+void encrypt_wait (void);
 #else
-void printsub P((int, unsigned char *, int));
-int encrypt_cmd P((int, char **));
-void encrypt_display P((void));
+void printsub (int, unsigned char *, int);
+int encrypt_cmd (int, char **);
+void encrypt_display (void);
 #endif
 
-void krbdes_encrypt P((unsigned char *, int));
-int krbdes_decrypt P((int));
-int krbdes_is P((unsigned char *, int));
-int krbdes_reply P((unsigned char *, int));
-void krbdes_init P((int));
-int krbdes_start P((int, int));
-void krbdes_session P((Session_Key *, int));
-void krbdes_printsub P((unsigned char *, int, unsigned char *, int));
+void krbdes_encrypt (unsigned char *, int);
+int krbdes_decrypt (int);
+int krbdes_is (unsigned char *, int);
+int krbdes_reply (unsigned char *, int);
+void krbdes_init (int);
+int krbdes_start (int, int);
+void krbdes_session (Session_Key *, int);
+void krbdes_printsub (unsigned char *, int, unsigned char *, int);
 
-void cfb64_encrypt P((unsigned char *, int));
-int cfb64_decrypt P((int));
-void cfb64_init P((int));
-int cfb64_start P((int, int));
-int cfb64_is P((unsigned char *, int));
-int cfb64_reply P((unsigned char *, int));
-void cfb64_session P((Session_Key *, int));
-int cfb64_keyid P((int, unsigned char *, int *));
-void cfb64_printsub P((unsigned char *, int, unsigned char *, int));
+void cfb64_encrypt (unsigned char *, int);
+int cfb64_decrypt (int);
+void cfb64_init (int);
+int cfb64_start (int, int);
+int cfb64_is (unsigned char *, int);
+int cfb64_reply (unsigned char *, int);
+void cfb64_session (Session_Key *, int);
+int cfb64_keyid (int, unsigned char *, int *);
+void cfb64_printsub (unsigned char *, int, unsigned char *, int);
 
-void ofb64_encrypt P((unsigned char *, int));
-int ofb64_decrypt P((int));
-void ofb64_init P((int));
-int ofb64_start P((int, int));
-int ofb64_is P((unsigned char *, int));
-int ofb64_reply P((unsigned char *, int));
-void ofb64_session P((Session_Key *, int));
-int ofb64_keyid P((int, unsigned char *, int *));
-void ofb64_printsub P((unsigned char *, int, unsigned char *, int));
+void ofb64_encrypt (unsigned char *, int);
+int ofb64_decrypt (int);
+void ofb64_init (int);
+int ofb64_start (int, int);
+int ofb64_is (unsigned char *, int);
+int ofb64_reply (unsigned char *, int);
+void ofb64_session (Session_Key *, int);
+int ofb64_keyid (int, unsigned char *, int *);
+void ofb64_printsub (unsigned char *, int, unsigned char *, int);
 #endif	/* ENCRYPTION */
diff --git a/src/appl/telnet/libtelnet/enc_des.c b/src/appl/telnet/libtelnet/enc_des.c
index bd93b36..7d13468 100644
--- a/src/appl/telnet/libtelnet/enc_des.c
+++ b/src/appl/telnet/libtelnet/enc_des.c
@@ -141,16 +141,16 @@ struct keyidlist {
 #define	FB64_IV_BAD	3
 
 
-void fb64_stream_iv P((Block, struct stinfo *));
-void fb64_init P((struct fb *));
-static int fb64_start P((struct fb *, int, int));
-int fb64_is P((unsigned char *, int, struct fb *));
-int fb64_reply P((unsigned char *, int, struct fb *));
-static void fb64_session P((Session_Key *, int, struct fb *));
-void fb64_stream_key P((Block, struct stinfo *));
-int fb64_keyid P((int, unsigned char *, int *, struct fb *));
-void fb64_printsub P((unsigned char *, int, unsigned char *, int, 
-		     unsigned char *));
+void fb64_stream_iv (Block, struct stinfo *);
+void fb64_init (struct fb *);
+static int fb64_start (struct fb *, int, int);
+int fb64_is (unsigned char *, int, struct fb *);
+int fb64_reply (unsigned char *, int, struct fb *);
+static void fb64_session (Session_Key *, int, struct fb *);
+void fb64_stream_key (Block, struct stinfo *);
+int fb64_keyid (int, unsigned char *, int *, struct fb *);
+void fb64_printsub (unsigned char *, int, unsigned char *, int, 
+		     unsigned char *);
 
 static void ecb_encrypt(stp, in, out)
      struct stinfo *stp;
diff --git a/src/appl/telnet/libtelnet/encrypt.c b/src/appl/telnet/libtelnet/encrypt.c
index 24c40a4..d4cc1a4 100644
--- a/src/appl/telnet/libtelnet/encrypt.c
+++ b/src/appl/telnet/libtelnet/encrypt.c
@@ -78,8 +78,8 @@
  * These functions pointers point to the current routines
  * for encrypting and decrypting data.
  */
-void	(*encrypt_output) P((unsigned char *, int));
-int	(*decrypt_input) P((int));
+void	(*encrypt_output) (unsigned char *, int);
+int	(*decrypt_input) (int);
 
 int encrypt_debug_mode = 0;
 static int decrypt_mode = 0;
@@ -730,7 +730,7 @@ encrypt_request_start(data, cnt)
 
 static unsigned char str_keyid[(MAXKEYLEN*2)+5] = { IAC, SB, TELOPT_ENCRYPT };
 
-static void encrypt_keyid P((struct key_info *kp, unsigned char *, int));
+static void encrypt_keyid (struct key_info *kp, unsigned char *, int);
 		
 void encrypt_enc_keyid(keyid, len)
 	unsigned char *keyid;
diff --git a/src/appl/telnet/libtelnet/encrypt.h b/src/appl/telnet/libtelnet/encrypt.h
index 00c72cd..4efac57 100644
--- a/src/appl/telnet/libtelnet/encrypt.h
+++ b/src/appl/telnet/libtelnet/encrypt.h
@@ -78,26 +78,18 @@ typedef	struct {
 	unsigned char	*data;
 } Session_Key;
 
-# if !defined(P)
-#  ifdef __STDC__
-#   define P(x)	x
-#  else
-#   define P(x)	()
-#  endif
-# endif
-
 typedef struct {
 	char	*name;
 	int	type;
-	void	(*output) P((unsigned char *, int));
-	int	(*input) P((int));
-	void	(*init) P((int));
-	int	(*start) P((int, int));
-	int	(*is) P((unsigned char *, int));
-	int	(*reply) P((unsigned char *, int));
-	void	(*session) P((Session_Key *, int));
-	int	(*keyid) P((int, unsigned char *, int *));
-	void	(*printsub) P((unsigned char *, int, unsigned char *, int));
+	void	(*output) (unsigned char *, int);
+	int	(*input) (int);
+	void	(*init) (int);
+	int	(*start) (int, int);
+	int	(*is) (unsigned char *, int);
+	int	(*reply) (unsigned char *, int);
+	void	(*session) (Session_Key *, int);
+	int	(*keyid) (int, unsigned char *, int *);
+	void	(*printsub) (unsigned char *, int, unsigned char *, int);
 } Encryptions;
 
 #define	SK_DES		1	/* Matched Kerberos v5 ENCTYPE_DES */
@@ -105,7 +97,7 @@ typedef struct {
 #include "enc-proto.h"
 
 extern int encrypt_debug_mode;
-extern int (*decrypt_input) P((int));
-extern void (*encrypt_output) P((unsigned char *, int));
+extern int (*decrypt_input) (int);
+extern void (*encrypt_output) (unsigned char *, int);
 # endif /* __ENCRYPTION__ */
 #endif /* ENCRYPTION */
diff --git a/src/appl/telnet/libtelnet/kerberos.c b/src/appl/telnet/libtelnet/kerberos.c
index d9c0921..c89f6da 100644
--- a/src/appl/telnet/libtelnet/kerberos.c
+++ b/src/appl/telnet/libtelnet/kerberos.c
@@ -109,7 +109,7 @@
 extern int auth_debug_mode;
 extern krb5_context telnet_context;
 
-int kerberos4_cksum P((unsigned char *, int));
+int kerberos4_cksum (unsigned char *, int);
 
 static unsigned char str_data[1024] = { IAC, SB, TELOPT_AUTHENTICATION, 0,
 			  		AUTHTYPE_KERBEROS_V4, };
diff --git a/src/appl/telnet/libtelnet/key-proto.h b/src/appl/telnet/libtelnet/key-proto.h
index a70aab9..0a19c97 100644
--- a/src/appl/telnet/libtelnet/key-proto.h
+++ b/src/appl/telnet/libtelnet/key-proto.h
@@ -59,16 +59,8 @@
 #ifndef	__KEY_PROTO__
 #define	__KEY_PROTO__
 
-#if	!defined(P)
-#ifdef	__STDC__
-#define	P(x)	x
-#else
-#define	P(x)	()
-#endif
-#endif
-
-int key_file_exists P((void));
-void key_lookup P((unsigned char *, Block));
-void key_stream_init P((Block, Block, int));
-unsigned char key_stream P((int, int));
+int key_file_exists (void);
+void key_lookup (unsigned char *, Block);
+void key_stream_init (Block, Block, int);
+unsigned char key_stream (int, int);
 #endif
diff --git a/src/appl/telnet/libtelnet/misc-proto.h b/src/appl/telnet/libtelnet/misc-proto.h
index d0c2c44..519f6a1 100644
--- a/src/appl/telnet/libtelnet/misc-proto.h
+++ b/src/appl/telnet/libtelnet/misc-proto.h
@@ -59,27 +59,19 @@
 #ifndef	__MISC_PROTO__
 #define	__MISC_PROTO__
 
-#if	!defined(P)
-#ifdef	__STDC__
-#define	P(x)	x
-#else
-#define	P(x)	()
-#endif
-#endif
-
-void auth_encrypt_init P((char *, char *, char *, int));
-void auth_encrypt_user P((char *));
-void auth_encrypt_connect P((int));
-void printd P((const unsigned char *, int));
+void auth_encrypt_init (char *, char *, char *, int);
+void auth_encrypt_user (char *);
+void auth_encrypt_connect (int);
+void printd (const unsigned char *, int);
 
 /*
  * These functions are imported from the application
  */
-int net_write P((unsigned char *, int));
-void net_encrypt P((void));
-int telnet_spin P((void));
-char *telnet_getenv P((char *));
-char *telnet_gets P((char *, char *, int, int));
+int net_write (unsigned char *, int);
+void net_encrypt (void);
+int telnet_spin (void);
+char *telnet_getenv (char *);
+char *telnet_gets (char *, char *, int, int);
 
 
 #ifdef NEED_PARSETOS
diff --git a/src/appl/telnet/libtelnet/misc.h b/src/appl/telnet/libtelnet/misc.h
index 3f87154..8ae6038 100644
--- a/src/appl/telnet/libtelnet/misc.h
+++ b/src/appl/telnet/libtelnet/misc.h
@@ -39,16 +39,8 @@ extern char *RemoteHostName;
 extern int ConnectedCount;
 extern int ReservedPort;
 
-#if	!defined(P)
-#ifdef	__STDC__
-#define P(x)	x
-#else
-#define P(x)	()
-#endif
-#endif
-
-int isprefix P((char *, char *));
-char **genget P((char *, char **, int));
-int Ambiguous P((void *));
+int isprefix (char *, char *);
+char **genget (char *, char **, int);
+int Ambiguous (void *);
 
 #include "misc-proto.h"
diff --git a/src/appl/telnet/libtelnet/setenv.c b/src/appl/telnet/libtelnet/setenv.c
index f19c8a1..3f55822 100644
--- a/src/appl/telnet/libtelnet/setenv.c
+++ b/src/appl/telnet/libtelnet/setenv.c
@@ -44,7 +44,7 @@
 
 #include "misc-proto.h"
 
-static char *__findenv P((const char *, int *)); 
+static char *__findenv (const char *, int *); 
 
 /*
  * setenv --
diff --git a/src/appl/telnet/telnet/ChangeLog b/src/appl/telnet/telnet/ChangeLog
index 1781738..ce9ed96 100644
--- a/src/appl/telnet/telnet/ChangeLog
+++ b/src/appl/telnet/telnet/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* commands.c, externs.h, ring.h, telnet.c: Make prototypes
+	unconditional.
+
 2001-09-07  Ken Raeburn  <raeburn@mit.edu>
 
 	* commands.c (tn): Don't crash printing null hostname in case
diff --git a/src/appl/telnet/telnet/commands.c b/src/appl/telnet/telnet/commands.c
index 855bf24..4f31586 100644
--- a/src/appl/telnet/telnet/commands.c
+++ b/src/appl/telnet/telnet/commands.c
@@ -134,9 +134,9 @@ extern int Ambiguous();
 
 typedef int (*intrtn_t)();
 static int call (intrtn_t, ...);
-void cmdrc P((char *, char *));
+void cmdrc (char *, char *);
 static    int
-send_tncmd P((void (*func)(), char *, char *));
+send_tncmd (void (*func)(), char *, char *);
 static int help(int, char **);
 
 #ifdef NEED_HERROR_PROTO
@@ -297,12 +297,12 @@ struct sendlist {
 
 
 static int
-	send_esc P((void)),
-	send_help P((void)),
-	send_docmd P((char *)),
-	send_dontcmd P((char *)),
-	send_willcmd P((char *)),
-	send_wontcmd P((char *));
+	send_esc (void),
+	send_help (void),
+	send_docmd (char *),
+	send_dontcmd (char *),
+	send_willcmd (char *),
+	send_wontcmd (char *);
 
 static struct sendlist Sendlist[] = {
     { "ao",	"Send Telnet Abort output",		1, 0, 0, 2, AO },
@@ -664,9 +664,9 @@ togxbinary(val)
 }
 
 
-static int togglehelp P((void));
+static int togglehelp (void);
 #if	defined(AUTHENTICATION)
-extern int auth_togdebug P((int));
+extern int auth_togdebug (int);
 #endif
 
 struct togglelist {
@@ -1615,18 +1615,18 @@ struct envlist {
 };
 
 extern struct env_lst *
-	env_define P((unsigned char *, unsigned char *));
+	env_define (unsigned char *, unsigned char *);
 extern void
-	env_undefine P((unsigned char *)),
-	env_export P((unsigned char *)),
-	env_unexport P((unsigned char *)),
-	env_send P((unsigned char *)),
+	env_undefine (unsigned char *),
+	env_export (unsigned char *),
+	env_unexport (unsigned char *),
+	env_send (unsigned char *),
 #if defined(OLD_ENVIRON) && defined(ENV_HACK)
-	env_varval P((unsigned char *)),
+	env_varval (unsigned char *),
 #endif
-	env_list P((void));
+	env_list (void);
 static void
-	env_help P((void));
+	env_help (void);
 
 struct envlist EnvList[] = {
     { "define",	"Define an environment variable",
@@ -1971,11 +1971,11 @@ struct authlist {
 };
 
 extern int
-	auth_enable P((char *)),
-	auth_disable P((char *)),
-	auth_status P((void));
+	auth_enable (char *),
+	auth_disable (char *),
+	auth_status (void);
 static int
-	auth_help P((void));
+	auth_help (void);
 
 struct authlist AuthList[] = {
     { "status",	"Display current status of authentication information",
@@ -2056,18 +2056,18 @@ struct encryptlist {
 };
 
 extern int
-	EncryptEnable P((char *, char *)),
-	EncryptDisable P((char *, char *)),
-	EncryptType P((char *, char *)),
-	EncryptStart P((char *)),
-	EncryptStartInput P((void)),
-	EncryptStartOutput P((void)),
-	EncryptStop P((char *)),
-	EncryptStopInput P((void)),
-	EncryptStopOutput P((void)),
-	EncryptStatus P((void));
+	EncryptEnable (char *, char *),
+	EncryptDisable (char *, char *),
+	EncryptType (char *, char *),
+	EncryptStart (char *),
+	EncryptStartInput (void),
+	EncryptStartOutput (void),
+	EncryptStop (char *),
+	EncryptStopInput (void),
+	EncryptStopOutput (void),
+	EncryptStatus (void);
 static int
-	EncryptHelp P((void));
+	EncryptHelp (void);
 
 struct encryptlist EncryptList[] = {
     { "enable", "Enable encryption. ('encrypt enable ?' for more)",
@@ -2180,9 +2180,9 @@ struct forwlist {
 };
 
 static int
-	forw_status P((void)),
-	forw_set P((int)),
-	forw_help P((void));
+	forw_status (void),
+	forw_set (int),
+	forw_help (void);
 
 struct forwlist ForwList[] = {
     { "status",	"Display current status of credential forwarding",
diff --git a/src/appl/telnet/telnet/externs.h b/src/appl/telnet/telnet/externs.h
index 06c2a9b..ad16a03 100644
--- a/src/appl/telnet/telnet/externs.h
+++ b/src/appl/telnet/telnet/externs.h
@@ -115,14 +115,6 @@ extern char *malloc(), *calloc(), *realloc();
 extern int errno;		/* outside this world */
 #endif /* !CRAY */
 
-#if	!defined(P)
-# ifdef	__STDC__
-#  define	P(x)	x
-# else
-#  define	P(x)	()
-# endif
-#endif
-
 extern int
     autologin,		/* Autologin enabled */
     skiprc,		/* Don't process the ~/.telnetrc file */
@@ -176,8 +168,8 @@ extern char
     options[],		/* All the little options */
     *hostname;		/* Who are we connected to? */
 #ifdef	ENCRYPTION
-extern void (*encrypt_output) P((unsigned char *, int));
-extern int (*decrypt_input) P((int));
+extern void (*encrypt_output) (unsigned char *, int);
+extern int (*decrypt_input) (int);
 #endif	/* ENCRYPTION */
 
 /*
@@ -248,128 +240,128 @@ extern FILE
 extern unsigned char
     NetTraceFile[];	/* Name of file where debugging output goes */
 extern void
-    SetNetTrace P((char *));	/* Function to change where debugging goes */
+    SetNetTrace (char *);	/* Function to change where debugging goes */
 
 extern jmp_buf
     peerdied,
     toplevel;		/* For error conditions. */
 
 extern void
-    command P((int, char *, int)),
-    Dump P((int, unsigned char *, int)),
-    init_3270 P((void)),
-    init_terminal P((void)),
-    init_telnet P((void)),
-    init_network P((void)),
-    init_sys P((void)),
-    printoption P((char *, int, int)),
-    printsub P((int, unsigned char *, int)),
-    sendnaws P((void)),
-    sendabort P((void)),
-    sendeof P((void)),
-    sendayt P((void)),
-    sendsusp P((void)),
-    setconnmode P((int)),
-    setcommandmode P((void)),
-    setneturg P((void)),
-    set_escape_char P((char *)),
-    sys_telnet_init P((void)),
-    telnet P((char *)),
-    tel_enter_binary P((int)),
-    tel_leave_binary P((int)),
-    TerminalDefaultChars P((void)),
-    TerminalFlushOutput P((void)),
-    TerminalNewMode P((int)),
-    TerminalRestoreState P((void)),
-    TerminalSaveState P((void)),
-    TerminalSpeeds P((long *, long *)),
-    tninit P((void)),
-    upcase P((char *)),
-    willoption P((int)),
-    wontoption P((int));
+    command (int, char *, int),
+    Dump (int, unsigned char *, int),
+    init_3270 (void),
+    init_terminal (void),
+    init_telnet (void),
+    init_network (void),
+    init_sys (void),
+    printoption (char *, int, int),
+    printsub (int, unsigned char *, int),
+    sendnaws (void),
+    sendabort (void),
+    sendeof (void),
+    sendayt (void),
+    sendsusp (void),
+    setconnmode (int),
+    setcommandmode (void),
+    setneturg (void),
+    set_escape_char (char *),
+    sys_telnet_init (void),
+    telnet (char *),
+    tel_enter_binary (int),
+    tel_leave_binary (int),
+    TerminalDefaultChars (void),
+    TerminalFlushOutput (void),
+    TerminalNewMode (int),
+    TerminalRestoreState (void),
+    TerminalSaveState (void),
+    TerminalSpeeds (long *, long *),
+    tninit (void),
+    upcase (char *),
+    willoption (int),
+    wontoption (int);
 
 extern void
-    send_do P((int, int)),
-    send_dont P((int, int)),
-    send_will P((int, int)),
-    send_wont P((int, int));
+    send_do (int, int),
+    send_dont (int, int),
+    send_will (int, int),
+    send_wont (int, int);
 
 extern void
-    sendbrk P((void)),
-    intp P((void)),
-    xmitAO P((void)),
-    xmitEL P((void)),
-    xmitEC P((void));
+    sendbrk (void),
+    intp (void),
+    xmitAO (void),
+    xmitEL (void),
+    xmitEC (void);
 
 extern void
-    lm_will P((unsigned char *, int)),
-    lm_wont P((unsigned char *, int)),
-    lm_do P((unsigned char *, int)),
-    lm_dont P((unsigned char *, int)),
-    lm_mode P((unsigned char *, int, int));
+    lm_will (unsigned char *, int),
+    lm_wont (unsigned char *, int),
+    lm_do (unsigned char *, int),
+    lm_dont (unsigned char *, int),
+    lm_mode (unsigned char *, int, int);
 
 extern void
-    ExitString P((char *, int)), 
-    Exit P((int)),
-    SetForExit P((void)),
-    EmptyTerminal P((void)),
-    slc_init P((void)),
-    slcstate P((void)),
-    slc_mode_export P((void)),
-    slc_mode_import P((int)),
-    slc_import P((int)),
-    slc_export P((void)),
-    slc P((unsigned char *, int)),
-    slc_check P((void)),
-    slc_start_reply P((void)),
-    slc_add_reply P((int, int, int)),
-    slc_end_reply P((void));
+    ExitString (char *, int), 
+    Exit (int),
+    SetForExit (void),
+    EmptyTerminal (void),
+    slc_init (void),
+    slcstate (void),
+    slc_mode_export (void),
+    slc_mode_import (int),
+    slc_import (int),
+    slc_export (void),
+    slc (unsigned char *, int),
+    slc_check (void),
+    slc_start_reply (void),
+    slc_add_reply (int, int, int),
+    slc_end_reply (void);
 
 extern int
-    quit P((void)), 
-    ttyflush P((int)),
-    rlogin_susp P((void)),
-    tn P((int, char **)),
-    getconnmode P((void)),
-    netflush P((void)),
-    NetClose P((int)),
-    opt_welldefined P((char *)),
-    process_rings P((int, int, int, int, int, int)),
-    slc_update P((void)),
-    Scheduler P((int)),
-    SetSockOpt P((int, int, int, int)),
-    stilloob P((void)), 
-    telrcv P((void)),
-    telnet_spin P((void)),
-    TerminalWrite P((char *, int)),
-    TerminalRead P((char *, int)),
-    TerminalAutoFlush P((void)),
-    TerminalSpecialChars P((int)),
-    TerminalWindowSize P((long *, long *));
+    quit (void), 
+    ttyflush (int),
+    rlogin_susp (void),
+    tn (int, char **),
+    getconnmode (void),
+    netflush (void),
+    NetClose (int),
+    opt_welldefined (char *),
+    process_rings (int, int, int, int, int, int),
+    slc_update (void),
+    Scheduler (int),
+    SetSockOpt (int, int, int, int),
+    stilloob (void), 
+    telrcv (void),
+    telnet_spin (void),
+    TerminalWrite (char *, int),
+    TerminalRead (char *, int),
+    TerminalAutoFlush (void),
+    TerminalSpecialChars (int),
+    TerminalWindowSize (long *, long *);
 
 
 extern void
-    env_init P((void)),
-    env_opt P((unsigned char *, int)),
-    env_opt_start P((void)),
-    env_opt_start_info P((void)),
-    env_opt_add P((unsigned char *)),
-    env_opt_end P((int)),
-    optionstatus P((void));
+    env_init (void),
+    env_opt (unsigned char *, int),
+    env_opt_start (void),
+    env_opt_start_info (void),
+    env_opt_add (unsigned char *),
+    env_opt_end (int),
+    optionstatus (void);
 
 extern unsigned char
-    *env_default P((int, int)),
-    *env_getvalue P((unsigned char *));
+    *env_default (int, int),
+    *env_getvalue (unsigned char *);
 
 extern int
-    env_is_exported P((unsigned char *));
+    env_is_exported (unsigned char *);
 
 extern int
-    get_status P((void)),
-    dosynch P((void));
+    get_status (void),
+    dosynch (void);
 
 extern cc_t
-    *tcval P((int));
+    *tcval (int);
 
 #ifndef	USE_TERMIO
 
@@ -536,8 +528,8 @@ extern char
     *transcom;		/* Transparent command */
 
 extern int
-    settranscom P((int, char**));
+    settranscom (int, char**);
 
 extern void
-    inputAvailable P((int));
+    inputAvailable (int);
 #endif	/* defined(TN3270) */
diff --git a/src/appl/telnet/telnet/ring.h b/src/appl/telnet/telnet/ring.h
index 7d9fd4f..87f0ab7 100644
--- a/src/appl/telnet/telnet/ring.h
+++ b/src/appl/telnet/telnet/ring.h
@@ -33,16 +33,6 @@
  *	@(#)ring.h	8.1 (Berkeley) 6/6/93
  */
 
-#if defined(P)
-# undef P
-#endif
-
-#if defined(__STDC__) || defined(LINT_ARGS)
-# define	P(x)	x
-#else
-# define	P(x)	()
-#endif
-
 /*
  * This defines a structure for a ring buffer.
  *
@@ -72,37 +62,37 @@ typedef struct {
 
 /* Initialization routine */
 extern int
-	ring_init P((Ring *ring, unsigned char *buffer, int count));
+	ring_init (Ring *ring, unsigned char *buffer, int count);
 
 /* Data movement routines */
 extern void
-	ring_supply_data P((Ring *ring, unsigned char *buffer, int count));
+	ring_supply_data (Ring *ring, unsigned char *buffer, int count);
 #ifdef notdef
 extern void
-	ring_consume_data P((Ring *ring, unsigned char *buffer, int count));
+	ring_consume_data (Ring *ring, unsigned char *buffer, int count);
 #endif
 
 /* Buffer state transition routines */
 extern void
-	ring_supplied P((Ring *ring, int count)),
-	ring_consumed P((Ring *ring, int count));
+	ring_supplied (Ring *ring, int count),
+	ring_consumed (Ring *ring, int count);
 
 /* Buffer state query routines */
 extern int
-	ring_empty_count P((Ring *ring)),
-	ring_empty_consecutive P((Ring *ring)),
-	ring_full_count P((Ring *ring)),
-	ring_full_consecutive P((Ring *ring));
+	ring_empty_count (Ring *ring),
+	ring_empty_consecutive (Ring *ring),
+	ring_full_count (Ring *ring),
+	ring_full_consecutive (Ring *ring);
 
 #ifdef	ENCRYPTION
 extern void
-	ring_encrypt P((Ring *ring, void (*func)())),
-	ring_clearto P((Ring *ring));
+	ring_encrypt (Ring *ring, void (*func)()),
+	ring_clearto (Ring *ring);
 #endif	/* ENCRYPTION */
 
 extern void
-    ring_clear_mark P((Ring *ring)),
-    ring_mark P((Ring *ring));
+    ring_clear_mark (Ring *ring),
+    ring_mark (Ring *ring);
 
 extern int
-    ring_at_mark P((Ring *));
+    ring_at_mark (Ring *);
diff --git a/src/appl/telnet/telnet/telnet.c b/src/appl/telnet/telnet/telnet.c
index c0fe34b..82eaa00 100644
--- a/src/appl/telnet/telnet/telnet.c
+++ b/src/appl/telnet/telnet/telnet.c
@@ -79,7 +79,7 @@
 #include <libtelnet/misc-proto.h>
 #endif	/* defined(AUTHENTICATION) || defined(ENCRYPTION)  */
 
-static int is_unique P((char *, char **, char **));
+static int is_unique (char *, char **, char **);
 
 
 #define	strip(x)	((x)&0x7f)
diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog
index 9b44722..73fd83d 100644
--- a/src/appl/telnet/telnetd/ChangeLog
+++ b/src/appl/telnet/telnetd/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* defs.h, state.c, sys_term.c, telnetd-ktd.c, telnetd.c: Make
+	prototypes unconditional.
+
 Sat Sep  8 08:24:51 2001  Ezra Peisach  <epeisach@mit.edu>
 
 	* telnetd.c: Move include of fake-addrinfo.c to after stdlib.h so
diff --git a/src/appl/telnet/telnetd/defs.h b/src/appl/telnet/telnetd/defs.h
index de7fef4..3ceb865 100644
--- a/src/appl/telnet/telnetd/defs.h
+++ b/src/appl/telnet/telnetd/defs.h
@@ -317,15 +317,7 @@ typedef struct {
 
 extern char	*line;
 
-#ifndef	P
-# ifdef	__STDC__
-#  define P(x)	x
-# else
-#  define P(x)	()
-# endif
-#endif
-
 #ifdef	ENCRYPTION
-extern void	(*encrypt_output) P((unsigned char *, int));
-extern int	(*decrypt_input) P((int));
+extern void	(*encrypt_output) (unsigned char *, int);
+extern int	(*decrypt_input) (int);
 #endif	/* ENCRYPTION */
diff --git a/src/appl/telnet/telnetd/state.c b/src/appl/telnet/telnetd/state.c
index 62ed744..104af69 100644
--- a/src/appl/telnet/telnetd/state.c
+++ b/src/appl/telnet/telnetd/state.c
@@ -47,7 +47,7 @@ unsigned char	will[] = { IAC, WILL, '%', 'c', 0 };
 unsigned char	wont[] = { IAC, WONT, '%', 'c', 0 };
 int	not42 = 1;
 
-static int envvarok P((char *));
+static int envvarok (char *);
 
 /*
  * Buffer for sub-options, and macros
diff --git a/src/appl/telnet/telnetd/sys_term.c b/src/appl/telnet/telnetd/sys_term.c
index c302dcc..05b57ff 100644
--- a/src/appl/telnet/telnetd/sys_term.c
+++ b/src/appl/telnet/telnetd/sys_term.c
@@ -1096,7 +1096,7 @@ startslave(host, autologin, autoname)
 	if (i) {
 		char c;
 
-		void sigjob P((int));
+		void sigjob (int);
 		slavepid = i; /* So we can clean it up later */
 #ifdef	CRAY
 		(void) signal(WJSIGNAL, sigjob);
diff --git a/src/appl/telnet/telnetd/telnetd-ktd.c b/src/appl/telnet/telnetd/telnetd-ktd.c
index 5936e3b..295f195 100644
--- a/src/appl/telnet/telnetd/telnetd-ktd.c
+++ b/src/appl/telnet/telnetd/telnetd-ktd.c
@@ -107,7 +107,7 @@ int debug = 0;
 int keepalive = 1;
 char *progname;
 
-extern void usage P((void));
+extern void usage (void);
 
 main(argc, argv)
 	char *argv[];
@@ -682,9 +682,9 @@ char host_name[MAXHOSTNAMELEN];
 char remote_host_name[MAXHOSTNAMELEN];
 
 #ifndef	convex
-extern void telnet P((int, int));
+extern void telnet (int, int);
 #else
-extern void telnet P((int, int, char *));
+extern void telnet (int, int, char *);
 #endif
 
 /*
diff --git a/src/appl/telnet/telnetd/telnetd.c b/src/appl/telnet/telnetd/telnetd.c
index 4dd9804..aefcacf 100644
--- a/src/appl/telnet/telnetd/telnetd.c
+++ b/src/appl/telnet/telnetd/telnetd.c
@@ -135,8 +135,8 @@ char	ptyibuf2[BUFSIZ];
 
 #endif /* ! STREAMPTY */
 
-static void doit P((struct sockaddr *));
-int terminaltypeok P((char *));
+static void doit (struct sockaddr *);
+int terminaltypeok (char *);
 static void _gettermname(void);
 
 int	hostinfo = 1;			/* do we print login banner? */
@@ -154,7 +154,7 @@ int maxhostlen = 0;
 int always_ip = 0;
 int stripdomain = 1;
 
-extern void usage P((void));
+extern void usage (void);
 
 /*
  * The string to pass to getopt().  We do it this way so
@@ -917,9 +917,9 @@ char remote_host_name[MAXDNAME];
 char *rhost_sane;
 
 #ifndef	convex
-extern void telnet P((int, int));
+extern void telnet (int, int);
 #else
-extern void telnet P((int, int, char *));
+extern void telnet (int, int, char *);
 #endif
 
 /*
diff --git a/src/clients/klist/ChangeLog b/src/clients/klist/ChangeLog
index 5c78e65..febc9cb 100644
--- a/src/clients/klist/ChangeLog
+++ b/src/clients/klist/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* klist.c: Make prototypes unconditional.
+
 2001-10-05  Ken Raeburn  <raeburn@mit.edu>
 
 	* klist.c: Delete _MSDOS support.
diff --git a/src/clients/klist/klist.c b/src/clients/klist/klist.c
index 548a382..4e3c4a5 100644
--- a/src/clients/klist/klist.c
+++ b/src/clients/klist/klist.c
@@ -67,17 +67,17 @@ unsigned int timestamp_width;
 
 krb5_context kcontext;
 
-char * etype_string KRB5_PROTOTYPE((krb5_enctype ));
-void show_credential KRB5_PROTOTYPE((krb5_creds *));
+char * etype_string (krb5_enctype );
+void show_credential (krb5_creds *);
 	
-void do_ccache KRB5_PROTOTYPE((char *));
-void do_keytab KRB5_PROTOTYPE((char *));
-void printtime KRB5_PROTOTYPE((time_t));
-void one_addr KRB5_PROTOTYPE((krb5_address *));
-void fillit KRB5_PROTOTYPE((FILE *, unsigned int, int));
+void do_ccache (char *);
+void do_keytab (char *);
+void printtime (time_t);
+void one_addr (krb5_address *);
+void fillit (FILE *, unsigned int, int);
 
 #ifdef KRB5_KRB4_COMPAT
-void do_v4_ccache KRB5_PROTOTYPE((char *));
+void do_v4_ccache (char *);
 #endif /* KRB5_KRB4_COMPAT */
 
 #define DEFAULT 0
diff --git a/src/clients/ksu/ChangeLog b/src/clients/ksu/ChangeLog
index 6cba8c7..33ee0fa 100644
--- a/src/clients/ksu/ChangeLog
+++ b/src/clients/ksu/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* authorization.c, heuristic.c, krb_auth_su.c, ksu.h, main.c: Make
+	prototypes unconditional.
+
 2001-10-07  Mitchell Berger  <mitchb@mit.edu>
 
 	* krb_auth_su.c: Fix a call to plain_dump_principal() that had the
diff --git a/src/clients/ksu/authorization.c b/src/clients/ksu/authorization.c
index 67cc787..f932368 100644
--- a/src/clients/ksu/authorization.c
+++ b/src/clients/ksu/authorization.c
@@ -27,7 +27,7 @@
 
 #include "ksu.h"
 
-static void auth_cleanup PROTOTYPE((FILE *, FILE *, char *));
+static void auth_cleanup (FILE *, FILE *, char *);
 
 krb5_boolean fowner(fp, uid)
     FILE *fp;
diff --git a/src/clients/ksu/heuristic.c b/src/clients/ksu/heuristic.c
index 471184d..c17496b 100644
--- a/src/clients/ksu/heuristic.c
+++ b/src/clients/ksu/heuristic.c
@@ -37,8 +37,8 @@ get_all_princ_from_file - retrieves all principal names
 			from file pointed to by fp.
 
 *******************************************************************/
-static void close_time PROTOTYPE((int, FILE *, int, FILE *));
-static krb5_boolean find_str_in_list PROTOTYPE((char **, char *));
+static void close_time (int, FILE *, int, FILE *);
+static krb5_boolean find_str_in_list (char **, char *);
 
 krb5_error_code get_all_princ_from_file (fp, plist)
     FILE *fp;
diff --git a/src/clients/ksu/krb_auth_su.c b/src/clients/ksu/krb_auth_su.c
index 1771e4b..6e76149 100644
--- a/src/clients/ksu/krb_auth_su.c
+++ b/src/clients/ksu/krb_auth_su.c
@@ -28,12 +28,12 @@
 #include "ksu.h"
     
 static krb5_error_code krb5_verify_tkt_def
-	PROTOTYPE((krb5_context,
+		  (krb5_context,
     		   krb5_principal,
     		   krb5_principal,
     		   krb5_keyblock *,
     		   krb5_data *,
-    		   krb5_ticket **));
+    		   krb5_ticket **);
 
 void plain_dump_principal ();
 
diff --git a/src/clients/ksu/ksu.h b/src/clients/ksu/ksu.h
index f0623cc..4c3f6af 100644
--- a/src/clients/ksu/ksu.h
+++ b/src/clients/ksu/ksu.h
@@ -79,164 +79,164 @@ typedef struct opt_info{
 
 /* krb_auth_su.c */
 extern krb5_boolean krb5_auth_check
-        PROTOTYPE((krb5_context, krb5_principal, char *, opt_info *,
-		   char *, krb5_ccache, int *, uid_t));
+        (krb5_context, krb5_principal, char *, opt_info *,
+		   char *, krb5_ccache, int *, uid_t);
 
 extern krb5_boolean krb5_fast_auth
-        PROTOTYPE((krb5_context, krb5_principal, krb5_principal, char *,
-		   krb5_ccache));
+        (krb5_context, krb5_principal, krb5_principal, char *,
+		   krb5_ccache);
 
 extern krb5_boolean krb5_get_tkt_via_passwd 
-	PROTOTYPE((krb5_context, krb5_ccache *, krb5_principal,
-		   krb5_principal, opt_info *, krb5_boolean *));
+	(krb5_context, krb5_ccache *, krb5_principal,
+		   krb5_principal, opt_info *, krb5_boolean *);
 
 extern void dump_principal 
-	PROTOTYPE((krb5_context, char *, krb5_principal));
+	(krb5_context, char *, krb5_principal);
 
 extern void plain_dump_principal 
-	PROTOTYPE((krb5_context, krb5_principal));
+	(krb5_context, krb5_principal);
 
 
 extern krb5_error_code krb5_parse_lifetime
-	PROTOTYPE((char *, long *));
+	(char *, long *);
 
 extern krb5_error_code get_best_principal
-	PROTOTYPE((krb5_context, char **, krb5_principal *));
+	(krb5_context, char **, krb5_principal *);
 
 /* ccache.c */
 extern krb5_error_code krb5_ccache_copy
-	PROTOTYPE((krb5_context, krb5_ccache, char *, krb5_principal, 
-		   krb5_ccache *, krb5_boolean *, uid_t));
+	(krb5_context, krb5_ccache, char *, krb5_principal, 
+		   krb5_ccache *, krb5_boolean *, uid_t);
 
 extern krb5_error_code krb5_store_all_creds
-	PROTOTYPE((krb5_context, krb5_ccache, krb5_creds **, krb5_creds **));
+	(krb5_context, krb5_ccache, krb5_creds **, krb5_creds **);
 
 extern krb5_error_code krb5_store_all_creds
-	PROTOTYPE((krb5_context, krb5_ccache, krb5_creds **, krb5_creds **));
+	(krb5_context, krb5_ccache, krb5_creds **, krb5_creds **);
 
 extern krb5_boolean compare_creds
-	PROTOTYPE((krb5_context, krb5_creds *, krb5_creds *));
+	(krb5_context, krb5_creds *, krb5_creds *);
 
 extern krb5_error_code krb5_get_nonexp_tkts
-	PROTOTYPE((krb5_context, krb5_ccache, krb5_creds ***));
+	(krb5_context, krb5_ccache, krb5_creds ***);
 
 extern krb5_error_code krb5_check_exp
-	PROTOTYPE((krb5_context, krb5_ticket_times));
+	(krb5_context, krb5_ticket_times);
 
-extern char *flags_string PROTOTYPE((krb5_creds *));
+extern char *flags_string (krb5_creds *);
 
 extern krb5_error_code krb5_get_login_princ
-	PROTOTYPE((const char *, char ***));
+	(const char *, char ***);
 
 extern void show_credential
-	PROTOTYPE((krb5_context, krb5_creds *, krb5_ccache));
+	(krb5_context, krb5_creds *, krb5_ccache);
 
-extern int gen_sym PROTOTYPE((void));
+extern int gen_sym (void);
 
 extern krb5_error_code krb5_ccache_overwrite
-	PROTOTYPE((krb5_context, krb5_ccache, krb5_ccache, krb5_principal));
+	(krb5_context, krb5_ccache, krb5_ccache, krb5_principal);
 
 extern krb5_error_code krb5_store_some_creds
-	PROTOTYPE((krb5_context, krb5_ccache, krb5_creds **, krb5_creds **,
-		   krb5_principal, krb5_boolean *));
+	(krb5_context, krb5_ccache, krb5_creds **, krb5_creds **,
+		   krb5_principal, krb5_boolean *);
 
 extern krb5_error_code krb5_ccache_copy_restricted
-	PROTOTYPE((krb5_context, krb5_ccache, char *, krb5_principal, 
-		   krb5_ccache *, krb5_boolean *, uid_t));
+	(krb5_context, krb5_ccache, char *, krb5_principal, 
+		   krb5_ccache *, krb5_boolean *, uid_t);
 
 extern krb5_error_code krb5_ccache_refresh
-	PROTOTYPE((krb5_context, krb5_ccache));
+	(krb5_context, krb5_ccache);
 
 extern krb5_error_code krb5_ccache_filter
-	PROTOTYPE((krb5_context, krb5_ccache, krb5_principal));
+	(krb5_context, krb5_ccache, krb5_principal);
 
 extern krb5_boolean krb5_find_princ_in_cred_list
-	PROTOTYPE((krb5_context, krb5_creds **, krb5_principal));
+	(krb5_context, krb5_creds **, krb5_principal);
 
 extern krb5_error_code krb5_find_princ_in_cache
-	PROTOTYPE((krb5_context, krb5_ccache, krb5_principal, krb5_boolean *));
+	(krb5_context, krb5_ccache, krb5_principal, krb5_boolean *);
 
-extern void printtime PROTOTYPE((time_t));
+extern void printtime (time_t);
 
 /* authorization.c */
-extern krb5_boolean fowner PROTOTYPE((FILE *, int));
+extern krb5_boolean fowner (FILE *, int);
 
 extern krb5_error_code krb5_authorization
-	PROTOTYPE((krb5_context, krb5_principal, const char *, char *, 
-		   krb5_boolean *, char **));
+	(krb5_context, krb5_principal, const char *, char *, 
+		   krb5_boolean *, char **);
 
-extern krb5_error_code k5login_lookup PROTOTYPE((FILE *, char *,
-						 krb5_boolean *));
+extern krb5_error_code k5login_lookup (FILE *, char *,
+						 krb5_boolean *);
 
 extern krb5_error_code k5users_lookup 
-	PROTOTYPE((FILE *, char *, char *, krb5_boolean *, char **));
+	(FILE *, char *, char *, krb5_boolean *, char **);
 
 extern krb5_boolean fcmd_resolve
-	PROTOTYPE((char *, char ***, char **));
+	(char *, char ***, char **);
 
-extern krb5_boolean cmd_single PROTOTYPE((char *));
+extern krb5_boolean cmd_single (char *);
 
-extern int cmd_arr_cmp_postfix PROTOTYPE((char **, char *));
+extern int cmd_arr_cmp_postfix (char **, char *);
 
-extern int cmd_arr_cmp PROTOTYPE((char **, char *));
+extern int cmd_arr_cmp (char **, char *);
 
 extern krb5_boolean find_first_cmd_that_exists 
-	PROTOTYPE((char **, char **, char **));
+	(char **, char **, char **);
 
 extern int match_commands 
-	PROTOTYPE((char *, char *, krb5_boolean *, char **, char **));
+	(char *, char *, krb5_boolean *, char **, char **);
 
-extern krb5_error_code get_line PROTOTYPE((FILE *, char **));
+extern krb5_error_code get_line (FILE *, char **);
 
-extern char *  get_first_token PROTOTYPE((char *, char **));
+extern char *  get_first_token (char *, char **);
 
-extern char *  get_next_token PROTOTYPE((char **));
+extern char *  get_next_token (char **);
 
-extern krb5_boolean fowner PROTOTYPE((FILE *, int));
+extern krb5_boolean fowner (FILE *, int);
 
-extern void init_auth_names PROTOTYPE((char *));
+extern void init_auth_names (char *);
 
 /* main.c */
-extern void usage PROTOTYPE((void));
+extern void usage (void);
 
-extern int standard_shell PROTOTYPE((char *));
+extern int standard_shell (char *);
 
-extern krb5_error_code get_params PROTOTYPE((int *, int, char **, char ***));
+extern krb5_error_code get_params (int *, int, char **, char ***);
 
-extern char *get_dir_of_file PROTOTYPE((const char *));
+extern char *get_dir_of_file (const char *);
 
 /* heuristic.c */
-extern krb5_error_code get_all_princ_from_file PROTOTYPE((FILE *, char ***));
+extern krb5_error_code get_all_princ_from_file (FILE *, char ***);
 
-extern krb5_error_code list_union PROTOTYPE((char **, char **, char ***));
+extern krb5_error_code list_union (char **, char **, char ***);
 
-extern krb5_error_code filter PROTOTYPE((FILE *, char *, char **, char ***));
+extern krb5_error_code filter (FILE *, char *, char **, char ***);
 
 extern krb5_error_code get_authorized_princ_names
-	PROTOTYPE((const char *, char *, char ***));
+	(const char *, char *, char ***);
 
 extern krb5_error_code get_closest_principal 
-	PROTOTYPE((krb5_context, char **, krb5_principal *, krb5_boolean *));
+	(krb5_context, char **, krb5_principal *, krb5_boolean *);
 
 extern krb5_error_code find_either_ticket 
-	PROTOTYPE((krb5_context, krb5_ccache, krb5_principal,
-		krb5_principal, krb5_boolean *));
+	(krb5_context, krb5_ccache, krb5_principal,
+		krb5_principal, krb5_boolean *);
 
 extern krb5_error_code find_ticket 
-	PROTOTYPE((krb5_context, krb5_ccache, krb5_principal,
-		krb5_principal, krb5_boolean *));
+	(krb5_context, krb5_ccache, krb5_principal,
+		krb5_principal, krb5_boolean *);
 
 
 extern krb5_error_code find_princ_in_list
-	PROTOTYPE((krb5_context, krb5_principal, char **, krb5_boolean *));
+	(krb5_context, krb5_principal, char **, krb5_boolean *);
 
 extern krb5_error_code get_best_princ_for_target
-	PROTOTYPE((krb5_context, int, int, char *, char *, krb5_ccache, 
-		opt_info *, char *, char *, krb5_principal *, int *));
+	(krb5_context, int, int, char *, char *, krb5_ccache, 
+		opt_info *, char *, char *, krb5_principal *, int *);
 
-extern krb5_error_code ksu_tgtname PROTOTYPE((krb5_context, const krb5_data *,
+extern krb5_error_code ksu_tgtname (krb5_context, const krb5_data *,
 					      const krb5_data *, 
-					      krb5_principal *tgtprinc));
+					      krb5_principal *tgtprinc);
 
 #ifndef min
 #define min(a,b) ((a) > (b) ? (b) : (a))
@@ -246,11 +246,11 @@ extern krb5_error_code ksu_tgtname PROTOTYPE((krb5_context, const krb5_data *,
 extern char *krb5_lname_file;  /* Note: print this out just be sure
 				  that it gets set */   	    
 
-extern void *xmalloc PROTOTYPE((size_t)), 
-    *xrealloc PROTOTYPE((void *, size_t)), 
-    *xcalloc PROTOTYPE((size_t, size_t));
-extern char *xstrdup PROTOTYPE((const char *));
+extern void *xmalloc (size_t), 
+    *xrealloc (void *, size_t), 
+    *xcalloc (size_t, size_t);
+extern char *xstrdup (const char *);
 
 #ifndef HAVE_UNSETENV
-void unsetenv PROTOTYPE((char *));
+void unsetenv (char *);
 #endif
diff --git a/src/clients/ksu/main.c b/src/clients/ksu/main.c
index f8992a7..df72edf 100644
--- a/src/clients/ksu/main.c
+++ b/src/clients/ksu/main.c
@@ -42,9 +42,9 @@ int quiet = 0;
 /***********/
 
 #define _DEF_CSH "/bin/csh" 
-static int set_env_var PROTOTYPE((char *, char *));
-static void sweep_up PROTOTYPE((krb5_context, krb5_ccache));
-static char * ontty PROTOTYPE((void));
+static int set_env_var (char *, char *);
+static void sweep_up (krb5_context, krb5_ccache);
+static char * ontty (void);
 #ifdef HAVE_STDARG_H
 static void print_status( const char *fmt, ...)
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index fd0bd14..ff5b993 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* fake-stdlib.h: Make prototypes unconditional.
+	(P): Don't define.
+	* krb5.hin (KRB5_PROTOTYPE): Don't define.
+	* krb54proto.h: Make prototypes unconditional.
+
 2001-10-05  Ken Raeburn  <raeburn@mit.edu>
 
 	* k5-int.h (KRB5_EXPORTVAR): Don't define.
diff --git a/src/include/fake-stdlib.h b/src/include/fake-stdlib.h
index 5f021a2..450196e 100644
--- a/src/include/fake-stdlib.h
+++ b/src/include/fake-stdlib.h
@@ -1,8 +1,3 @@
-#if defined(__STDC__) || defined(_WINDOWS)
-#else
-# define P(s) ()
-#endif
-
 #ifndef FD_SETSIZE
 #include <sys/types.h>
 #endif
@@ -69,213 +64,213 @@
 
 /* /usr/lib/lint/llib-lc */
 /* /usr/lib/lint/llib-lc */
-int access P((char *, int ));
-int acct P((char *));
-char *brk P((char *));
-int chdir P((char *));
-int chmod P((char *, int ));
-int chown P((char *, int , int ));
-int chroot P((char *));
-int close P((int ));
-int dup P((int ));
-int dup2 P((int , int ));
-int execve P((char *, char * [], char * []));
+int access (char *, int );
+int acct (char *);
+char *brk (char *);
+int chdir (char *);
+int chmod (char *, int );
+int chown (char *, int , int );
+int chroot (char *);
+int close (int );
+int dup (int );
+int dup2 (int , int );
+int execve (char *, char * [], char * []);
 #ifndef __GNUC__
-int _exit P((int ));
-#endif
-int fchmod P((int , int ));
-int fchown P((int , int , int ));
-int fcntl P((int , int , int ));
-int flock P((int , int ));
-int fork P((void ));
-int fsync P((int ));
-int ftruncate P((int , off_t ));
-int getdtablesize P((void ));
-gid_t getegid P((void ));
-uid_t geteuid P((void ));
-gid_t getgid P((void ));
-int getgroups P((int , int *));
-long gethostid P((void ));
-int gethostname P((char *, int ));
-int getpagesize P((void ));
-int getpgrp P((int ));
-int getpid P((void ));
-int getppid P((void ));
-uid_t getuid P((void ));
-int ioctl P((int , u_long , char *));
-int kill P((int , int ));
-int killpg P((int , int ));
-int listen P((int , int ));
-int mount P((int , char *, int , caddr_t *));
-int pipe P((int  [2 ]));
-int profil P((char *, int , int , int ));
-int ptrace P((int , int , int *, int ));
-int quota P((int , int , int , char *));
-int read P((int , char *, int ));
-int reboot P((int ));
-int recv P((int , char *, int , int ));
-char *sbrk P((int ));
-int setgroups P((int , int *));
-int sethostid P((long ));
-int sethostname P((char *, int ));
-int setpgrp P((int , int ));
-int setquota P((const char *, const char *));
-int setregid P((int , int ));
-int setreuid P((int , int ));
-int shutdown P((int , int ));
-void srandom P((int  ));
-int swapon P((char *));
-int sync P((void ));
-int umask P((int ));
-int umount P((char *));
-int vfork P((void ));
-int vhangup P((void ));
-int write P((int , const char *, int ));
-int abs P((int ));
-int alarm P((unsigned ));
-double atof P((const char *));
-int atoi P((char *));
-long atol P((char *));
-int bcmp P((char *, char *, int ));
-int bcopy P((const char *, char *, int ));
-int bzero P((char *, int ));
-void *calloc P((unsigned long, unsigned long));
-void closelog P((void ));
-int creat P((char *, int ));
-char *crypt P((char *, char *));
-char *ecvt P((double , int , int *, int *));
-int encrypt P((char *, int ));
-int endfsent P((void ));
-int endgrent P((void ));
-int endhostent P((void ));
-int endnetent P((void ));
-int endprotoent P((void ));
-int endpwent P((void ));
-int endservent P((void ));
-int endttyent P((void ));
-int endusershell P((void ));
-int execl P((char *, char *, ...));
-int execle P((char *, char *));
-int execlp P((char *, char *, ...));
-int execv P((char *, char * []));
-int execvp P((char *, char * []));
-int exect P((char *, char * [], char * []));
+int _exit (int );
+#endif
+int fchmod (int , int );
+int fchown (int , int , int );
+int fcntl (int , int , int );
+int flock (int , int );
+int fork (void );
+int fsync (int );
+int ftruncate (int , off_t );
+int getdtablesize (void );
+gid_t getegid (void );
+uid_t geteuid (void );
+gid_t getgid (void );
+int getgroups (int , int *);
+long gethostid (void );
+int gethostname (char *, int );
+int getpagesize (void );
+int getpgrp (int );
+int getpid (void );
+int getppid (void );
+uid_t getuid (void );
+int ioctl (int , u_long , char *);
+int kill (int , int );
+int killpg (int , int );
+int listen (int , int );
+int mount (int , char *, int , caddr_t *);
+int pipe (int  [2 ]);
+int profil (char *, int , int , int );
+int ptrace (int , int , int *, int );
+int quota (int , int , int , char *);
+int read (int , char *, int );
+int reboot (int );
+int recv (int , char *, int , int );
+char *sbrk (int );
+int setgroups (int , int *);
+int sethostid (long );
+int sethostname (char *, int );
+int setpgrp (int , int );
+int setquota (const char *, const char *);
+int setregid (int , int );
+int setreuid (int , int );
+int shutdown (int , int );
+void srandom (int  );
+int swapon (char *);
+int sync (void );
+int umask (int );
+int umount (char *);
+int vfork (void );
+int vhangup (void );
+int write (int , const char *, int );
+int abs (int );
+int alarm (unsigned );
+double atof (const char *);
+int atoi (char *);
+long atol (char *);
+int bcmp (char *, char *, int );
+int bcopy (const char *, char *, int );
+int bzero (char *, int );
+void *calloc (unsigned long, unsigned long);
+void closelog (void );
+int creat (char *, int );
+char *crypt (char *, char *);
+char *ecvt (double , int , int *, int *);
+int encrypt (char *, int );
+int endfsent (void );
+int endgrent (void );
+int endhostent (void );
+int endnetent (void );
+int endprotoent (void );
+int endpwent (void );
+int endservent (void );
+int endttyent (void );
+int endusershell (void );
+int execl (char *, char *, ...);
+int execle (char *, char *);
+int execlp (char *, char *, ...);
+int execv (char *, char * []);
+int execvp (char *, char * []);
+int exect (char *, char * [], char * []);
 #ifndef __GNUC__
-int exit P((int ));
+int exit (int );
 #endif
-char *fcvt P((double , int , int *, int *));
-int ffs P((int ));
+char *fcvt (double , int , int *, int *);
+int ffs (int );
 #ifdef __GNUC__
-void free P((void *));
+void free (void *);
 #else
-int free P((char *));
-#endif
-double frexp P((double , int *));
-char *gcvt P((double , int , char *));
-struct disktab *getdiskbyname P((char *));
-char *getenv P((char *));
-struct fstab *getfsent P((void ));
-struct fstab *getfsspec P((char *));
-struct fstab *getfsfile P((char *));
-struct fstab *getfstype P((char *));
-struct group *getgrent P((void ));
-struct group *getgrgid P((int ));
-struct group *getgrnam P((const char *));
-char *getlogin P((void ));
-int getopt P((int , char **, char *));
-char *getpass P((char *));
-int getpw P((int , char *));
-struct passwd *getpwent P((void ));
-struct passwd *getpwuid P((int ));
-struct passwd *getpwnam P((const char *));
-struct ttyent *getttynam P((const char *));
-char *getusershell P((void ));
-char *getwd P((char *));
-u_long htonl P((u_long ));
-u_short htons P((unsigned int ));
-u_long inet_addr P((const char *));
-u_long inet_network P((const char *));
-int initgroups P((char *, int ));
-char *initstate P((unsigned , char *, int ));
-int isatty P((int ));
-double ldexp P((double , int ));
-int longjmperror P((void ));
+int free (char *);
+#endif
+double frexp (double , int *);
+char *gcvt (double , int , char *);
+struct disktab *getdiskbyname (char *);
+char *getenv (char *);
+struct fstab *getfsent (void );
+struct fstab *getfsspec (char *);
+struct fstab *getfsfile (char *);
+struct fstab *getfstype (char *);
+struct group *getgrent (void );
+struct group *getgrgid (int );
+struct group *getgrnam (const char *);
+char *getlogin (void );
+int getopt (int , char **, char *);
+char *getpass (char *);
+int getpw (int , char *);
+struct passwd *getpwent (void );
+struct passwd *getpwuid (int );
+struct passwd *getpwnam (const char *);
+struct ttyent *getttynam (const char *);
+char *getusershell (void );
+char *getwd (char *);
+u_long htonl (u_long );
+u_short htons (unsigned int );
+u_long inet_addr (const char *);
+u_long inet_network (const char *);
+int initgroups (char *, int );
+char *initstate (unsigned , char *, int );
+int isatty (int );
+double ldexp (double , int );
+int longjmperror (void );
 #if defined(__STDC__) || defined(_WINDOWS)
-void *malloc P((size_t ));
+void *malloc (size_t );
 #else
-char *malloc P((unsigned ));
+char *malloc (unsigned );
 #endif
-char *memccpy P((char *, char *, int , int ));
-char *memchr P((char *, int , int ));
+char *memccpy (char *, char *, int , int );
+char *memchr (char *, int , int );
 #ifndef __GNUC__
-int memcmp P((char *, char *, int ));
-char *memcpy P((char *, const char *, int ));
-char *memset P((char *, int , int ));
-#endif
-char *mktemp P((char *));
-int mkstemp P((char *));
-double modf P((double , double *));
-int moncontrol P((int ));
-int nice P((int ));
-struct ns_addr ns_addr P((char *));
-u_long ntohl P((u_long ));
-u_short ntohs P((unsigned int ));
-void openlog P((const char *, int , int ));
-int pause P((void ));
-int perror P((const char * ));
-int psignal P((unsigned , const char *));
-int qsort P((char *, int , int , int (* )()));
-int rand P((void ));
-long random P((void ));
-int rcmd P((char **, u_short , char *, char *, char *, int *));
-char *re_comp P((char *));
-int re_exec P((char *));
+int memcmp (char *, char *, int );
+char *memcpy (char *, const char *, int );
+char *memset (char *, int , int );
+#endif
+char *mktemp (char *);
+int mkstemp (char *);
+double modf (double , double *);
+int moncontrol (int );
+int nice (int );
+struct ns_addr ns_addr (char *);
+u_long ntohl (u_long );
+u_short ntohs (unsigned int );
+void openlog (const char *, int , int );
+int pause (void );
+int perror (const char * );
+int psignal (unsigned , const char *);
+int qsort (char *, int , int , int (* )());
+int rand (void );
+long random (void );
+int rcmd (char **, u_short , char *, char *, char *, int *);
+char *re_comp (char *);
+int re_exec (char *);
 #ifdef __GNUC__
-void *realloc P((void *, size_t ));
+void *realloc (void *, size_t );
 #else
-char *realloc P((char *, unsigned ));
-#endif
-int rexec P((char **, u_short , char *, char *, char *, int *));
-int rresvport P((int *));
-int ruserok P((char *, int , char *, char *));
-int setegid P((gid_t ));
-int seteuid P((uid_t ));
-int setfsent P((void ));
-int setgrent P((void ));
-int setgid P((gid_t ));
-int sethostent P((int ));
-int setkey P((char *));
-int setlogmask P((int ));
-int setnetent P((int ));
-int setprotoent P((int ));
-int setpwent P((void ));
-int setpwfile P((const char *));
-int setrgid P((gid_t ));
-int setruid P((uid_t ));
-int setservent P((int ));
-char *setstate P((char *));
-int setttyent P((void ));
-int setuid P((uid_t ));
-int setusershell P((void ));
-int siginterrupt P((int , int ));
-int sleep P((unsigned ));
-int srand P((int ));
-int swab P((char *, char *, int ));
-void syslog P((int , const char *, ...));
-int system P((char *));
-long tell P((int ));
-long time P((long *));
-char *timezone P((int , int ));
-char *tmpnam P((char *));
-char *ttyname P((int ));
-int ttyslot P((void ));
-unsigned ualarm P((unsigned , unsigned ));
-int usleep P((unsigned ));
-int utime P((char *, time_t *));
-char *valloc P((unsigned ));
-int vlimit P((int , int ));
+char *realloc (char *, unsigned );
+#endif
+int rexec (char **, u_short , char *, char *, char *, int *);
+int rresvport (int *);
+int ruserok (char *, int , char *, char *);
+int setegid (gid_t );
+int seteuid (uid_t );
+int setfsent (void );
+int setgrent (void );
+int setgid (gid_t );
+int sethostent (int );
+int setkey (char *);
+int setlogmask (int );
+int setnetent (int );
+int setprotoent (int );
+int setpwent (void );
+int setpwfile (const char *);
+int setrgid (gid_t );
+int setruid (uid_t );
+int setservent (int );
+char *setstate (char *);
+int setttyent (void );
+int setuid (uid_t );
+int setusershell (void );
+int siginterrupt (int , int );
+int sleep (unsigned );
+int srand (int );
+int swab (char *, char *, int );
+void syslog (int , const char *, ...);
+int system (char *);
+long tell (int );
+long time (long *);
+char *timezone (int , int );
+char *tmpnam (char *);
+char *ttyname (int );
+int ttyslot (void );
+unsigned ualarm (unsigned , unsigned );
+int usleep (unsigned );
+int utime (char *, time_t *);
+char *valloc (unsigned );
+int vlimit (int , int );
 #ifndef __GNUC__
-void abort P((void));
+void abort (void);
 #endif
 
 #endif /* VAX */
@@ -303,392 +298,392 @@ void abort P((void));
  */
 
 /* /usr/lib/lint/llib-lc */
-int access P((char * , int ));
-int acct P((char * ));
+int access (char * , int );
+int acct (char * );
 #ifndef SYSTEM_FIVE
-caddr_t brk P((caddr_t ));
+caddr_t brk (caddr_t );
 #endif
-caddr_t sbrk P((int  ));
+caddr_t sbrk (int  );
 #ifdef mips
-int cachectl P((char * , int , int ));
-int cacheflush P((char *, int , int ));
-#endif
-int chdir P((char * ));
-int chmod P((char * , int  ));
-int fchmod P((int  , int  ));
-int chown P((char * , int  , int  ));
-int fchown P((int  , int  , int ));
-int chroot P((char * ));
-int close P((int  ));
-int creat P((char * , int  ));
-int dup P((int  ));
-int dup2 P((int , int  ));
-int execve P((char * , char * [], char * []));
+int cachectl (char * , int , int );
+int cacheflush (char *, int , int );
+#endif
+int chdir (char * );
+int chmod (char * , int  );
+int fchmod (int  , int  );
+int chown (char * , int  , int  );
+int fchown (int  , int  , int );
+int chroot (char * );
+int close (int  );
+int creat (char * , int  );
+int dup (int  );
+int dup2 (int , int  );
+int execve (char * , char * [], char * []);
 #ifndef SYSTEM_FIVE
-int _exit P((int  ));
-#endif
-int exportfs P((char * , int  , int  ));
-int fcntl P((int  , int  , int ));
-int fork P((void ));
-int getdirentries P((int  , char * , int  , long * ));
-int getdomainname P((char * , int  ));
-int setdomainname P((char * , int ));
+int _exit (int  );
+#endif
+int exportfs (char * , int  , int  );
+int fcntl (int  , int  , int );
+int fork (void );
+int getdirentries (int  , char * , int  , long * );
+int getdomainname (char * , int  );
+int setdomainname (char * , int );
 #ifndef SYSTEM_FIVE
-int getgid P((void ));
-int getegid P((void ));
+int getgid (void );
+int getegid (void );
 #endif
 #ifndef SYSTEM_FIVE
-int getpgrp P((int ));
+int getpgrp (int );
 #endif
-int getpid P((void ));
-int getppid P((void ));
+int getpid (void );
+int getppid (void );
 #ifndef SYSTEM_FIVE
-int getuid P((void ));
-int geteuid P((void ));
+int getuid (void );
+int geteuid (void );
 #endif
 #ifndef SYSTEM_FIVE
-int ioctl P((int  , int  , char * ));
+int ioctl (int  , int  , char * );
 #endif
-int kill P((int  , int  ));
-int link P((char * , char * ));
-off_t lseek P((int  , long  , int ));
+int kill (int  , int  );
+int link (char * , char * );
+off_t lseek (int  , long  , int );
 #ifdef SYSTEM_FIVE
-int madvise P((char * , int , int ));
-int mmap P((char * , int  , int , int , int , off_t ));
-int mincore P((char * , int  , char * ));
-#endif
-int mkdir P((char *, int  ));
-int mknod P((char * , int , int ));
-int mount P((char * , char * , int ));
-int umount P((char * ));
+int madvise (char * , int , int );
+int mmap (char * , int  , int , int , int , off_t );
+int mincore (char * , int  , char * );
+#endif
+int mkdir (char *, int  );
+int mknod (char * , int , int );
+int mount (char * , char * , int );
+int umount (char * );
 #ifdef SYSTEM_FIVE
-int mprotect P((char * , int , int ));
-int mremap P((char * , int , int , int , int ));
-int munmap P((char * , int ));
-#endif
-int nfs_svc P((int ));
-void nfs_biod P((void ));
-int open P((char * , int  , int  ));
-int pipe P((int [2]));
+int mprotect (char * , int , int );
+int mremap (char * , int , int , int , int );
+int munmap (char * , int );
+#endif
+int nfs_svc (int );
+void nfs_biod (void );
+int open (char * , int  , int  );
+int pipe (int [2]);
 #ifndef SYSTEM_FIVE
-int profil P((char * , int , int , int ));
+int profil (char * , int , int , int );
 #endif
-int ptrace P((int , int , int * , int  ));
+int ptrace (int , int , int * , int  );
 #ifndef SYSTEM_FIVE
-int read P((int , char * , int  ));
+int read (int , char * , int  );
 #endif
 #ifndef SYSTEM_FIVE
-int setpgrp P((int , int ));
+int setpgrp (int , int );
 #endif
 #ifdef SYSTEM_FIVE
-char *stk P((char * ));
-char *sstk P((int  ));
+char *stk (char * );
+char *sstk (int  );
 #endif
-void sync P((void ));
-int umask P((int ));
-int unlink P((char * ));
-pid_t waitpid P((pid_t , int * , int ));
+void sync (void );
+int umask (int );
+int unlink (char * );
+pid_t waitpid (pid_t , int * , int );
 #ifndef SYSTEM_FIVE
-int write P((int , char * , int  ));
+int write (int , char * , int  );
 #endif
 
-void abort P((void ));
-int abs P((int ));
+void abort (void );
+int abs (int );
 #ifndef SYSTEM_FIVE
-int alarm P((unsigned ));
+int alarm (unsigned );
 #endif
-char *crypt P((char * , char * ));
+char *crypt (char * , char * );
 #ifndef SYSTEM_FIVE
-void encrypt P((char * ));
+void encrypt (char * );
 #endif
 #ifndef SYSTEM_FIVE
-char *timezone P((int  , int  ));
-#endif
-char *ecvt P((double , int , int * , int * ));
-char *fcvt P((double , int  , int * , int * ));
-char *gcvt P((double , int , char * ));
-int execl P((char * , char *, ...));
-int execle P((char * , char * ));
-int execv P((char * , char **));
-int exect P((char *, char **, char ** ));
-/* void exit P((int )); */
-double frexp P((double , int * ));
-double ldexp P((double , int  ));
-double modf P((double , double * ));
-struct disktab *getdiskbyname P((char * ));
-char *getenv P((char * ));
-struct fstab *getfsent P((void ));
-struct fstab *getfsspec P((char * ));
-struct fstab *getfsfile P((char * ));
-struct fstab *getfstype P((char * ));
-int endfsent P((void ));
-int setfsent P((void ));
+char *timezone (int  , int  );
+#endif
+char *ecvt (double , int , int * , int * );
+char *fcvt (double , int  , int * , int * );
+char *gcvt (double , int , char * );
+int execl (char * , char *, ...);
+int execle (char * , char * );
+int execv (char * , char **);
+int exect (char *, char **, char ** );
+/* void exit (int ); */
+double frexp (double , int * );
+double ldexp (double , int  );
+double modf (double , double * );
+struct disktab *getdiskbyname (char * );
+char *getenv (char * );
+struct fstab *getfsent (void );
+struct fstab *getfsspec (char * );
+struct fstab *getfsfile (char * );
+struct fstab *getfstype (char * );
+int endfsent (void );
+int setfsent (void );
 #ifndef SYSTEM_FIVE
-struct group *getgrent P((void ));
-struct group *getgrgid P((int ));
-struct group *getgrnam P((const char * ));
-int endgrent P((void ));
-int setgrent P((void ));
-#endif
-char *getlogin P((void ));
-struct hostent *gethostent P((void ));
-struct hostent *gethostbyname P((char * ));
-struct hostent *gethostbyaddr P((char * , int  , int  ));
-void sethostent P((int ));
-void endhostent P((void ));
-struct netent *getnetent P((void ));
-struct netent *getnetbyname P((char * ));
-struct netent *getnetbyaddr P((int  , int ));
-void setnetent P((int ));
-void endnetent P((void ));
-char *getpass P((char * ));
-struct protoent *getprotoent P((void ));
-struct protoent *getprotobyname P((char * ));
-struct protoent *getprotobynumber P((int  ));
-void setprotoent P((int ));
-void endprotoent P((void ));
-int getpw P((int , char * ));
+struct group *getgrent (void );
+struct group *getgrgid (int );
+struct group *getgrnam (const char * );
+int endgrent (void );
+int setgrent (void );
+#endif
+char *getlogin (void );
+struct hostent *gethostent (void );
+struct hostent *gethostbyname (char * );
+struct hostent *gethostbyaddr (char * , int  , int  );
+void sethostent (int );
+void endhostent (void );
+struct netent *getnetent (void );
+struct netent *getnetbyname (char * );
+struct netent *getnetbyaddr (int  , int );
+void setnetent (int );
+void endnetent (void );
+char *getpass (char * );
+struct protoent *getprotoent (void );
+struct protoent *getprotobyname (char * );
+struct protoent *getprotobynumber (int  );
+void setprotoent (int );
+void endprotoent (void );
+int getpw (int , char * );
 #ifndef SYSTEM_FIVE
-struct passwd *getpwent P((void ));
-struct passwd *getpwuid P((int ));
-struct passwd *getpwnam P((const char * ));
-int endpwent P((void ));
-int setpwent P((void ));
-#endif
-char *gets P((char * ));
-struct servent *getservent P((void ));
-struct servent *getservbyname P((char * , char * ));
-struct servent *getservbyport P((int , char * ));
-void setservent P((int ));
-void endservent P((void ));
-struct ttyent *getttyent P((void ));
-struct ttyent *getttynam P((const char * ));
-unsigned long inet_network P((const char * ));
-int initgroups P((char * , int  ));
+struct passwd *getpwent (void );
+struct passwd *getpwuid (int );
+struct passwd *getpwnam (const char * );
+int endpwent (void );
+int setpwent (void );
+#endif
+char *gets (char * );
+struct servent *getservent (void );
+struct servent *getservbyname (char * , char * );
+struct servent *getservbyport (int , char * );
+void setservent (int );
+void endservent (void );
+struct ttyent *getttyent (void );
+struct ttyent *getttynam (const char * );
+unsigned long inet_network (const char * );
+int initgroups (char * , int  );
 #if defined(__STDC__) || defined(_WINDOWS)
-void *malloc P((unsigned ));
+void *malloc (unsigned );
 #else
-char *malloc P((unsigned ));
-#endif
-char *calloc P((unsigned , unsigned  ));
-char *realloc P((char * , unsigned  ));
-void free P((char * ));
-char *alloca P((int  ));
-int mkfifo P((char * , mode_t  ));
-char *mktemp P((char * ));
+char *malloc (unsigned );
+#endif
+char *calloc (unsigned , unsigned  );
+char *realloc (char * , unsigned  );
+void free (char * );
+char *alloca (int  );
+int mkfifo (char * , mode_t  );
+char *mktemp (char * );
 #ifndef SYSTEM_FIVE
-void monitor P((int (* )(), int (* )(), short * , int , int  ));
+void monitor (int (* )(), int (* )(), short * , int , int  );
 #endif
-void monstartup P((int (* )(), int (* )()));
-void moncontrol P((int ));
+void monstartup (int (* )(), int (* )());
+void moncontrol (int );
 #ifndef SYSTEM_FIVE
-void nice P((int ));
-#endif
-long pathconf P((char * , int  ));
-long fpathconf P((int , int ));
-int pause P((void ));
-void perror P((char * ));
-int printf P((const char *, ...));
-int puts P((const char * ));
+void nice (int );
+#endif
+long pathconf (char * , int  );
+long fpathconf (int , int );
+int pause (void );
+void perror (char * );
+int printf (const char *, ...);
+int puts (const char * );
 #ifndef SYSTEM_FIVE
-int qsort P((char * , int  , int , int (* )()));
-#endif
-int rand P((void ));
-void srand P((int ));
-int rcmd P((char ** , u_short , char * , char * , char * , int * ));
-int rresvport P((int * ));
-int ruserok P((char * , int  , char * , char * ));
-int rexec P((char ** , u_short  , char * , char * , char * , int * ));
-int scanf P((const char *, ... ));
-int sscanf P((const char * , const char *, ... ));
-int setpgid P((pid_t  , pid_t  ));
-int setuid P((int  ));
-int seteuid P((int  ));
-int setruid P((int  ));
-int setgid P((int  ));
-int setegid P((int  ));
-int setrgid P((int  ));
+int qsort (char * , int  , int , int (* )());
+#endif
+int rand (void );
+void srand (int );
+int rcmd (char ** , u_short , char * , char * , char * , int * );
+int rresvport (int * );
+int ruserok (char * , int  , char * , char * );
+int rexec (char ** , u_short  , char * , char * , char * , int * );
+int scanf (const char *, ... );
+int sscanf (const char * , const char *, ... );
+int setpgid (pid_t  , pid_t  );
+int setuid (int  );
+int seteuid (int  );
+int setruid (int  );
+int setgid (int  );
+int setegid (int  );
+int setrgid (int  );
 
-int siginterrupt P((int  , int  ));
-unsigned sleep P((unsigned  ));
-int strcmp P((const char * , const char * ));
-char *strcpy P((char * , const char * ));
+int siginterrupt (int  , int  );
+unsigned sleep (unsigned  );
+int strcmp (const char * , const char * );
+char *strcpy (char * , const char * );
 #ifndef hpux
-int strlen P((const char * ));
-#endif
-char *strncat P((char * , const char * , int  ));
-int strncmp P((const char * , const char * , int  ));
-char *strncpy P((char * , const char * , int  ));
-void swab P((char * , char * , int  ));
-long sysconf P((int  ));
-int system P((char * ));
-char *ttyname P((int  ));
-int isatty P((int  ));
-int ttyslot P((void ));
-int utime P((char * , time_t  []));
+int strlen (const char * );
+#endif
+char *strncat (char * , const char * , int  );
+int strncmp (const char * , const char * , int  );
+char *strncpy (char * , const char * , int  );
+void swab (char * , char * , int  );
+long sysconf (int  );
+int system (char * );
+char *ttyname (int  );
+int isatty (int  );
+int ttyslot (void );
+int utime (char * , time_t  []);
 
 #ifndef SYSTEM_FIVE
-int flock P((int  , int  ));
-int fsync P((int  ));
-int getdtablesize P((void ));
-int getgroups P((int  , int * ));
-int gethostid P((void ));
-int sethostid P((int  ));
-int gethostname P((char * , int  ));
-int sethostname P((char * , int  ));
-int getpagesize P((void ));
-int getpriority P((int  , int  ));
-int setpriority P((int  , int  , int  ));
-int getsockname P((int  , char * , int * ));
-int getsockopt P((int  , int  , int  , char * , int * ));
-int setsockopt P((int  , int  , int  , const char * , int  ));
-int killpg P((int  , int  ));
-int listen P((int  , int  ));
-int quota P((int  , int  , int  , caddr_t ));
-int readlink P((char * , char * , int  ));
-int reboot P((int  ));
-int rename P((char * , char * ));
-int rmdir P((char * ));
-int send P((int  , char * , int , int  ));
-int setgroups P((int  , int * ));
-int setregid P((int  , int  ));
-int setquota P((char * , char * ));
-int setreuid P((int  , int  ));
-pid_t setsid P((void ));
-int shutdown P((int  , int  ));
-int sigblock P((int  ));
-int sigpause P((int  ));
-int sigsetmask P((int  ));
-int socket P((int , int  , int  ));
-int socketpair P((int , int  , int  , int  [2 ]));
-int swapon P((char * ));
-int symlink P((char * , char * ));
-int truncate P((char * , int  ));
-int ftruncate P((int  , int  ));
-int vfork P((void ));
-void vhangup P((void ));
-double atof P((char * ));
-int atoi P((char * ));
-long atol P((char * ));
-void bcopy P((const char * , char * , int  ));
-int bcmp P((char * , char * , int  ));
-void bzero P((char * , int  ));
-int ffs P((int  ));
-char *getwd P((char * ));
-void psignal P((unsigned  , char * ));
-void srandom P((int  ));
-long random P((void ));
-char *initstate P((unsigned  , char * , int  ));
-char *setstate P((char * ));
-char *re_comp P((char * ));
-int re_exec P((char * ));
-void openlog P((const char * , int, int  )); /* our local version... */
-void syslog P((int  , const char *, ... ));
-void closelog P((void ));
-char *valloc P((unsigned  ));
-int vlimit P((int  , int  ));
-#endif
-int execlp P((char * , char *, ... ));
-int execvp P((char * , char * []));
-int plock P((int ));
-char *shmat P((int  , char * , int  ));
-int shmdt P((char * ));
-void sys3b P((int  , int  , int  ));
-long ulimit P((int  , long  ));
-long a64l P((char * ));
-char *l64a P((long  ));
-void _assert P((char * , char * , int  ));
-char *bsearch P((char * , char * , unsigned  , unsigned  , int (* )(char *, char *)));
-long clock P((void ));
-char *ctermid P((char * ));
-char *cuserid P((char * ));
-double drand48 P((void ));
-double erand48 P((unsigned short  [3 ]));
-long lrand48 P((void ));
-long nrand48 P((unsigned short  [3 ]));
-long mrand48 P((void ));
-long jrand48 P((unsigned short  [3 ]));
-void srand48 P((long s ));
-unsigned short *seed48 P((unsigned short  [3 ]));
-void lcong48 P((unsigned short  [7 ]));
-char *getcwd P((char * , int  ));
-int getopt P((int  , char ** , char * ));
-int hcreate P((unsigned  ));
-void hdestroy P((void ));
-void l3tol P((long * , char * , int  ));
-void ltol3 P((char * , long * , int  ));
-char *lsearch P((char * , char * , unsigned * , unsigned  , int (* )(char *, char *)));
-char *lfind P((char * , char * , unsigned * , unsigned  , int (* )(char *, char *)));
-char *memccpy P((char * , char * , int  , int  ));
-char *memchr P((char * , int  , int  ));
-int memcmp P((char * , char * , int  ));
-char *memcpy P((char * , const char * , int  ));
-char *memset P((char * , int  , int  ));
-int gsignal P((int  ));
-double strtod P((char * , char ** ));
-long strtol P((char * , char ** , int  ));
-char *tmpnam P((char * ));
-char *tempnam P((char * , char * ));
-char *tsearch P((char * , char ** , int (* )(char *, char *)));
-char *tfind P((char * , char ** , int (* )(char *, char *)));
-char *tdelete P((char * , char ** , int (* )(char *, char *)));
-void twalk P((char * , void (* )(char *, int, int)));
-int syscall P((int  , int  , int  , int  ));
-long tell P((int  ));
+int flock (int  , int  );
+int fsync (int  );
+int getdtablesize (void );
+int getgroups (int  , int * );
+int gethostid (void );
+int sethostid (int  );
+int gethostname (char * , int  );
+int sethostname (char * , int  );
+int getpagesize (void );
+int getpriority (int  , int  );
+int setpriority (int  , int  , int  );
+int getsockname (int  , char * , int * );
+int getsockopt (int  , int  , int  , char * , int * );
+int setsockopt (int  , int  , int  , const char * , int  );
+int killpg (int  , int  );
+int listen (int  , int  );
+int quota (int  , int  , int  , caddr_t );
+int readlink (char * , char * , int  );
+int reboot (int  );
+int rename (char * , char * );
+int rmdir (char * );
+int send (int  , char * , int , int  );
+int setgroups (int  , int * );
+int setregid (int  , int  );
+int setquota (char * , char * );
+int setreuid (int  , int  );
+pid_t setsid (void );
+int shutdown (int  , int  );
+int sigblock (int  );
+int sigpause (int  );
+int sigsetmask (int  );
+int socket (int , int  , int  );
+int socketpair (int , int  , int  , int  [2 ]);
+int swapon (char * );
+int symlink (char * , char * );
+int truncate (char * , int  );
+int ftruncate (int  , int  );
+int vfork (void );
+void vhangup (void );
+double atof (char * );
+int atoi (char * );
+long atol (char * );
+void bcopy (const char * , char * , int  );
+int bcmp (char * , char * , int  );
+void bzero (char * , int  );
+int ffs (int  );
+char *getwd (char * );
+void psignal (unsigned  , char * );
+void srandom (int  );
+long random (void );
+char *initstate (unsigned  , char * , int  );
+char *setstate (char * );
+char *re_comp (char * );
+int re_exec (char * );
+void openlog (const char * , int, int  ); /* our local version... */
+void syslog (int  , const char *, ... );
+void closelog (void );
+char *valloc (unsigned  );
+int vlimit (int  , int  );
+#endif
+int execlp (char * , char *, ... );
+int execvp (char * , char * []);
+int plock (int );
+char *shmat (int  , char * , int  );
+int shmdt (char * );
+void sys3b (int  , int  , int  );
+long ulimit (int  , long  );
+long a64l (char * );
+char *l64a (long  );
+void _assert (char * , char * , int  );
+char *bsearch (char * , char * , unsigned  , unsigned  , int (* )(char *, char *));
+long clock (void );
+char *ctermid (char * );
+char *cuserid (char * );
+double drand48 (void );
+double erand48 (unsigned short  [3 ]);
+long lrand48 (void );
+long nrand48 (unsigned short  [3 ]);
+long mrand48 (void );
+long jrand48 (unsigned short  [3 ]);
+void srand48 (long s );
+unsigned short *seed48 (unsigned short  [3 ]);
+void lcong48 (unsigned short  [7 ]);
+char *getcwd (char * , int  );
+int getopt (int  , char ** , char * );
+int hcreate (unsigned  );
+void hdestroy (void );
+void l3tol (long * , char * , int  );
+void ltol3 (char * , long * , int  );
+char *lsearch (char * , char * , unsigned * , unsigned  , int (* )(char *, char *));
+char *lfind (char * , char * , unsigned * , unsigned  , int (* )(char *, char *));
+char *memccpy (char * , char * , int  , int  );
+char *memchr (char * , int  , int  );
+int memcmp (char * , char * , int  );
+char *memcpy (char * , const char * , int  );
+char *memset (char * , int  , int  );
+int gsignal (int  );
+double strtod (char * , char ** );
+long strtol (char * , char ** , int  );
+char *tmpnam (char * );
+char *tempnam (char * , char * );
+char *tsearch (char * , char ** , int (* )(char *, char *));
+char *tfind (char * , char ** , int (* )(char *, char *));
+char *tdelete (char * , char ** , int (* )(char *, char *));
+void twalk (char * , void (* )(char *, int, int));
+int syscall (int  , int  , int  , int  );
+long tell (int  );
 
 #ifdef SYSTEM_FIVE
 
-unsigned alarm P((unsigned ));
-int brk P((char * ));
-void _exit P((int  ));
-int getpgrp P((void ));
-unsigned short getuid P((void ));
-unsigned short geteuid P((void ));
-unsigned short getgid P((void ));
-unsigned short getegid P((void ));
-int ioctl P((int  , int  , int  ));
-int nice P((int  ));
-void profil P((char * , int  , int  , int  ));
-int read P((int  , char * , unsigned  ));
-int setpgrp P((void ));
-int write P((int  , char * , unsigned  ));
-void setkey P((char * ));
-void encrypt P((char * , int  ));
-void tzset P((void ));
-struct group *getgrent P((void ));
-struct group *getgrgid P((int  ));
-struct group *getgrnam P((char * ));
-void setgrent P((void ));
-void endgrent P((void ));
-struct passwd *getpwent P((void ));
-struct passwd *getpwuid P((int  ));
-struct passwd *getpwnam P((const char * ));
-void setpwent P((void ));
-void endpwent P((void ));
-void qsort P((char * , unsigned  , unsigned  , int (* )()));
+unsigned alarm (unsigned );
+int brk (char * );
+void _exit (int  );
+int getpgrp (void );
+unsigned short getuid (void );
+unsigned short geteuid (void );
+unsigned short getgid (void );
+unsigned short getegid (void );
+int ioctl (int  , int  , int  );
+int nice (int  );
+void profil (char * , int  , int  , int  );
+int read (int  , char * , unsigned  );
+int setpgrp (void );
+int write (int  , char * , unsigned  );
+void setkey (char * );
+void encrypt (char * , int  );
+void tzset (void );
+struct group *getgrent (void );
+struct group *getgrgid (int  );
+struct group *getgrnam (char * );
+void setgrent (void );
+void endgrent (void );
+struct passwd *getpwent (void );
+struct passwd *getpwuid (int  );
+struct passwd *getpwnam (const char * );
+void setpwent (void );
+void endpwent (void );
+void qsort (char * , unsigned  , unsigned  , int (* )());
 #endif
 
 #endif /* MIPS/Ultrix */
 
 #ifdef ibm032
 #ifndef memcpy
-extern void *memcpy P((void *, const void *, unsigned int));
+extern void *memcpy (void *, const void *, unsigned int);
 #endif
 #ifndef memset
-extern void *memset P((void *, int, unsigned int));
+extern void *memset (void *, int, unsigned int);
 #endif
-extern int bcmp P((void *, void *, unsigned int));
-extern void *calloc P((unsigned int, unsigned int));
-extern void *malloc P((unsigned int));
-extern void *realloc P((void *, unsigned int));
-extern void free P((void *));
+extern int bcmp (void *, void *, unsigned int);
+extern void *calloc (unsigned int, unsigned int);
+extern void *malloc (unsigned int);
+extern void *realloc (void *, unsigned int);
+extern void free (void *);
 #ifndef abort
-extern void abort P((void));
+extern void abort (void);
 #endif
-extern char *getenv P((const char *));
+extern char *getenv (const char *);
 
-extern double atof P((const char *));
-extern int    atoi P((const char *));
+extern double atof (const char *);
+extern int    atoi (const char *);
 
 #ifndef abs
 extern int abs(int);
diff --git a/src/include/krb5.hin b/src/include/krb5.hin
index 6d96a0d..ee37016 100644
--- a/src/include/krb5.hin
+++ b/src/include/krb5.hin
@@ -206,8 +206,6 @@ typedef struct _krb5_data {
 typedef	void * krb5_pointer;
 typedef void krb5_const * krb5_const_pointer;
 
-#define KRB5_PROTOTYPE(x) x
-
 typedef struct krb5_principal_data {
     krb5_magic magic;
     krb5_data realm;
diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index 2baa1ec..d2106cb 100644
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* macsock.h (PROTOTYPE): Don't define.
+
 2001-10-05  Ken Raeburn  <raeburn@mit.edu>
 
 	* adm_defs.h, kdb.h, kdb_dbc.h, kdb_dbm.h, kdb_kt.h, kwinsock.h:
diff --git a/src/include/krb5/macsock.h b/src/include/krb5/macsock.h
index 6dc8c32..f6ec6fe 100644
--- a/src/include/krb5/macsock.h
+++ b/src/include/krb5/macsock.h
@@ -31,13 +31,6 @@
 #define const
 #define volatile
 #define signed
-#ifndef PROTOTYPE
-#define PROTOTYPE(p) ()
-#endif
-#else
-#ifndef PROTOTYPE
-#define PROTOTYPE(p) p
-#endif
 #endif
 
 #define	WORD	short
diff --git a/src/include/krb54proto.h b/src/include/krb54proto.h
index 11bec3f..d1d16e1 100644
--- a/src/include/krb54proto.h
+++ b/src/include/krb54proto.h
@@ -3,16 +3,16 @@
  */
 
 extern krb5_error_code krb54_get_service_keyblock
-	PROTOTYPE((char *service, char *instance, char *realm,
+	(char *service, char *instance, char *realm,
 		   int kvno, char *file,
-		   krb5_keyblock * keyblock));
+		   krb5_keyblock * keyblock);
 extern int decomp_tkt_krb5
-	PROTOTYPE((KTEXT tkt, unsigned char *flags, char *pname,
+	(KTEXT tkt, unsigned char *flags, char *pname,
 		   char *pinstance, char *prealm, unsigned KRB4_32 *paddress,
 		   des_cblock session, int *life, unsigned KRB4_32 *time_sec, 
-		   char *sname, char *sinstance, krb5_keyblock *k5key));
+		   char *sname, char *sinstance, krb5_keyblock *k5key);
 extern int krb_set_key_krb5
-	PROTOTYPE ((krb5_context ctx, krb5_keyblock *key));
+	(krb5_context ctx, krb5_keyblock *key);
 void krb_clear_key_krb5
-	PROTOTYPE ((krb5_context ctx));
+	(krb5_context ctx);
 
diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog
index 39e2f6c..cbc4093 100644
--- a/src/kadmin/cli/ChangeLog
+++ b/src/kadmin/cli/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* dump.c: Make prototypes unconditional.
+
 2001-06-26  Ezra Peisach  <epeisach@mit.edu>
 
 	* getdate.y: Provide full prototype for getdate_yylex() and
diff --git a/src/kadmin/cli/dump.c b/src/kadmin/cli/dump.c
index 162e35d..1896e21 100644
--- a/src/kadmin/cli/dump.c
+++ b/src/kadmin/cli/dump.c
@@ -433,10 +433,10 @@ void dump_db(argc, argv)
     char		*programname;
     char		*ofile;
     krb5_error_code	kret;
-    krb5_error_code	(*dump_iterator) PROTOTYPE((krb5_pointer,
-						    char *,
-						    kadm5_principal_ent_rec *));
-    krb5_error_code	(*dump_header) PROTOTYPE((struct dump_args *));
+    krb5_error_code	(*dump_iterator) (krb5_pointer,
+					  char *,
+					  kadm5_principal_ent_rec *);
+    krb5_error_code	(*dump_header) (struct dump_args *);
     const char		* dump_name;
     int			aindex, num, i;
     krb5_boolean	locked;
@@ -1329,11 +1329,11 @@ load_db(argc, argv)
     const char		*dumpfile;
     char		*dbname;
     char		*dbname_tmp;
-    int			(*restore_function) PROTOTYPE((const char *,
+    int			(*restore_function) (const char *,
 						       krb5_context,
 						       const char *,
 						       FILE *,
-						       int));
+						       int);
     const char		* restore_name;
     int			update, verbose;
     krb5_int32		crflags;
diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog
index c753a2c..e8d5c24 100644
--- a/src/kadmin/dbutil/ChangeLog
+++ b/src/kadmin/dbutil/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* dump.c, kdb5_create.c, kdb5_util.h, loadv4.c, tcl_wrapper.c:
+	Make prototypes unconditional.
+
 2001-07-16  Ken Raeburn  <raeburn@mit.edu>
 
 	* string_table.c (str_INITING_KCONTEXT): Variable deleted.
diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c
index fbc8837..0a6f57f 100644
--- a/src/kadmin/dbutil/dump.c
+++ b/src/kadmin/dbutil/dump.c
@@ -66,37 +66,37 @@ struct dump_args {
     int			verbose;
 };
 
-static krb5_error_code dump_k5beta_iterator PROTOTYPE((krb5_pointer,
-						       krb5_db_entry *));
-static krb5_error_code dump_k5beta6_iterator PROTOTYPE((krb5_pointer,
-							krb5_db_entry *));
-static krb5_error_code dump_k5beta6_iterator_ext PROTOTYPE((krb5_pointer,
-							    krb5_db_entry *,
-							    int));
-static krb5_error_code dump_k5beta7_princ PROTOTYPE((krb5_pointer,
-						     krb5_db_entry *));
-static krb5_error_code dump_k5beta7_princ_ext PROTOTYPE((krb5_pointer,
-							 krb5_db_entry *,
-							 int));
+static krb5_error_code dump_k5beta_iterator (krb5_pointer,
+					     krb5_db_entry *);
+static krb5_error_code dump_k5beta6_iterator (krb5_pointer,
+					      krb5_db_entry *);
+static krb5_error_code dump_k5beta6_iterator_ext (krb5_pointer,
+						  krb5_db_entry *,
+						  int);
+static krb5_error_code dump_k5beta7_princ (krb5_pointer,
+					   krb5_db_entry *);
+static krb5_error_code dump_k5beta7_princ_ext (krb5_pointer,
+					       krb5_db_entry *,
+					       int);
 static krb5_error_code dump_k5beta7_princ_withpolicy
-			PROTOTYPE((krb5_pointer, krb5_db_entry *));
-static krb5_error_code dump_ov_princ PROTOTYPE((krb5_pointer,
-						krb5_db_entry *));
-static void dump_k5beta7_policy PROTOTYPE((void *, osa_policy_ent_t));
-
-typedef krb5_error_code (*dump_func)PROTOTYPE((krb5_pointer,
-					       krb5_db_entry *));
-
-static int process_k5beta_record PROTOTYPE((char *, krb5_context,
-					    FILE *, int, int *, void *));
-static int process_k5beta6_record PROTOTYPE((char *, krb5_context,
-					     FILE *, int, int *, void *));
-static int process_k5beta7_record PROTOTYPE((char *, krb5_context,
-					     FILE *, int, int *, void *));
-static int process_ov_record PROTOTYPE((char *, krb5_context,
-					FILE *, int, int *, void *));
-typedef krb5_error_code (*load_func)PROTOTYPE((char *, krb5_context,
-					       FILE *, int, int *, void *));
+			(krb5_pointer, krb5_db_entry *);
+static krb5_error_code dump_ov_princ (krb5_pointer,
+				      krb5_db_entry *);
+static void dump_k5beta7_policy (void *, osa_policy_ent_t);
+
+typedef krb5_error_code (*dump_func)(krb5_pointer,
+				     krb5_db_entry *);
+
+static int process_k5beta_record (char *, krb5_context,
+				  FILE *, int, int *, void *);
+static int process_k5beta6_record (char *, krb5_context,
+				   FILE *, int, int *, void *);
+static int process_k5beta7_record (char *, krb5_context,
+				   FILE *, int, int *, void *);
+static int process_ov_record (char *, krb5_context,
+			      FILE *, int, int *, void *);
+typedef krb5_error_code (*load_func)(char *, krb5_context,
+				     FILE *, int, int *, void *);
 
 typedef struct _dump_version {
      char *name;
diff --git a/src/kadmin/dbutil/kdb5_create.c b/src/kadmin/dbutil/kdb5_create.c
index c6ff334..74210ab 100644
--- a/src/kadmin/dbutil/kdb5_create.c
+++ b/src/kadmin/dbutil/kdb5_create.c
@@ -93,10 +93,10 @@ struct iterate_args {
 };
 
 static krb5_error_code add_principal 
-	PROTOTYPE((krb5_context,
-		   krb5_principal, 
-		   enum ap_op,
-		   struct realm_info *));
+	(krb5_context,
+	 krb5_principal,
+	 enum ap_op,
+	 struct realm_info *);
 
 /*
  * Steps in creating a database:
diff --git a/src/kadmin/dbutil/kdb5_util.h b/src/kadmin/dbutil/kdb5_util.h
index 8c72754..c63ca03 100644
--- a/src/kadmin/dbutil/kdb5_util.h
+++ b/src/kadmin/dbutil/kdb5_util.h
@@ -44,43 +44,43 @@ extern krb5_db_entry master_db;
 extern void usage(void);
 
 extern void add_key 
-	PROTOTYPE((char const *, char const *, 
+	(char const *, char const *, 
 		   krb5_const_principal, const krb5_keyblock *, 
-		   krb5_kvno, krb5_keysalt *));
+		   krb5_kvno, krb5_keysalt *);
 extern int set_dbname_help
-	PROTOTYPE((char *, char *));
+	(char *, char *);
 
-extern char *kdb5_util_Init PROTOTYPE((int, char **));
+extern char *kdb5_util_Init (int, char **);
 
-extern int quit PROTOTYPE((void));
+extern int quit (void);
 
 extern int check_for_match
-	PROTOTYPE((char *, int, krb5_db_entry *, int, int));
+	(char *, int, krb5_db_entry *, int, int);
 
 extern void parse_token
-	PROTOTYPE((char *, int *, int *, char *));
+	(char *, int *, int *, char *);
 
-extern int create_db_entry PROTOTYPE((krb5_principal, krb5_db_entry *));
+extern int create_db_entry (krb5_principal, krb5_db_entry *);
 
-extern int kadm5_create_magic_princs PROTOTYPE((kadm5_config_params *params,
-						krb5_context context));
+extern int kadm5_create_magic_princs (kadm5_config_params *params,
+						krb5_context context);
 
-extern int process_ov_principal PROTOTYPE((char *fname, krb5_context kcontext, 
+extern int process_ov_principal (char *fname, krb5_context kcontext, 
 					   FILE *filep, int verbose, 
 					   int *linenop,
-					   void *pol_db));
+					   void *pol_db);
 
-extern void load_db PROTOTYPE((int argc, char **argv));
-extern void dump_db PROTOTYPE((int argc, char **argv));
-extern void load_v4db PROTOTYPE((int argc, char **argv));
-extern void dump_v4db PROTOTYPE((int argc, char **argv));
-extern void kdb5_create PROTOTYPE((int argc, char **argv));
-extern void kdb5_destroy PROTOTYPE((int argc, char **argv));
-extern void kdb5_stash PROTOTYPE((int argc, char **argv));
+extern void load_db (int argc, char **argv);
+extern void dump_db (int argc, char **argv);
+extern void load_v4db (int argc, char **argv);
+extern void dump_v4db (int argc, char **argv);
+extern void kdb5_create (int argc, char **argv);
+extern void kdb5_destroy (int argc, char **argv);
+extern void kdb5_stash (int argc, char **argv);
 
-extern void update_ok_file PROTOTYPE((char *file_name));
+extern void update_ok_file (char *file_name);
 
-extern int kadm5_create PROTOTYPE((kadm5_config_params *params));
+extern int kadm5_create (kadm5_config_params *params);
 
-void usage PROTOTYPE((void));
+void usage (void);
 
diff --git a/src/kadmin/dbutil/loadv4.c b/src/kadmin/dbutil/loadv4.c
index a93f7aa..197d4bf 100644
--- a/src/kadmin/dbutil/loadv4.c
+++ b/src/kadmin/dbutil/loadv4.c
@@ -107,19 +107,19 @@ static int verbose = 0;
 static int shortlife = 0;
 
 static krb5_error_code add_principal 
-	PROTOTYPE((krb5_context,
+		  (krb5_context,
 		   krb5_principal, 
 		   enum ap_op,
-		   struct realm_info *));
-
-static int v4init PROTOTYPE((char *, int, char *));
-static krb5_error_code enter_in_v5_db PROTOTYPE((krb5_context,
-						 char *, Principal *));
-static krb5_error_code process_v4_dump PROTOTYPE((krb5_context, char *,
-						  char *, long));
-static krb5_error_code v4_dump_find_default PROTOTYPE((krb5_context, char *,
-						       char *, long *));
-static krb5_error_code fixup_database PROTOTYPE((krb5_context, char *));
+		   struct realm_info *);
+
+static int v4init (char *, int, char *);
+static krb5_error_code enter_in_v5_db (krb5_context,
+				       char *, Principal *);
+static krb5_error_code process_v4_dump (krb5_context, char *,
+					char *, long);
+static krb5_error_code v4_dump_find_default (krb5_context, char *,
+					     char *, long *);
+static krb5_error_code fixup_database (krb5_context, char *);
 	
 static int create_local_tgt = 0;
 
diff --git a/src/kadmin/dbutil/tcl_wrapper.c b/src/kadmin/dbutil/tcl_wrapper.c
index ab4f25b..16721ae 100644
--- a/src/kadmin/dbutil/tcl_wrapper.c
+++ b/src/kadmin/dbutil/tcl_wrapper.c
@@ -40,8 +40,7 @@
     Tcl_Interp * interp;\
     int argc;\
     char ** argv;
-#define CMDPROTO(x) int x PROTOTYPE((ClientData, Tcl_Interp,\
-				     int, char **))
+#define CMDPROTO(x) int x (ClientData, Tcl_Interp, int, char **)
 #define MKCMD(name,cmd) Tcl_CreateCommand(interp, name, cmd,\
 					 (ClientData)NULL,\
 					 (Tcl_CmdDeleteProc *)NULL)
@@ -53,19 +52,19 @@ extern Tcl_Interp *interp;	/* XXX yes, this is gross,
 				   but we do need it for some things */
 extern int exit_status;
 
-void show_principal PROTOTYPE((int, char **));
-void add_new_key PROTOTYPE((int, char **));
-void change_pwd_key PROTOTYPE((int, char **));
-void add_rnd_key PROTOTYPE((int, char **));
-void change_rnd_key PROTOTYPE((int, char **));
-void delete_entry PROTOTYPE((int, char **));
-void extract_srvtab PROTOTYPE((krb5_context, int, char **));
-void extract_v4_srvtab PROTOTYPE((int, char **));
-void list_db PROTOTYPE((int, char **));
-void dump_db PROTOTYPE((int, char **));
-void load_db PROTOTYPE((int, char **));
-void set_dbname PROTOTYPE((krb5_context, int, char **));
-void enter_master_key PROTOTYPE((krb5_context, int, char **));
+void show_principal (int, char **);
+void add_new_key (int, char **);
+void change_pwd_key (int, char **);
+void add_rnd_key (int, char **);
+void change_rnd_key (int, char **);
+void delete_entry (int, char **);
+void extract_srvtab (krb5_context, int, char **);
+void extract_v4_srvtab (int, char **);
+void list_db (int, char **);
+void dump_db (int, char **);
+void load_db (int, char **);
+void set_dbname (krb5_context, int, char **);
+void enter_master_key (krb5_context, int, char **);
 
 /*
  * this is mostly stolen from tcl_ExitCmd()
diff --git a/src/kadmin/ktutil/ChangeLog b/src/kadmin/ktutil/ChangeLog
index 789f0bc..e7bc046 100644
--- a/src/kadmin/ktutil/ChangeLog
+++ b/src/kadmin/ktutil/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* ktutil.h: Make prototypes unconditional.
+
 2001-09-01  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (SRCS): Find ktutil_ct.c in build directory.
diff --git a/src/kadmin/ktutil/ktutil.h b/src/kadmin/ktutil/ktutil.h
index 8d7d63e..d25c8d9 100644
--- a/src/kadmin/ktutil/ktutil.h
+++ b/src/kadmin/ktutil/ktutil.h
@@ -30,72 +30,46 @@ typedef struct _krb5_kt_list {
     krb5_keytab_entry *entry;
 } *krb5_kt_list;
 
-krb5_error_code ktutil_free_kt_list
-	KRB5_PROTOTYPE((krb5_context,
-			krb5_kt_list));
+krb5_error_code ktutil_free_kt_list (krb5_context, krb5_kt_list);
 
-krb5_error_code ktutil_delete
-	KRB5_PROTOTYPE((krb5_context,
-			krb5_kt_list *,
-			int));
+krb5_error_code ktutil_delete (krb5_context, krb5_kt_list *, int);
 
-krb5_error_code ktutil_add
-	KRB5_PROTOTYPE((krb5_context,
-			krb5_kt_list *,
-			char *,
-			krb5_kvno,
-			char *,
-			int));
+krb5_error_code ktutil_add (krb5_context,
+			    krb5_kt_list *,
+			    char *,
+			    krb5_kvno,
+			    char *,
+			    int);
 
-krb5_error_code ktutil_read_keytab
-	KRB5_PROTOTYPE((krb5_context,
-			char *,
-			krb5_kt_list *));
+krb5_error_code ktutil_read_keytab (krb5_context,
+				    char *,
+				    krb5_kt_list *);
 
-krb5_error_code ktutil_write_keytab
-	KRB5_PROTOTYPE((krb5_context,
-			krb5_kt_list,
-			char *));
+krb5_error_code ktutil_write_keytab (krb5_context,
+				     krb5_kt_list,
+				     char *);
 
 #ifdef KRB5_KRB4_COMPAT
-krb5_error_code ktutil_read_srvtab
-	KRB5_PROTOTYPE((krb5_context,
-			char *,
-			krb5_kt_list *));
-krb5_error_code ktutil_write_srvtab
-	KRB5_PROTOTYPE((krb5_context,
-			krb5_kt_list,
-			char *));
+krb5_error_code ktutil_read_srvtab (krb5_context,
+				    char *,
+				    krb5_kt_list *);
+krb5_error_code ktutil_write_srvtab (krb5_context,
+				     krb5_kt_list,
+				     char *);
 #endif
 
-void ktutil_add_entry
-	KRB5_PROTOTYPE((int,
-			char *[]));
+void ktutil_add_entry (int, char *[]);
 
-void ktutil_clear_list
-	KRB5_PROTOTYPE((int,
-			char *[]));
+void ktutil_clear_list (int, char *[]);
 
-void ktutil_read_v5
-	KRB5_PROTOTYPE((int,
-			char *[]));
+void ktutil_read_v5 (int, char *[]);
 
-void ktutil_read_v4
-	KRB5_PROTOTYPE((int,
-			char *[]));
+void ktutil_read_v4 (int, char *[]);
 
-void ktutil_write_v5
-	KRB5_PROTOTYPE((int,
-			char *[]));
+void ktutil_write_v5 (int, char *[]);
 
-void ktutil_write_v4
-	KRB5_PROTOTYPE((int,
-			char *[]));
+void ktutil_write_v4 (int, char *[]);
 
-void ktutil_delete_entry
-	KRB5_PROTOTYPE((int,
-			char *[]));
+void ktutil_delete_entry (int, char *[]);
 
-void ktutil_list
-	KRB5_PROTOTYPE((int,
-			char *[]));
+void ktutil_list (int, char *[]);
diff --git a/src/kadmin/v5passwdd/ChangeLog b/src/kadmin/v5passwdd/ChangeLog
index b295dde..2e567f4 100644
--- a/src/kadmin/v5passwdd/ChangeLog
+++ b/src/kadmin/v5passwdd/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* adm_conn.c, adm_rw.c, kadm5_defs.h: Make prototypes
+	unconditional.
+
 2001-10-05  Ken Raeburn  <raeburn@mit.edu>
 
 	* adm_conn.c: Drop _MSDOS support.
diff --git a/src/kadmin/v5passwdd/adm_conn.c b/src/kadmin/v5passwdd/adm_conn.c
index 6459d3b..d9e6d82 100644
--- a/src/kadmin/v5passwdd/adm_conn.c
+++ b/src/kadmin/v5passwdd/adm_conn.c
@@ -49,30 +49,30 @@
  * Prototypes for local functions
  */
 static krb5_error_code kadm_get_ccache
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   char *,
 		   char *,
 		   krb5_ccache *,
-		   krb5_principal *));
+		   krb5_principal *);
 static krb5_error_code kadm_get_creds
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		krb5_ccache ,
 		krb5_principal,
 		krb5_creds  *,
 		const char *,
 		char *,
-		krb5_timestamp));
+		krb5_timestamp);
 static krb5_error_code kadm_contact_server
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		krb5_data *,
 		int *,
 		krb5_address **,
-		krb5_address **));
+		krb5_address **);
 static krb5_error_code kadm_get_auth
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		krb5_auth_context *,
 		krb5_address *,
-		krb5_address *));
+		krb5_address *);
 
 /*
  * kadm_get_ccache()	- Initialze a credentials cache.
diff --git a/src/kadmin/v5passwdd/adm_rw.c b/src/kadmin/v5passwdd/adm_rw.c
index 08005a8..8b5c71a 100644
--- a/src/kadmin/v5passwdd/adm_rw.c
+++ b/src/kadmin/v5passwdd/adm_rw.c
@@ -35,8 +35,8 @@
 /*
  * Local prototypes (needed or else the PC will pass fail).
  */
-static void kadm_copyin_int32 PROTOTYPE((char *, krb5_int32 *));
-static void kadm_copyout_int32 PROTOTYPE((krb5_int32, char *));
+static void kadm_copyin_int32 (char *, krb5_int32 *);
+static void kadm_copyout_int32 (krb5_int32, char *);
 
 /*
  * Routines to [de]serialize integers.
diff --git a/src/kadmin/v5passwdd/kadm5_defs.h b/src/kadmin/v5passwdd/kadm5_defs.h
index 8201f29..3f587ea 100644
--- a/src/kadmin/v5passwdd/kadm5_defs.h
+++ b/src/kadmin/v5passwdd/kadm5_defs.h
@@ -110,14 +110,14 @@
  * Inter-module function prototypes
  */
 
-krb5_keytab key_keytab_id KRB5_PROTOTYPE((void));
-krb5_error_code key_open_db KRB5_PROTOTYPE((krb5_context));
-krb5_error_code key_close_db KRB5_PROTOTYPE((krb5_context));
+krb5_keytab key_keytab_id (void);
+krb5_error_code key_open_db (krb5_context);
+krb5_error_code key_close_db (krb5_context);
 
 #if 0
 /* srv_key.c */
 krb5_error_code key_init
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 			int,
 			int,
 			char *,
@@ -127,241 +127,241 @@ krb5_error_code key_init
 			char *,
 			char *,
 			krb5_int32,
-			krb5_key_salt_tuple *));
+			krb5_key_salt_tuple *);
 void key_finish
-	KRB5_PROTOTYPE((krb5_context,
-			int));
+	(krb5_context,
+			int);
 krb5_error_code key_string_to_keys
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 			krb5_db_entry *,
 			krb5_data *,
 			krb5_int32,
 			krb5_key_salt_tuple *,
 			krb5_int32 *,
-			krb5_key_data **));
+			krb5_key_data **);
 krb5_error_code key_random_key
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 			krb5_db_entry *,
 			krb5_int32 *,
-			krb5_key_data **));
+			krb5_key_data **);
 krb5_error_code key_encrypt_keys
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 			krb5_db_entry *,
 			krb5_int32 *,
 			krb5_key_data *,
-			krb5_key_data **));
+			krb5_key_data **);
 krb5_error_code key_decrypt_keys
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 			krb5_db_entry *,
 			krb5_int32 *,
 			krb5_key_data *,
-			krb5_key_data **));
+			krb5_key_data **);
 krb5_boolean key_pwd_is_weak
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 			krb5_db_entry *,
-			krb5_data *));
+			krb5_data *);
 krb5_db_entry *key_master_entry();
 char *key_master_realm();
 krb5_keyblock *key_admin_key();
 krb5_encrypt_block *key_master_encblock();
-void key_free_key_data KRB5_PROTOTYPE((krb5_key_data *,
-				       krb5_int32));
+void key_free_key_data (krb5_key_data *,
+				       krb5_int32);
 krb5_error_code key_dbent_to_keysalts
-	KRB5_PROTOTYPE((krb5_db_entry *,
+	(krb5_db_entry *,
 			krb5_int32 *,
-			krb5_key_salt_tuple **));
+			krb5_key_salt_tuple **);
 krb5_error_code key_update_tl_attrs
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 			krb5_db_entry *,
 			krb5_principal,
-			krb5_boolean));
+			krb5_boolean);
 
 /* srv_acl.c */
 krb5_error_code acl_init
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
-		   char *));
+		   char *);
 void acl_finish
-	KRB5_PROTOTYPE((krb5_context,
-		   int));
+	(krb5_context,
+		   int);
 krb5_boolean acl_op_permitted
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_principal,
 		   krb5_int32,
-		   char *));
+		   char *);
 
 #endif
 
 /* srv_output.c */
 krb5_error_code output_init
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   char *,
-		   krb5_boolean));
+		   krb5_boolean);
 void output_finish
-	KRB5_PROTOTYPE((krb5_context,
-		   int));
+	(krb5_context,
+		   int);
 krb5_boolean output_lang_supported
-	KRB5_PROTOTYPE((char *));
+	(char *);
 char *output_krb5_errmsg
-	KRB5_PROTOTYPE((char *,
+	(char *,
 		   krb5_boolean,
-		   krb5_int32));
+		   krb5_int32);
 char *output_adm_error
-	KRB5_PROTOTYPE((char *,
+	(char *,
 		   krb5_boolean,
 		   krb5_int32,
 		   krb5_int32,
 		   krb5_int32,
-		   krb5_data *));
+		   krb5_data *);
 
 /* srv_net.c */
 krb5_error_code net_init
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   char *,
 		   int,
-		   krb5_int32));
+		   krb5_int32);
 void net_finish
-	KRB5_PROTOTYPE((krb5_context,
-		   int));
+	(krb5_context,
+		   int);
 krb5_error_code net_dispatch
-	KRB5_PROTOTYPE((krb5_context, int));
-krb5_principal net_server_princ KRB5_PROTOTYPE((void));
+	(krb5_context, int);
+krb5_principal net_server_princ (void);
 
 /* proto_serv.c */
 krb5_error_code proto_init
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
-		   int));
+		   int);
 void proto_finish
-	KRB5_PROTOTYPE((krb5_context,
-		   int));
+	(krb5_context,
+		   int);
 krb5_error_code proto_serv
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_int32,
 		   int,
 		   void *,
-		   void *));
+		   void *);
 
 krb5_int32 passwd_change
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   krb5_auth_context,
 		   krb5_ticket *,
 		   krb5_data *,
 		   krb5_data *,
-		   krb5_int32 *));
+		   krb5_int32 *);
 
 krb5_int32 pwd_change
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   krb5_auth_context,
 		   krb5_ticket *,
 		   krb5_data *,
 		   krb5_data *,
 		   char [],
-		   unsigned int));
+		   unsigned int);
 
 #if 0
 
 /* passwd.c */
 krb5_int32 passwd_check
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   krb5_auth_context,
 		   krb5_ticket *,
 		   krb5_data *,
-		   krb5_int32 *));
+		   krb5_int32 *);
 krb5_int32 passwd_change
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   krb5_auth_context,
 		   krb5_ticket *,
 		   krb5_data *,
 		   krb5_data *,
-		   krb5_int32 *));
+		   krb5_int32 *);
 krb5_boolean passwd_check_npass_ok
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   krb5_principal,
 		   krb5_db_entry *,
 		   krb5_data *,
-		   krb5_int32 *));
+		   krb5_int32 *);
 krb5_boolean passwd_check_opass_ok
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   krb5_principal,
 		   krb5_db_entry *,
-		   krb5_data *));
+		   krb5_data *);
 
 /* admin.c */
 krb5_error_code admin_add_principal
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   krb5_ticket *,
 		   krb5_int32,
-		   krb5_data *));
+		   krb5_data *);
 krb5_error_code admin_delete_principal
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   krb5_ticket *,
-		   krb5_data *));
+		   krb5_data *);
 krb5_error_code admin_rename_principal
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   krb5_ticket *,
 		   krb5_data *,
-		   krb5_data *));
+		   krb5_data *);
 krb5_error_code admin_modify_principal
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   krb5_ticket *,
 		   krb5_int32,
-		   krb5_data *));
+		   krb5_data *);
 krb5_error_code admin_change_opw
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   krb5_ticket *,
 		   krb5_data *,
-		   krb5_data *));
+		   krb5_data *);
 krb5_error_code admin_change_orandpw
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   krb5_ticket *,
-		   krb5_data *));
+		   krb5_data *);
 krb5_error_code admin_inquire
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   krb5_ticket *,
 		   krb5_data *,
 		   krb5_int32 *,
-		   krb5_data **));
+		   krb5_data **);
 krb5_error_code admin_extract_key
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   krb5_ticket *,
 		   krb5_data *,
 		   krb5_data *,
 		   krb5_int32 *,
-		   krb5_data **));
+		   krb5_data **);
 krb5_error_code admin_add_key
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 			int,
 			krb5_ticket *,
 			krb5_int32,
-			krb5_data *));
+			krb5_data *);
 krb5_error_code admin_delete_key
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 			int,
 			krb5_ticket *,
 			krb5_int32,
-			krb5_data *));
-void admin_init KRB5_PROTOTYPE((krb5_deltat,
+			krb5_data *);
+void admin_init (krb5_deltat,
 				krb5_deltat,
 				krb5_boolean,
 				krb5_timestamp,
 				krb5_boolean,
-				krb5_flags));
+				krb5_flags);
 #endif
 
 #endif	/* KADM5_DEFS_H__ */
diff --git a/src/lib/crypto/crc32/ChangeLog b/src/lib/crypto/crc32/ChangeLog
index 5379f01..696218b 100644
--- a/src/lib/crypto/crc32/ChangeLog
+++ b/src/lib/crypto/crc32/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* crc.c: Make prototypes unconditional.
+
 2001-10-03  Ken Raeburn  <raeburn@mit.edu>
 
 	* crc.c: Don't declare pointers FAR any more.
diff --git a/src/lib/crypto/crc32/crc.c b/src/lib/crypto/crc32/crc.c
index 9cefe06..b0f7240 100644
--- a/src/lib/crypto/crc32/crc.c
+++ b/src/lib/crypto/crc32/crc.c
@@ -149,20 +149,20 @@ static u_long const crc_table[256] = {
 /* Windows needs to these prototypes for crc32_cksumtable_entry below */
 
 static krb5_error_code
-crc32_sum_func PROTOTYPE((
+crc32_sum_func (
 	const krb5_pointer in,
 	const size_t in_length,
 	const krb5_pointer seed,
 	const size_t seed_length,
-	krb5_checksum *outcksum));
+	krb5_checksum *outcksum);
 
 static krb5_error_code
-crc32_verify_func PROTOTYPE((
+crc32_verify_func (
 	const krb5_checksum *cksum,
 	const krb5_pointer in,
 	const size_t in_length,
 	const krb5_pointer seed,
-	const size_t seed_length));
+	const size_t seed_length);
 
 static krb5_error_code
 crc32_sum_func(in, in_length, seed, seed_length, outcksum)
diff --git a/src/lib/crypto/dk/ChangeLog b/src/lib/crypto/dk/ChangeLog
index 63cbd02..a82f001 100644
--- a/src/lib/crypto/dk/ChangeLog
+++ b/src/lib/crypto/dk/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* dk.h: Make prototypes unconditional.
+
 2001-06-21  Ken Raeburn  <raeburn@mit.edu>
 
 	* derive.c: Include etypes.h.
diff --git a/src/lib/crypto/dk/dk.h b/src/lib/crypto/dk/dk.h
index 57be71d..8d4c497 100644
--- a/src/lib/crypto/dk/dk.h
+++ b/src/lib/crypto/dk/dk.h
@@ -27,61 +27,61 @@
 #include "k5-int.h"
 
 void krb5_dk_encrypt_length
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
 		const struct krb5_hash_provider *hash,
-		size_t input, size_t *length));
+		size_t input, size_t *length);
 
 krb5_error_code krb5_dk_encrypt
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
 		const struct krb5_hash_provider *hash,
 		const krb5_keyblock *key, krb5_keyusage usage,
 		const krb5_data *ivec,
-		const krb5_data *input, krb5_data *output));
+		const krb5_data *input, krb5_data *output);
 
 krb5_error_code krb5_dk_decrypt
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
 		const struct krb5_hash_provider *hash,
 		const krb5_keyblock *key, krb5_keyusage usage,
 		const krb5_data *ivec, const krb5_data *input,
-		krb5_data *arg_output));
+		krb5_data *arg_output);
 
 krb5_error_code krb5_dk_string_to_key
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc, 
+(const struct krb5_enc_provider *enc, 
 		const krb5_data *string, const krb5_data *salt,
-		krb5_keyblock *key));
+		krb5_keyblock *key);
 
 krb5_error_code krb5_derive_key
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
 		const krb5_keyblock *inkey,
-		krb5_keyblock *outkey, const krb5_data *in_constant));
+		krb5_keyblock *outkey, const krb5_data *in_constant);
 
 krb5_error_code krb5_dk_make_checksum
-KRB5_PROTOTYPE((const struct krb5_hash_provider *hash,
+(const struct krb5_hash_provider *hash,
 		const krb5_keyblock *key, krb5_keyusage usage,
-		const krb5_data *input, krb5_data *output));
+		const krb5_data *input, krb5_data *output);
 
 #ifdef ATHENA_DES3_KLUDGE
 void krb5_marc_dk_encrypt_length
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
 		const struct krb5_hash_provider *hash,
-		size_t input, size_t *length));
+		size_t input, size_t *length);
 
 krb5_error_code krb5_marc_dk_encrypt
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
 		const struct krb5_hash_provider *hash,
 		const krb5_keyblock *key, krb5_keyusage usage,
 		const krb5_data *ivec,
-		const krb5_data *input, krb5_data *output));
+		const krb5_data *input, krb5_data *output);
 
 krb5_error_code krb5_marc_dk_decrypt
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
 		const struct krb5_hash_provider *hash,
 		const krb5_keyblock *key, krb5_keyusage usage,
 		const krb5_data *ivec, const krb5_data *input,
-		krb5_data *arg_output));
+		krb5_data *arg_output);
 
 krb5_error_code krb5_marc_dk_make_checksum
-KRB5_PROTOTYPE((const struct krb5_hash_provider *hash,
+(const struct krb5_hash_provider *hash,
 		const krb5_keyblock *key, krb5_keyusage usage,
-		const krb5_data *input, krb5_data *output));
+		const krb5_data *input, krb5_data *output);
 #endif /* ATHENA_DES3_KLUDGE */
diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog
index 47fe113..eaa3689 100644
--- a/src/lib/crypto/md5/ChangeLog
+++ b/src/lib/crypto/md5/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* t_mddriver.c: Make prototypes unconditional.
+
 2001-10-03  Ken Raeburn  <raeburn@mit.edu>
 
 	* md5.c, rsa-md5.h: Don't explicitly declare pointers FAR any
diff --git a/src/lib/crypto/md5/t_mddriver.c b/src/lib/crypto/md5/t_mddriver.c
index 237c832..d894aaa 100644
--- a/src/lib/crypto/md5/t_mddriver.c
+++ b/src/lib/crypto/md5/t_mddriver.c
@@ -37,12 +37,12 @@ documentation and/or software.
 #define TEST_BLOCK_LEN 1000
 #define TEST_BLOCK_COUNT 1000
 
-static void MDString PROTOTYPE ((char *));
-static void MDTimeTrial PROTOTYPE ((void));
-static void MDTestSuite PROTOTYPE ((void));
-static void MDFile PROTOTYPE ((char *));
-static void MDFilter PROTOTYPE ((void));
-static void MDPrint PROTOTYPE ((unsigned char [16]));
+static void MDString (char *);
+static void MDTimeTrial (void);
+static void MDTestSuite (void);
+static void MDFile (char *);
+static void MDFilter (void);
+static void MDPrint (unsigned char [16]);
 
 struct md_test_entry {
     char *string;
diff --git a/src/lib/crypto/old/ChangeLog b/src/lib/crypto/old/ChangeLog
index 19067e3..af64760 100644
--- a/src/lib/crypto/old/ChangeLog
+++ b/src/lib/crypto/old/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* des_stringtokey.c, old.h: Make prototypes unconditional.
+
 2001-10-03  Ken Raeburn  <raeburn@mit.edu>
 
 	* des_stringtokey.c: Don't explicitly declare pointers FAR any
diff --git a/src/lib/crypto/old/des_stringtokey.c b/src/lib/crypto/old/des_stringtokey.c
index 55b0c0f..c27d77a 100644
--- a/src/lib/crypto/old/des_stringtokey.c
+++ b/src/lib/crypto/old/des_stringtokey.c
@@ -30,9 +30,9 @@
 
 /* XXX */
 extern krb5_error_code mit_des_string_to_key_int
-KRB5_PROTOTYPE ((krb5_keyblock * keyblock,
+(krb5_keyblock * keyblock,
 		 const krb5_data * data,
-		 const krb5_data * salt));
+		 const krb5_data * salt);
 
 krb5_error_code
 krb5_des_string_to_key(enc, string, salt, key)
diff --git a/src/lib/crypto/old/old.h b/src/lib/crypto/old/old.h
index a052325..b22b168 100644
--- a/src/lib/crypto/old/old.h
+++ b/src/lib/crypto/old/old.h
@@ -27,25 +27,25 @@
 #include "k5-int.h"
 
 void krb5_old_encrypt_length
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
 		const struct krb5_hash_provider *hash,
-		size_t input, size_t *length));
+		size_t input, size_t *length);
 
 krb5_error_code krb5_old_encrypt
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
 		const struct krb5_hash_provider *hash,
 		const krb5_keyblock *key, krb5_keyusage usage,
 		const krb5_data *ivec, const krb5_data *input,
-		krb5_data *output));
+		krb5_data *output);
 
 krb5_error_code krb5_old_decrypt
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
 		const struct krb5_hash_provider *hash,
 		const krb5_keyblock *key, krb5_keyusage usage,
 		const krb5_data *ivec, const krb5_data *input,
-		krb5_data *arg_output));
+		krb5_data *arg_output);
 
 krb5_error_code krb5_des_string_to_key
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
 		const krb5_data *string, const krb5_data *salt, 
-		krb5_keyblock *key));
+		krb5_keyblock *key);
diff --git a/src/lib/crypto/raw/ChangeLog b/src/lib/crypto/raw/ChangeLog
index bf10d3e..6d145e3 100644
--- a/src/lib/crypto/raw/ChangeLog
+++ b/src/lib/crypto/raw/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* raw.h: Make prototypes unconditional.
+
 2001-03-05  Ken Raeburn  <raeburn@mit.edu>
 
 	* raw.h, raw_decrypt.c, raw_encrypt.c: Use const instead of
diff --git a/src/lib/crypto/raw/raw.h b/src/lib/crypto/raw/raw.h
index 79c235d..d3f7dd8 100644
--- a/src/lib/crypto/raw/raw.h
+++ b/src/lib/crypto/raw/raw.h
@@ -27,20 +27,20 @@
 #include "k5-int.h"
 
 void krb5_raw_encrypt_length
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
 		const struct krb5_hash_provider *hash,
-		size_t input, size_t *length));
+		size_t input, size_t *length);
 
 krb5_error_code krb5_raw_encrypt
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
 		const struct krb5_hash_provider *hash,
 		const krb5_keyblock *key, krb5_keyusage usage,
 		const krb5_data *ivec, const krb5_data *input,
-		krb5_data *output));
+		krb5_data *output);
 
 krb5_error_code krb5_raw_decrypt
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
 		const struct krb5_hash_provider *hash,
 		const krb5_keyblock *key, krb5_keyusage usage,
 		const krb5_data *ivec, const krb5_data *input,
-		krb5_data *arg_output));
+		krb5_data *arg_output);
diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 92e17dc..275a5c6 100644
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* gssapi.hin, gssapiP_generic.h: Make prototypes unconditional.
+	* gssapi.hin (PROTOTYPE): Don't define.
+
 2001-10-05  Ken Raeburn  <raeburn@mit.edu>
 
 	Windows still requires DLL specs for variables.
diff --git a/src/lib/gssapi/generic/gssapi.hin b/src/lib/gssapi/generic/gssapi.hin
index 80f7c45..9aaf563 100644
--- a/src/lib/gssapi/generic/gssapi.hin
+++ b/src/lib/gssapi/generic/gssapi.hin
@@ -46,17 +46,6 @@
 #define	GSS_SIZEOF_SHORT	SIZEOF_SHORT
 
 /*
- * Make sure we have a definition for PROTOTYPE.
- */
-#if !defined(PROTOTYPE)
-#if defined(__STDC__) || defined(__cplusplus) || defined(_WIN32) || defined(__ultrix)
-#define PROTOTYPE(x) x
-#else
-#define PROTOTYPE(x) ()
-#endif
-#endif
-
-/*
  * First, include stddef.h to get size_t defined.
  */
 #if	HAVE_STDDEF_H
@@ -431,7 +420,7 @@ GSS_DLLIMP extern gss_OID GSS_C_NT_EXPORT_NAME;
 /* Function Prototypes */
 
 OM_uint32 KRB5_CALLCONV gss_acquire_cred
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             gss_name_t,			/* desired_name */
             OM_uint32,			/* time_req */
             gss_OID_set,		/* desired_mechs */
@@ -439,15 +428,15 @@ PROTOTYPE( (OM_uint32 *,		/* minor_status */
             gss_cred_id_t *,	/* output_cred_handle */
             gss_OID_set *,		/* actual_mechs */
             OM_uint32 *		/* time_rec */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_release_cred
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             gss_cred_id_t *		/* cred_handle */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_init_sec_context
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             gss_cred_id_t,		/* claimant_cred_handle */
             gss_ctx_id_t *,		/* context_handle */
             gss_name_t,			/* target_name */
@@ -460,10 +449,10 @@ PROTOTYPE( (OM_uint32 *,		/* minor_status */
             gss_buffer_t,		/* output_token */
             OM_uint32 *,		/* ret_flags */
             OM_uint32 *		/* time_rec */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_accept_sec_context
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             gss_ctx_id_t *,		/* context_handle */
             gss_cred_id_t,		/* acceptor_cred_handle */
             gss_buffer_t,		/* input_token_buffer */
@@ -474,127 +463,127 @@ PROTOTYPE( (OM_uint32 *,		/* minor_status */
             OM_uint32 *,		/* ret_flags */
             OM_uint32 *,		/* time_rec */
             gss_cred_id_t *		/* delegated_cred_handle */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_process_context_token
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             gss_ctx_id_t,		/* context_handle */
             gss_buffer_t		/* token_buffer */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_delete_sec_context
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             gss_ctx_id_t *,		/* context_handle */
             gss_buffer_t		/* output_token */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_context_time
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             gss_ctx_id_t,		/* context_handle */
             OM_uint32 *		/* time_rec */
-           ));
+           );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_get_mic
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    gss_qop_t,			/* qop_req */
 	    gss_buffer_t,		/* message_buffer */
 	    gss_buffer_t		/* message_token */
-	   ));
+	   );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_verify_mic
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    gss_buffer_t,		/* message_buffer */
 	    gss_buffer_t,		/* message_token */
 	    gss_qop_t *			/* qop_state */
-	   ));
+	   );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_wrap
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    int,			/* conf_req_flag */
 	    gss_qop_t,			/* qop_req */
 	    gss_buffer_t,		/* input_message_buffer */
 	    int *,			/* conf_state */
 	    gss_buffer_t		/* output_message_buffer */
-	   ));
+	   );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_unwrap
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    gss_buffer_t,		/* input_message_buffer */
 	    gss_buffer_t,		/* output_message_buffer */
 	    int *,			/* conf_state */
 	    gss_qop_t *		/* qop_state */
-	   ));
+	   );
 
 OM_uint32 KRB5_CALLCONV gss_display_status
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             OM_uint32,			/* status_value */
             int,			/* status_type */
             gss_OID,			/* mech_type (used to be const) */
             OM_uint32 *,		/* message_context */
             gss_buffer_t		/* status_string */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_indicate_mechs
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             gss_OID_set *		/* mech_set */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_compare_name
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             gss_name_t,			/* name1 */
             gss_name_t,			/* name2 */
             int *			/* name_equal */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_display_name
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             gss_name_t,			/* input_name */
             gss_buffer_t,		/* output_name_buffer */
             gss_OID *		/* output_name_type */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_import_name
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             gss_buffer_t,		/* input_name_buffer */
             gss_OID,			/* input_name_type(used to be const) */
             gss_name_t *		/* output_name */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_release_name
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             gss_name_t *		/* input_name */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_release_buffer
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             gss_buffer_t		/* buffer */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_release_oid_set
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             gss_OID_set * 		/* set */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_inquire_cred
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             gss_cred_id_t,		/* cred_handle */
             gss_name_t *,		/* name */
             OM_uint32 *,		/* lifetime */
             gss_cred_usage_t *,	/* cred_usage */
             gss_OID_set *		/* mechanisms */
-           ));
+           );
 
 /* Last argument new for V2 */
 OM_uint32 KRB5_CALLCONV gss_inquire_context
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    gss_name_t *,		/* src_name */
 	    gss_name_t *,		/* targ_name */
@@ -603,37 +592,37 @@ PROTOTYPE( (OM_uint32 *,		/* minor_status */
 	    OM_uint32 *,		/* ctx_flags */
 	    int *,           	/* locally_initiated */
 	    int *			/* open */
-	   ));
+	   );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_wrap_size_limit
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    int,			/* conf_req_flag */
 	    gss_qop_t,			/* qop_req */
 	    OM_uint32,			/* req_output_size */
 	    OM_uint32 *			/* max_input_size */
-	   ));
+	   );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_import_name_object
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    void *,			/* input_name */
 	    gss_OID,			/* input_name_type */
 	    gss_name_t *		/* output_name */
-	   ));
+	   );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_export_name_object
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_name_t,			/* input_name */
 	    gss_OID,			/* desired_name_type */
 	    void **		/* output_name */
-	   ));
+	   );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_add_cred
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_cred_id_t,		/* input_cred_handle */
 	    gss_name_t,			/* desired_name */
 	    gss_OID,			/* desired_mech */
@@ -644,80 +633,80 @@ PROTOTYPE( (OM_uint32 *,		/* minor_status */
 	    gss_OID_set *,		/* actual_mechs */
 	    OM_uint32 *,		/* initiator_time_rec */
 	    OM_uint32 *		/* acceptor_time_rec */
-	   ));
+	   );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_inquire_cred_by_mech
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_cred_id_t,		/* cred_handle */
 	    gss_OID,			/* mech_type */
 	    gss_name_t *,		/* name */
 	    OM_uint32 *,		/* initiator_lifetime */
 	    OM_uint32 *,		/* acceptor_lifetime */
 	    gss_cred_usage_t * 	/* cred_usage */
-	   ));
+	   );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_export_sec_context
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_ctx_id_t *,		/* context_handle */
 	    gss_buffer_t		/* interprocess_token */
-	    ));
+	    );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_import_sec_context
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_buffer_t,		/* interprocess_token */
 	    gss_ctx_id_t *		/* context_handle */
-	    ));
+	    );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_release_oid
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_OID *		/* oid */
-	   ));
+	   );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_create_empty_oid_set
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_OID_set *		/* oid_set */
-	   ));
+	   );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_add_oid_set_member
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_OID,			/* member_oid */
 	    gss_OID_set *		/* oid_set */
-	   ));
+	   );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_test_oid_set_member
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_OID,			/* member */
 	    gss_OID_set,		/* set */
 	    int *			/* present */
-	   ));
+	   );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_str_to_oid
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_buffer_t,		/* oid_str */
 	    gss_OID *		/* oid */
-	   ));
+	   );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_oid_to_str
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_OID,			/* oid */
 	    gss_buffer_t		/* oid_str */
-	   ));
+	   );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_inquire_names_for_mech
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_OID,			/* mechanism */
 	    gss_OID_set *		/* name_types */
-	   ));
+	   );
 
 /*
  * The following routines are obsolete variants of gss_get_mic, gss_wrap,
@@ -727,61 +716,61 @@ PROTOTYPE( (OM_uint32 *,		/* minor_status */
  * V1 applications to link against GSSAPI V2 implementations.
  */
 OM_uint32 KRB5_CALLCONV gss_sign
-PROTOTYPE( (OM_uint32 *,    /* minor_status */
+(OM_uint32 *,    /* minor_status */
             gss_ctx_id_t,     	/* context_handle */
             int,              	/* qop_req */
             gss_buffer_t,     	/* message_buffer */
             gss_buffer_t      	/* message_token */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_verify
-PROTOTYPE( (OM_uint32 *,    /* minor_status */
+(OM_uint32 *,    /* minor_status */
             gss_ctx_id_t,     	/* context_handle */
             gss_buffer_t,     	/* message_buffer */
             gss_buffer_t,     	/* token_buffer */
             int *           /* qop_state */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_seal
-PROTOTYPE( (OM_uint32 *,    /* minor_status */
+(OM_uint32 *,    /* minor_status */
             gss_ctx_id_t,     	/* context_handle */
             int,              	/* conf_req_flag */
             int,              	/* qop_req */
             gss_buffer_t,     	/* input_message_buffer */
             int *,          /* conf_state */
             gss_buffer_t      	/* output_message_buffer */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_unseal
-PROTOTYPE( (OM_uint32 *,    /* minor_status */
+(OM_uint32 *,    /* minor_status */
             gss_ctx_id_t,     	/* context_handle */
             gss_buffer_t,     	/* input_message_buffer */
             gss_buffer_t,     	/* output_message_buffer */
             int *,          /* conf_state */
             int *           /* qop_state */
-           ));
+           );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_export_name
-PROTOTYPE(	(OM_uint32  *,		/* minor_status */
+(OM_uint32  *,		/* minor_status */
 		 const gss_name_t,	/* input_name */
 		 gss_buffer_t		/* exported_name */
-	));
+	);
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_duplicate_name
-PROTOTYPE(	(OM_uint32  *,		/* minor_status */
+(OM_uint32  *,		/* minor_status */
 		 const gss_name_t,	/* input_name */
 		 gss_name_t *		/* dest_name */
-	));
+	);
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_canonicalize_name
-PROTOTYPE(	(OM_uint32  *,		/* minor_status */
+(OM_uint32  *,		/* minor_status */
 		 const gss_name_t,	/* input_name */
 		 const gss_OID,		/* mech_type */
 		 gss_name_t *		/* output_name */
-	));
+	);
 
 #ifdef __cplusplus
 }
diff --git a/src/lib/gssapi/generic/gssapiP_generic.h b/src/lib/gssapi/generic/gssapiP_generic.h
index 076509a..d6962f1 100644
--- a/src/lib/gssapi/generic/gssapiP_generic.h
+++ b/src/lib/gssapi/generic/gssapiP_generic.h
@@ -99,51 +99,51 @@
 
 typedef struct _g_set *g_set;
 
-int g_set_init PROTOTYPE((g_set *s));
-int g_set_destroy PROTOTYPE((g_set *s));
-int g_set_entry_add PROTOTYPE((g_set *s, void *key, void *value));
-int g_set_entry_delete PROTOTYPE((g_set *s, void *key));
-int g_set_entry_get PROTOTYPE((g_set *s, void *key, void **value));
+int g_set_init (g_set *s);
+int g_set_destroy (g_set *s);
+int g_set_entry_add (g_set *s, void *key, void *value);
+int g_set_entry_delete (g_set *s, void *key);
+int g_set_entry_get (g_set *s, void *key, void **value);
 
-int g_save_name PROTOTYPE((void **vdb, gss_name_t *name));
-int g_save_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred));
-int g_save_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx));
+int g_save_name (void **vdb, gss_name_t *name);
+int g_save_cred_id (void **vdb, gss_cred_id_t *cred);
+int g_save_ctx_id (void **vdb, gss_ctx_id_t *ctx);
 
-int g_validate_name PROTOTYPE((void **vdb, gss_name_t *name));
-int g_validate_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred));
-int g_validate_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx));
+int g_validate_name (void **vdb, gss_name_t *name);
+int g_validate_cred_id (void **vdb, gss_cred_id_t *cred);
+int g_validate_ctx_id (void **vdb, gss_ctx_id_t *ctx);
 
-int g_delete_name PROTOTYPE((void **vdb, gss_name_t *name));
-int g_delete_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred));
-int g_delete_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx));
+int g_delete_name (void **vdb, gss_name_t *name);
+int g_delete_cred_id (void **vdb, gss_cred_id_t *cred);
+int g_delete_ctx_id (void **vdb, gss_ctx_id_t *ctx);
 
-int g_make_string_buffer PROTOTYPE((const char *str, gss_buffer_t buffer));
+int g_make_string_buffer (const char *str, gss_buffer_t buffer);
 
-int g_copy_OID_set PROTOTYPE((const gss_OID_set_desc * const in, gss_OID_set *out));
+int g_copy_OID_set (const gss_OID_set_desc * const in, gss_OID_set *out);
 
-int g_token_size PROTOTYPE((gss_OID mech, unsigned int body_size));
+int g_token_size (gss_OID mech, unsigned int body_size);
 
-void g_make_token_header PROTOTYPE((gss_OID mech, int body_size,
-			  unsigned char **buf, int tok_type));
+void g_make_token_header (gss_OID mech, int body_size,
+			  unsigned char **buf, int tok_type);
 
-gss_int32 g_verify_token_header PROTOTYPE((gss_OID mech, int *body_size,
-			  unsigned char **buf, int tok_type, int toksize));
+gss_int32 g_verify_token_header (gss_OID mech, int *body_size,
+			  unsigned char **buf, int tok_type, int toksize);
 
-OM_uint32 g_display_major_status PROTOTYPE((OM_uint32 *minor_status,
+OM_uint32 g_display_major_status (OM_uint32 *minor_status,
 				 OM_uint32 status_value,
 				 OM_uint32 *message_context,
-				 gss_buffer_t status_string));
+				 gss_buffer_t status_string);
 
-OM_uint32 g_display_com_err_status PROTOTYPE((OM_uint32 *minor_status,
+OM_uint32 g_display_com_err_status (OM_uint32 *minor_status,
 				   OM_uint32 status_value,
-				   gss_buffer_t status_string));
+				   gss_buffer_t status_string);
 
-gss_int32 g_order_init PROTOTYPE((void **queue, OM_uint32 seqnum,
-				  int do_replay, int do_sequence));
+gss_int32 g_order_init (void **queue, OM_uint32 seqnum,
+				  int do_replay, int do_sequence);
 
-gss_int32 g_order_check PROTOTYPE((void **queue, OM_uint32 seqnum));
+gss_int32 g_order_check (void **queue, OM_uint32 seqnum);
 
-void g_order_free PROTOTYPE((void **queue));
+void g_order_free (void **queue);
 
 gss_uint32 g_queue_size(void *vqueue, size_t *sizep);
 gss_uint32 g_queue_externalize(void *vqueue, unsigned char **buf,
@@ -151,59 +151,59 @@ gss_uint32 g_queue_externalize(void *vqueue, unsigned char **buf,
 gss_uint32 g_queue_internalize(void **vqueue, unsigned char **buf,
 			       size_t *lenremain);
 
-char *g_strdup PROTOTYPE((char *str));
+char *g_strdup (char *str);
 
 /** declarations of internal name mechanism functions **/
 
 OM_uint32 generic_gss_release_buffer
-PROTOTYPE((OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_buffer_t      /* buffer */
-           ));
+           );
 
 OM_uint32 generic_gss_release_oid_set
-PROTOTYPE((OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_OID_set*      /* set */
-           ));
+           );
 
 OM_uint32 generic_gss_release_oid
-PROTOTYPE((OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_OID*         /* set */
-           ));
+           );
 
 OM_uint32 generic_gss_copy_oid
-PROTOTYPE( (OM_uint32 *,	/* minor_status */
+(OM_uint32 *,	/* minor_status */
 	    gss_OID,		/* oid */
 	    gss_OID *		/* new_oid */
-	    ));
+	    );
 
 OM_uint32 generic_gss_create_empty_oid_set
-PROTOTYPE( (OM_uint32 *,	/* minor_status */
+(OM_uint32 *,	/* minor_status */
 	    gss_OID_set *	/* oid_set */
-	   ));
+	   );
 
 OM_uint32 generic_gss_add_oid_set_member
-PROTOTYPE( (OM_uint32 *,	/* minor_status */
+(OM_uint32 *,	/* minor_status */
 	    gss_OID,		/* member_oid */
 	    gss_OID_set *	/* oid_set */
-	   ));
+	   );
 
 OM_uint32 generic_gss_test_oid_set_member
-PROTOTYPE( (OM_uint32 *,	/* minor_status */
+(OM_uint32 *,	/* minor_status */
 	    gss_OID,		/* member */
 	    gss_OID_set,	/* set */
 	    int *		/* present */
-	   ));
+	   );
 
 OM_uint32 generic_gss_oid_to_str
-PROTOTYPE( (OM_uint32 *,	/* minor_status */
+(OM_uint32 *,	/* minor_status */
 	    gss_OID,		/* oid */
 	    gss_buffer_t	/* oid_str */
-	   ));
+	   );
 
 OM_uint32 generic_gss_str_to_oid
-PROTOTYPE( (OM_uint32 *,	/* minor_status */
+(OM_uint32 *,	/* minor_status */
 	    gss_buffer_t,	/* oid_str */
 	    gss_OID *		/* oid */
-	   ));
+	   );
 
 #endif /* _GSSAPIP_GENERIC_H_ */
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 040dce3..e40b3fc 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* gssapiP_krb5.h, gssapi_krb5.h, k5mech.c: Make prototypes
+	unconditional.
+
 2001-10-05  Ken Raeburn  <raeburn@mit.edu>
 
 	* accept_sec_context.c, gssapiP_krb5.h, import_sec_context.c,
diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h
index 16ba01f..634b9e6 100644
--- a/src/lib/gssapi/krb5/gssapiP_krb5.h
+++ b/src/lib/gssapi/krb5/gssapiP_krb5.h
@@ -210,53 +210,53 @@ struct kg2_option {
 /** helper functions **/
 
 OM_uint32 kg_get_defcred 
-	PROTOTYPE((OM_uint32 *minor_status, 
-		   gss_cred_id_t *cred));
+	(OM_uint32 *minor_status, 
+		   gss_cred_id_t *cred);
 
-OM_uint32 kg_release_defcred PROTOTYPE((OM_uint32 *minor_status));
+OM_uint32 kg_release_defcred (OM_uint32 *minor_status);
 
 krb5_error_code kg_checksum_channel_bindings
-         PROTOTYPE((krb5_context context, gss_channel_bindings_t cb,
+         (krb5_context context, gss_channel_bindings_t cb,
 					     krb5_checksum *cksum,
-					     int bigend));
+					     int bigend);
 
-krb5_error_code kg_make_seq_num PROTOTYPE((krb5_context context,
+krb5_error_code kg_make_seq_num (krb5_context context,
 					   krb5_keyblock *key,
             int direction, krb5_int32 seqnum, unsigned char *cksum,
-				unsigned char *buf));
+				unsigned char *buf);
 
-krb5_error_code kg_get_seq_num PROTOTYPE((krb5_context context,
+krb5_error_code kg_get_seq_num (krb5_context context,
 					  krb5_keyblock *key,
             unsigned char *cksum, unsigned char *buf, int *direction,
-					  krb5_int32 *seqnum));
+					  krb5_int32 *seqnum);
 
-krb5_error_code kg_make_seed PROTOTYPE((krb5_context context,
+krb5_error_code kg_make_seed (krb5_context context,
 					krb5_keyblock *key,
-					unsigned char *seed));
+					unsigned char *seed);
 
-int kg_confounder_size PROTOTYPE((krb5_context context, krb5_keyblock *key));
+int kg_confounder_size (krb5_context context, krb5_keyblock *key);
 
-krb5_error_code kg_make_confounder PROTOTYPE((krb5_context context, 
-	    krb5_keyblock *key, unsigned char *buf));
+krb5_error_code kg_make_confounder (krb5_context context, 
+	    krb5_keyblock *key, unsigned char *buf);
 
-int kg_encrypt_size PROTOTYPE((krb5_context context,
-			       krb5_keyblock *key, int n));
+int kg_encrypt_size (krb5_context context,
+			       krb5_keyblock *key, int n);
 
-krb5_error_code kg_encrypt PROTOTYPE((krb5_context context, 
+krb5_error_code kg_encrypt (krb5_context context, 
 				      krb5_keyblock *key, int usage,
 				      krb5_pointer iv,
 				      krb5_pointer in,
 				      krb5_pointer out,
-				      int length));
+				      int length);
 
-krb5_error_code kg_decrypt PROTOTYPE((krb5_context context,
+krb5_error_code kg_decrypt (krb5_context context,
 				      krb5_keyblock *key,  int usage,
 				      krb5_pointer iv,
 				      krb5_pointer in,
 				      krb5_pointer out,
-				      int length));
+				      int length);
 
-OM_uint32 kg_seal PROTOTYPE((krb5_context context,
+OM_uint32 kg_seal (krb5_context context,
 		  OM_uint32 *minor_status,
 		  gss_ctx_id_t context_handle,
 		  int conf_req_flag,
@@ -264,44 +264,44 @@ OM_uint32 kg_seal PROTOTYPE((krb5_context context,
 		  gss_buffer_t input_message_buffer,
 		  int *conf_state,
 		  gss_buffer_t output_message_buffer,
-		  int toktype));
+		  int toktype);
 
-OM_uint32 kg_unseal PROTOTYPE((krb5_context context,
+OM_uint32 kg_unseal (krb5_context context,
 		    OM_uint32 *minor_status,
 		    gss_ctx_id_t context_handle,
 		    gss_buffer_t input_token_buffer,
 		    gss_buffer_t message_buffer,
 		    int *conf_state,
 		    int *qop_state,
-		    int toktype));
+		    int toktype);
 
-OM_uint32 kg_seal_size PROTOTYPE((krb5_context context,
+OM_uint32 kg_seal_size (krb5_context context,
 				  OM_uint32 *minor_status,
 				  gss_ctx_id_t context_handle,
 				  int conf_req_flag,
 				  gss_qop_t qop_req,
 				  OM_uint32 output_size,
-				  OM_uint32 *input_size));
+				  OM_uint32 *input_size);
 
-krb5_error_code kg_ctx_size PROTOTYPE((krb5_context kcontext,
+krb5_error_code kg_ctx_size (krb5_context kcontext,
 				       krb5_pointer arg,
-				       size_t *sizep));
+				       size_t *sizep);
 
-krb5_error_code kg_ctx_externalize PROTOTYPE((krb5_context kcontext,
+krb5_error_code kg_ctx_externalize (krb5_context kcontext,
 					      krb5_pointer arg,
 					      krb5_octet **buffer,
-					      size_t *lenremain));
+					      size_t *lenremain);
 
-krb5_error_code kg_ctx_internalize PROTOTYPE((krb5_context kcontext,
+krb5_error_code kg_ctx_internalize (krb5_context kcontext,
 					      krb5_pointer *argp,
 					      krb5_octet **buffer,
-					      size_t *lenremain));
+					      size_t *lenremain);
 
-OM_uint32 kg_get_context PROTOTYPE((OM_uint32 *minor_status,
-				    krb5_context *context));
+OM_uint32 kg_get_context (OM_uint32 *minor_status,
+				    krb5_context *context);
 	
 OM_uint32
-kg2_parse_token PROTOTYPE((OM_uint32 *minor_status,
+kg2_parse_token (OM_uint32 *minor_status,
 			   unsigned char *ptr,
 			   int length,
 			   krb5_ui_4 *flags,
@@ -310,17 +310,17 @@ kg2_parse_token PROTOTYPE((OM_uint32 *minor_status,
 			   int noptions,
 			   struct kg2_option *options, /* INOUT */
 			   krb5_data *kmsg,
-			   krb5_data *mic));
+			   krb5_data *mic);
 
-void kg2_intersect_ctypes PROTOTYPE((int *nc1, 
+void kg2_intersect_ctypes (int *nc1, 
 				     krb5_cksumtype *c1,
 				     int nc2,
-				     const krb5_cksumtype *c2));
+				     const krb5_cksumtype *c2);
 
 /** declarations of internal name mechanism functions **/
 
 OM_uint32 krb5_gss_acquire_cred
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_name_t,       /* desired_name */
             OM_uint32,        /* time_req */
             gss_OID_set,      /* desired_mechs */
@@ -328,15 +328,15 @@ PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_cred_id_t*,   /* output_cred_handle */
             gss_OID_set*,     /* actual_mechs */
             OM_uint32*        /* time_rec */
-           ));
+           );
 
 OM_uint32 krb5_gss_release_cred
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_cred_id_t*    /* cred_handle */
-           ));
+           );
 
 OM_uint32 krb5_gss_init_sec_context
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_cred_id_t,    /* claimant_cred_handle */
             gss_ctx_id_t*,    /* context_handle */
             gss_name_t,       /* target_name */
@@ -350,10 +350,10 @@ PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_buffer_t,     /* output_token */
             OM_uint32*,       /* ret_flags */
             OM_uint32*        /* time_rec */
-           ));
+           );
 
 OM_uint32 krb5_gss_accept_sec_context
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_ctx_id_t*,    /* context_handle */
             gss_cred_id_t,    /* verifier_cred_handle */
             gss_buffer_t,     /* input_token_buffer */
@@ -365,112 +365,112 @@ PROTOTYPE( (OM_uint32*,       /* minor_status */
             OM_uint32*,       /* ret_flags */
             OM_uint32*,       /* time_rec */
             gss_cred_id_t*    /* delegated_cred_handle */
-           ));
+           );
 
 OM_uint32 krb5_gss_process_context_token
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
             gss_buffer_t      /* token_buffer */
-           ));
+           );
 
 OM_uint32 krb5_gss_delete_sec_context
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_ctx_id_t*,    /* context_handle */
             gss_buffer_t      /* output_token */
-           ));
+           );
 
 OM_uint32 krb5_gss_context_time
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
             OM_uint32*        /* time_rec */
-           ));
+           );
 
 OM_uint32 krb5_gss_sign
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
             int,              /* qop_req */
             gss_buffer_t,     /* message_buffer */
             gss_buffer_t      /* message_token */
-           ));
+           );
 
 OM_uint32 krb5_gss_verify
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
             gss_buffer_t,     /* message_buffer */
             gss_buffer_t,     /* token_buffer */
             int*              /* qop_state */
-           ));
+           );
 
 OM_uint32 krb5_gss_seal
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
             int,              /* conf_req_flag */
             int,              /* qop_req */
             gss_buffer_t,     /* input_message_buffer */
             int*,             /* conf_state */
             gss_buffer_t      /* output_message_buffer */
-           ));
+           );
 
 OM_uint32 krb5_gss_unseal
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
             gss_buffer_t,     /* input_message_buffer */
             gss_buffer_t,     /* output_message_buffer */
             int*,             /* conf_state */
             int*              /* qop_state */
-           ));
+           );
 
 OM_uint32 krb5_gss_display_status
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             OM_uint32,        /* status_value */
             int,              /* status_type */
             gss_OID,          /* mech_type */
             OM_uint32*,       /* message_context */
             gss_buffer_t      /* status_string */
-           ));
+           );
 
 OM_uint32 krb5_gss_indicate_mechs
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_OID_set*      /* mech_set */
-           ));
+           );
 
 OM_uint32 krb5_gss_compare_name
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_name_t,       /* name1 */
             gss_name_t,       /* name2 */
             int*              /* name_equal */
-           ));
+           );
 
 OM_uint32 krb5_gss_display_name
-PROTOTYPE( (OM_uint32*,      /* minor_status */
+(OM_uint32*,      /* minor_status */
             gss_name_t,      /* input_name */
             gss_buffer_t,    /* output_name_buffer */
             gss_OID*         /* output_name_type */
-           ));
+           );
 
 OM_uint32 krb5_gss_import_name
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_buffer_t,     /* input_name_buffer */
             gss_OID,          /* input_name_type */
             gss_name_t*       /* output_name */
-           ));
+           );
 
 OM_uint32 krb5_gss_release_name
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_name_t*       /* input_name */
-           ));
+           );
 
 OM_uint32 krb5_gss_inquire_cred
-PROTOTYPE( (OM_uint32 *,      /* minor_status */
+(OM_uint32 *,      /* minor_status */
             gss_cred_id_t,    /* cred_handle */
             gss_name_t *,     /* name */
             OM_uint32 *,      /* lifetime */
             gss_cred_usage_t*,/* cred_usage */
             gss_OID_set *     /* mechanisms */
-           ));
+           );
 
 OM_uint32 krb5_gss_inquire_context
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
 	    gss_ctx_id_t,     /* context_handle */
 	    gss_name_t*,      /* initiator_name */
 	    gss_name_t*,      /* acceptor_name */
@@ -479,69 +479,69 @@ PROTOTYPE( (OM_uint32*,       /* minor_status */
 	    OM_uint32*,       /* ret_flags */
 	    int*,             /* locally_initiated */
 	    int*              /* open */
-	   ));
+	   );
 
 /* New V2 entry points */
 OM_uint32 krb5_gss_get_mic
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    gss_qop_t,			/* qop_req */
 	    gss_buffer_t,		/* message_buffer */
 	    gss_buffer_t		/* message_token */
-	   ));
+	   );
 
 OM_uint32 krb5_gss_verify_mic
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    gss_buffer_t,		/* message_buffer */
 	    gss_buffer_t,		/* message_token */
 	    gss_qop_t *			/* qop_state */
-	   ));
+	   );
 
 OM_uint32 krb5_gss_wrap
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    int,			/* conf_req_flag */
 	    gss_qop_t,			/* qop_req */
 	    gss_buffer_t,		/* input_message_buffer */
 	    int *,			/* conf_state */
 	    gss_buffer_t		/* output_message_buffer */
-	   ));
+	   );
 
 OM_uint32 krb5_gss_unwrap
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    gss_buffer_t,		/* input_message_buffer */
 	    gss_buffer_t,		/* output_message_buffer */
 	    int *,			/* conf_state */
 	    gss_qop_t *			/* qop_state */
-	   ));
+	   );
 
 OM_uint32 krb5_gss_wrap_size_limit
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    int,			/* conf_req_flag */
 	    gss_qop_t,			/* qop_req */
 	    OM_uint32,			/* req_output_size */
 	    OM_uint32 *			/* max_input_size */
-	   ));
+	   );
 
 OM_uint32 krb5_gss_import_name_object
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    void *,			/* input_name */
 	    gss_OID,			/* input_name_type */
 	    gss_name_t *		/* output_name */
-	   ));
+	   );
 
 OM_uint32 krb5_gss_export_name_object
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_name_t,			/* input_name */
 	    gss_OID,			/* desired_name_type */
 	    void * *			/* output_name */
-	   ));
+	   );
 
 OM_uint32 krb5_gss_add_cred
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_cred_id_t,		/* input_cred_handle */
 	    gss_name_t,			/* desired_name */
 	    gss_OID,			/* desired_mech */
@@ -552,72 +552,72 @@ PROTOTYPE( (OM_uint32 *,		/* minor_status */
 	    gss_OID_set *,		/* actual_mechs */
 	    OM_uint32 *,		/* initiator_time_rec */
 	    OM_uint32 *			/* acceptor_time_rec */
-	   ));
+	   );
 
 OM_uint32 krb5_gss_inquire_cred_by_mech
-PROTOTYPE( (OM_uint32  *,		/* minor_status */
+(OM_uint32  *,		/* minor_status */
 	    gss_cred_id_t,		/* cred_handle */
 	    gss_OID,			/* mech_type */
 	    gss_name_t *,		/* name */
 	    OM_uint32 *,		/* initiator_lifetime */
 	    OM_uint32 *,		/* acceptor_lifetime */
 	    gss_cred_usage_t * 		/* cred_usage */
-	   ));
+	   );
 
 OM_uint32 krb5_gss_export_sec_context
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_ctx_id_t *,		/* context_handle */
 	    gss_buffer_t		/* interprocess_token */
-	    ));
+	    );
 
 OM_uint32 krb5_gss_import_sec_context
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_buffer_t,		/* interprocess_token */
 	    gss_ctx_id_t *		/* context_handle */
-	    ));
+	    );
 
 OM_uint32 krb5_gss_release_oid
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_OID *			/* oid */
-	   ));
+	   );
 
 OM_uint32 krb5_gss_internal_release_oid
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_OID *			/* oid */
-	   ));
+	   );
 
 OM_uint32 krb5_gss_inquire_names_for_mech
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_OID,			/* mechanism */
 	    gss_OID_set *		/* name_types */
-	   ));
+	   );
 
 OM_uint32 krb5_gss_canonicalize_name
-PROTOTYPE( (OM_uint32  *,		/* minor_status */
+(OM_uint32  *,		/* minor_status */
 	    const gss_name_t,		/* input_name */
 	    const gss_OID,		/* mech_type */
 	    gss_name_t *		/* output_name */
-	 ));
+	 );
 	
 OM_uint32 krb5_gss_export_name
-PROTOTYPE( (OM_uint32  *,		/* minor_status */
+(OM_uint32  *,		/* minor_status */
 	    const gss_name_t,		/* input_name */
 	    gss_buffer_t		/* exported_name */
-	 ));
+	 );
 
 OM_uint32 krb5_gss_duplicate_name
-PROTOTYPE( (OM_uint32  *,		/* minor_status */
+(OM_uint32  *,		/* minor_status */
 	    const gss_name_t,		/* input_name */
 	    gss_name_t *		/* dest_name */
-	 ));
+	 );
 
 OM_uint32 krb5_gss_validate_cred
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_cred_id_t		/* cred */
-         ));
+         );
 
 gss_OID krb5_gss_convert_static_mech_oid
-PROTOTYPE( (gss_OID oid
-	 ));
+(gss_OID oid
+	 );
 	
 #endif /* _GSSAPIP_KRB5_H_ */
diff --git a/src/lib/gssapi/krb5/gssapi_krb5.h b/src/lib/gssapi/krb5/gssapi_krb5.h
index 7557150..ea59946 100644
--- a/src/lib/gssapi/krb5/gssapi_krb5.h
+++ b/src/lib/gssapi/krb5/gssapi_krb5.h
@@ -52,18 +52,18 @@ extern const gss_OID_desc krb5_gss_oid_array[];
 #define gss_krb5_nt_string_uid_name	gss_nt_string_uid_name
 
 OM_uint32 KRB5_CALLCONV gss_krb5_get_tkt_flags 
-	PROTOTYPE((OM_uint32 *minor_status,
+	(OM_uint32 *minor_status,
 		   gss_ctx_id_t context_handle,
-		   krb5_flags *ticket_flags));
+		   krb5_flags *ticket_flags);
 
 OM_uint32 KRB5_CALLCONV gss_krb5_copy_ccache
-	PROTOTYPE((OM_uint32 *minor_status,
+	(OM_uint32 *minor_status,
 		   gss_cred_id_t cred_handle,
-		   krb5_ccache out_ccache));
+		   krb5_ccache out_ccache);
 
 OM_uint32 KRB5_CALLCONV gss_krb5_ccache_name
-	PROTOTYPE((OM_uint32 *minor_status, const char *name,
-		   const char **out_name));
+	(OM_uint32 *minor_status, const char *name,
+		   const char **out_name);
 
 #ifdef __cplusplus
 }
diff --git a/src/lib/gssapi/krb5/k5mech.c b/src/lib/gssapi/krb5/k5mech.c
index 11a8ea4..5385cba 100644
--- a/src/lib/gssapi/krb5/k5mech.c
+++ b/src/lib/gssapi/krb5/k5mech.c
@@ -23,22 +23,22 @@
 /* ident  "@(#)krb5_gssd_extern_srvr.conf 1.10     95/08/01 SMI" */
 
 OM_uint32 krb5_gss_internal_release_oid
-      PROTOTYPE((void *,                /* context */
+      (void *,                /* context */
        OM_uint32 *,           /* minor_status */
        gss_OID *              /* OID */
-      ));
+      );
 
 extern OM_uint32 krb5_gss_get_context
-	   PROTOTYPE((void**
-	   ));
+	   (void**
+	   );
 
 extern int krb5_pname_to_uid
-             PROTOTYPE((void *,           /* context */
+             (void *,           /* context */
               char *,		/* principal name */
               gss_OID,		/* name_type */
 	      gss_OID,		/* mech_type */
               uid_t *		/* uid (OUT) */
-             ));
+             );
 
 /*
  * This is the declaration of the mechs_array table for Kerberos V5.
diff --git a/src/lib/gssapi/mechglue/ChangeLog b/src/lib/gssapi/mechglue/ChangeLog
index 2d1da93..9d94d8f 100644
--- a/src/lib/gssapi/mechglue/ChangeLog
+++ b/src/lib/gssapi/mechglue/ChangeLog
@@ -1,5 +1,6 @@
 2001-10-09  Ken Raeburn  <raeburn@mit.edu>
 
+	* mechglue.h: Make prototypes unconditional.
 	* mglueP.h: Make all prototypes unconditional.
 	(NPROTOTYPE): Macro deleted.
 
diff --git a/src/lib/gssapi/mechglue/mechglue.h b/src/lib/gssapi/mechglue/mechglue.h
index 43347a4..af57d25 100644
--- a/src/lib/gssapi/mechglue/mechglue.h
+++ b/src/lib/gssapi/mechglue/mechglue.h
@@ -39,7 +39,7 @@
 /* GSSAPI Extension functions -- these functions aren't */
 /* in the GSSAPI, but they are provided in this library */
 
-int gssd_pname_to_uid PROTOTYPE((char *, gss_OID, gss_OID, uid_t *));
-void gss_initialize PROTOTYPE((void));
+int gssd_pname_to_uid (char *, gss_OID, gss_OID, uid_t *);
+void gss_initialize (void);
 
 #endif /* _GSS_MECHGLUE_H */
diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog
index fd26aa6..57b9b10 100644
--- a/src/lib/kadm5/srv/ChangeLog
+++ b/src/lib/kadm5/srv/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* server_acl.h: Make prototypes unconditional.
+
 2001-07-31  Ezra Peisach  <epeisach@mit.edu>
 
 	* svr_principal.c (check_pw_reuse): Change argument for
diff --git a/src/lib/kadm5/srv/server_acl.h b/src/lib/kadm5/srv/server_acl.h
index 226a4d9..2645b68 100644
--- a/src/lib/kadm5/srv/server_acl.h
+++ b/src/lib/kadm5/srv/server_acl.h
@@ -83,21 +83,21 @@ typedef struct _restriction {
 } restriction_t;
 
 krb5_error_code acl_init
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
-		   char *));
+		   char *);
 void acl_finish
-	KRB5_PROTOTYPE((krb5_context,
-		   int));
+	(krb5_context,
+		   int);
 krb5_boolean acl_check
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   gss_name_t,
 		   krb5_int32,
 		   krb5_principal,
-		   restriction_t **));
+		   restriction_t **);
 krb5_error_code acl_impose_restrictions
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   kadm5_principal_ent_rec *,
 		   long *,
-		   restriction_t *));
+		   restriction_t *);
 #endif	/* SERVER_ACL_H__ */
diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog
index 2b52681..62f5313 100644
--- a/src/lib/kdb/ChangeLog
+++ b/src/lib/kdb/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* kdb_db2.c, kdb_db2.h, kdb_dbm.c, keytab.c, t_kdb.c: Make
+	prototypes unconditional.
+
 2001-07-26  Ezra Peisach  <epeisach@mit.edu>
 
 	* kdb_xdr.c (krb5_dbe_update_mod_princ_data,
diff --git a/src/lib/kdb/kdb_db2.c b/src/lib/kdb/kdb_db2.c
index c471996..9c6e4fc 100644
--- a/src/lib/kdb/kdb_db2.c
+++ b/src/lib/kdb/kdb_db2.c
@@ -70,13 +70,13 @@
 #include "kdb_db2.h"
 
 static char *gen_dbsuffix 
-	PROTOTYPE((char *, char * ));
+	(char *, char * );
 static krb5_error_code krb5_db2_db_start_update 
-	PROTOTYPE((krb5_context));
+	(krb5_context);
 static krb5_error_code krb5_db2_db_end_update 
-	PROTOTYPE((krb5_context));
+	(krb5_context);
 static krb5_error_code krb5_db2_db_set_hashfirst
-	PROTOTYPE((krb5_context, int));
+	(krb5_context, int);
 
 static char default_db_name[] = DEFAULT_KDB_FILE;
 
@@ -1121,7 +1121,7 @@ cleanup:
 krb5_error_code
 krb5_db2_db_iterate (context, func, func_arg)
     krb5_context context;
-    krb5_error_code (*func) PROTOTYPE((krb5_pointer, krb5_db_entry *));
+    krb5_error_code (*func) (krb5_pointer, krb5_db_entry *);
     krb5_pointer func_arg;
 {
     krb5_db2_context *db_ctx;
diff --git a/src/lib/kdb/kdb_db2.h b/src/lib/kdb/kdb_db2.h
index fd35c81..2d4d8e9 100644
--- a/src/lib/kdb/kdb_db2.h
+++ b/src/lib/kdb/kdb_db2.h
@@ -69,56 +69,56 @@ typedef struct _krb5_db2_context {
 #define KDB2_LOCK_EXT ".ok"
 
 krb5_error_code krb5_db2_db_set_name 
-	KRB5_PROTOTYPE((krb5_context,
-		   char * ));
+	(krb5_context,
+		   char * );
 krb5_error_code krb5_db2_db_init 
-	KRB5_PROTOTYPE((krb5_context));
+	(krb5_context);
 krb5_error_code krb5_db2_db_fini 
-	KRB5_PROTOTYPE((krb5_context));
+	(krb5_context);
 krb5_error_code krb5_db2_db_get_age 
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   char *,
-		   time_t * ));
+		   time_t * );
 krb5_error_code krb5_db2_db_create 
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   char *,
-		   krb5_int32));
+		   krb5_int32);
 krb5_error_code krb5_db2_db_destroy 
-	KRB5_PROTOTYPE((krb5_context,
-		   char * ));
+	(krb5_context,
+		   char * );
 krb5_error_code krb5_db2_db_rename 
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   char *,
-		   char * ));
+		   char * );
 krb5_error_code krb5_db2_db_get_principal 
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_const_principal,
 		   krb5_db_entry *,
 		   int *,
-		   krb5_boolean * ));
+		   krb5_boolean * );
 void krb5_db2_db_free_principal 
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_db_entry *,
-		   int ));
+		   int );
 krb5_error_code krb5_db2_db_put_principal 
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_db_entry *,
-		   int * ));
+		   int * );
 krb5_error_code krb5_db2_db_iterate
-    	KRB5_PROTOTYPE((krb5_context,
-		   krb5_error_code (*) KRB5_PROTOTYPE((krb5_pointer,
-					          krb5_db_entry *)),
-	           krb5_pointer ));
+    	(krb5_context,
+		   krb5_error_code (*) (krb5_pointer,
+					          krb5_db_entry *),
+	           krb5_pointer );
 krb5_error_code krb5_db2_db_set_nonblocking 
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_boolean,
-		   krb5_boolean * ));
+		   krb5_boolean * );
 krb5_boolean krb5_db2_db_set_lockmode
-	KRB5_PROTOTYPE((krb5_context,
-		   krb5_boolean ));
+	(krb5_context,
+		   krb5_boolean );
 krb5_error_code krb5_db2_db_open_database 
-	KRB5_PROTOTYPE((krb5_context));
+	(krb5_context);
 krb5_error_code krb5_db2_db_close_database 
-	KRB5_PROTOTYPE((krb5_context));
+	(krb5_context);
 
 #endif /* KRB5_KDB_DB2_H */
diff --git a/src/lib/kdb/kdb_dbm.c b/src/lib/kdb/kdb_dbm.c
index 003ba3e..4769ba9 100644
--- a/src/lib/kdb/kdb_dbm.c
+++ b/src/lib/kdb/kdb_dbm.c
@@ -54,11 +54,11 @@ extern char *progname;
 static char default_db_name[] = DEFAULT_KDB_FILE;
 
 static char *gen_dbsuffix 
-	PROTOTYPE((char *, char * ));
+	(char *, char * );
 static krb5_error_code krb5_dbm_db_start_update 
-	PROTOTYPE((krb5_context));
+	(krb5_context);
 static krb5_error_code krb5_dbm_db_end_update 
-	PROTOTYPE((krb5_context));
+	(krb5_context);
 
 /*
  * This module contains all of the code which directly interfaces to
@@ -1132,7 +1132,7 @@ cleanup:
 krb5_error_code
 krb5_dbm_db_iterate (context, func, func_arg)
     krb5_context context;
-    krb5_error_code (*func) PROTOTYPE((krb5_pointer, krb5_db_entry *));
+    krb5_error_code (*func) (krb5_pointer, krb5_db_entry *);
     krb5_pointer func_arg;
 {
     datum key, contents;
diff --git a/src/lib/kdb/keytab.c b/src/lib/kdb/keytab.c
index 1e5025c..222e2d9 100644
--- a/src/lib/kdb/keytab.c
+++ b/src/lib/kdb/keytab.c
@@ -28,10 +28,10 @@
 #include "k5-int.h"
 #include "kdb_kt.h"
 
-krb5_error_code krb5_ktkdb_close KRB5_PROTOTYPE((krb5_context, krb5_keytab));
+krb5_error_code krb5_ktkdb_close (krb5_context, krb5_keytab);
 
-krb5_error_code krb5_ktkdb_get_entry KRB5_PROTOTYPE((krb5_context, krb5_keytab, krb5_const_principal,
-		   krb5_kvno, krb5_enctype, krb5_keytab_entry *));
+krb5_error_code krb5_ktkdb_get_entry (krb5_context, krb5_keytab, krb5_const_principal,
+		   krb5_kvno, krb5_enctype, krb5_keytab_entry *);
 
 krb5_kt_ops krb5_kt_kdb_ops = {
     0,
diff --git a/src/lib/kdb/t_kdb.c b/src/lib/kdb/t_kdb.c
index 10e6163..b49e09d 100644
--- a/src/lib/kdb/t_kdb.c
+++ b/src/lib/kdb/t_kdb.c
@@ -84,16 +84,16 @@ krb5_principal	*recorded_principals = (krb5_principal *) NULL;
 char		**recorded_names = (char **) NULL;
 
 #ifdef BERK_DB_DBM
-extern DBM	*db_dbm_open PROTOTYPE((char *, int, int));
-extern void     db_dbm_close PROTOTYPE((DBM *));
-extern datum    db_dbm_fetch PROTOTYPE((DBM *, datum));
-extern datum    db_dbm_firstkey PROTOTYPE((DBM *));
-extern datum    db_dbm_nextkey PROTOTYPE((DBM *));
-extern int      db_dbm_delete PROTOTYPE((DBM *, datum));
-extern int      db_dbm_store PROTOTYPE((DBM *, datum, datum, int));
-extern int	db_dbm_error PROTOTYPE((DBM *));
-extern int	db_dbm_clearerr PROTOTYPE((DBM *));
-extern int	db_dbm_dirfno PROTOTYPE((DBM *));
+extern DBM	*db_dbm_open (char *, int, int);
+extern void     db_dbm_close (DBM *);
+extern datum    db_dbm_fetch (DBM *, datum);
+extern datum    db_dbm_firstkey (DBM *);
+extern datum    db_dbm_nextkey (DBM *);
+extern int      db_dbm_delete (DBM *, datum);
+extern int      db_dbm_store (DBM *, datum, datum, int);
+extern int	db_dbm_error (DBM *);
+extern int	db_dbm_clearerr (DBM *);
+extern int	db_dbm_dirfno (DBM *);
 
 static kdb5_dispatch_table berkeley_dispatch = {
     "Berkeley Hashed Database",
@@ -121,10 +121,10 @@ static kdb5_dispatch_table berkeley_dispatch = {
  * (e.g. NetBSD-1.0)
  */
 #ifdef MISSING_ERROR_PROTO
-int dbm_error PROTOTYPE((DBM *));
+int dbm_error (DBM *);
 #endif
 #ifdef MISSING_CLEARERR_PROTO
-int dbm_clearerr PROTOTYPE((DBM *));
+int dbm_clearerr (DBM *);
 #endif
 
 static kdb5_dispatch_table dbm_dispatch = {
diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index 84106b5..881f09f 100644
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* cr_tkt.c, decomp_tkt.c, g_in_tkt.c, tf_util.c: Make prototypes
+	unconditional.
+
 2001-10-03  Ken Raeburn  <raeburn@mit.edu>
 
 	* dest_tkt.c, err_txt.c, g_admhst.c, g_cred.c, g_krbhst.c,
diff --git a/src/lib/krb4/cr_tkt.c b/src/lib/krb4/cr_tkt.c
index b688f84..74c4529 100644
--- a/src/lib/krb4/cr_tkt.c
+++ b/src/lib/krb4/cr_tkt.c
@@ -31,11 +31,11 @@
 #include <string.h>
 
 static int
-krb_cr_tkt_int PROTOTYPE((KTEXT tkt, unsigned int flags_in, char *pname, 
+krb_cr_tkt_int (KTEXT tkt, unsigned int flags_in, char *pname, 
 			  char *pinstance, char *prealm, long paddress,
 			  char *session, int life, long time_sec, 
 			  char *sname, char *sinstance, C_Block key, 
-			  krb5_keyblock *k5key));
+			  krb5_keyblock *k5key);
 
 /*
  * Create ticket takes as arguments information that should be in a
diff --git a/src/lib/krb4/decomp_tkt.c b/src/lib/krb4/decomp_tkt.c
index 84419d5..2508afa 100644
--- a/src/lib/krb4/decomp_tkt.c
+++ b/src/lib/krb4/decomp_tkt.c
@@ -35,12 +35,12 @@
 extern int krb_debug;
 #endif
 
-static int dcmp_tkt_int PROTOTYPE((KTEXT tkt, unsigned char *flags, 
+static int dcmp_tkt_int (KTEXT tkt, unsigned char *flags, 
 				   char *pname, char *pinstance, char *prealm,
 				   unsigned KRB4_32 *paddress, C_Block session,
 				   int *life, unsigned KRB4_32 *time_sec, 
 				   char *sname, char *sinstance, C_Block key, 
-				   Key_schedule key_s, krb5_keyblock *k5key));
+				   Key_schedule key_s, krb5_keyblock *k5key);
 /*
  * This routine takes a ticket and pointers to the variables that
  * should be filled in based on the information in the ticket.  It
diff --git a/src/lib/krb4/g_in_tkt.c b/src/lib/krb4/g_in_tkt.c
index 32f51c1..16b1966 100644
--- a/src/lib/krb4/g_in_tkt.c
+++ b/src/lib/krb4/g_in_tkt.c
@@ -36,12 +36,12 @@
    in <krb-sed.h>, but the code below is too opaque if you can't also
    see them here.  */
 #ifndef	KEY_PROC_TYPE_DEFINED
-typedef int (*key_proc_type) PROTOTYPE ((char *, char *, char *,
-					     char *, C_Block));
+typedef int (*key_proc_type) (char *, char *, char *,
+					     char *, C_Block);
 #endif
 #ifndef	DECRYPT_TKT_TYPE_DEFINED
-typedef int (*decrypt_tkt_type) PROTOTYPE ((char *, char *, char *, char *,
-				     key_proc_type, KTEXT *));
+typedef int (*decrypt_tkt_type) (char *, char *, char *, char *,
+				     key_proc_type, KTEXT *);
 #endif
 
 static int
diff --git a/src/lib/krb4/tf_util.c b/src/lib/krb4/tf_util.c
index 333961b..85f88d6 100644
--- a/src/lib/krb4/tf_util.c
+++ b/src/lib/krb4/tf_util.c
@@ -112,7 +112,7 @@ static int  curpos;			/* Position in tfbfr */
 static int  lastpos;			/* End of tfbfr */
 static char tfbfr[BUFSIZ];		/* Buffer for ticket data */
 
-static int tf_gets PROTOTYPE((char *, int)), tf_read PROTOTYPE((char *, int));
+static int tf_gets (char *, int), tf_read (char *, int);
 
 /*
  * This file contains routines for manipulating the ticket cache file.
diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog
index 7da653e..9a70a2d 100644
--- a/src/lib/krb5/asn.1/ChangeLog
+++ b/src/lib/krb5/asn.1/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* asn1_decode.c, asn1_decode.h, asn1_encode.h, asn1_get.h,
+	asn1_k_decode.h, asn1_k_encode.h, asn1_make.h, asn1_misc.h,
+	asn1buf.h: Make prototypes unconditional.
+
 2001-07-24  Ezra Peisach  <epeisach@mit.edu>
 
 	* asn1_k_encode.c: (asn1_encode_predicted_sam_response): Use
diff --git a/src/lib/krb5/asn.1/asn1_decode.c b/src/lib/krb5/asn.1/asn1_decode.c
index 74d4530..e46df32 100644
--- a/src/lib/krb5/asn.1/asn1_decode.c
+++ b/src/lib/krb5/asn.1/asn1_decode.c
@@ -53,7 +53,7 @@ if(class != UNIVERSAL || construction != PRIMITIVE || tagnum != type)\
 #define cleanup()\
 return 0
 
-time_t gmt_mktime PROTOTYPE((struct tm *));
+time_t gmt_mktime (struct tm *);
 
 asn1_error_code asn1_decode_integer(buf, val)
      asn1buf * buf;
diff --git a/src/lib/krb5/asn.1/asn1_decode.h b/src/lib/krb5/asn.1/asn1_decode.h
index 597d239..bddad88 100644
--- a/src/lib/krb5/asn.1/asn1_decode.h
+++ b/src/lib/krb5/asn.1/asn1_decode.h
@@ -59,30 +59,30 @@
 	     Returns asn1 errors. */
 
 asn1_error_code asn1_decode_integer
-	PROTOTYPE((asn1buf *buf, long *val));
+	(asn1buf *buf, long *val);
 asn1_error_code asn1_decode_unsigned_integer
-	PROTOTYPE((asn1buf *buf, unsigned long *val));
+	(asn1buf *buf, unsigned long *val);
 asn1_error_code asn1_decode_null
-	PROTOTYPE((asn1buf *buf));
+	(asn1buf *buf);
 
 asn1_error_code asn1_decode_octetstring
-	PROTOTYPE((asn1buf *buf, unsigned int *retlen, asn1_octet **val));
+	(asn1buf *buf, unsigned int *retlen, asn1_octet **val);
 asn1_error_code asn1_decode_generalstring
-	PROTOTYPE((asn1buf *buf, unsigned int *retlen, char **val));
+	(asn1buf *buf, unsigned int *retlen, char **val);
 asn1_error_code asn1_decode_charstring
-	PROTOTYPE((asn1buf *buf, unsigned int *retlen, char **val));
+	(asn1buf *buf, unsigned int *retlen, char **val);
 /* Note: A charstring is a special hack to account for the fact that
          krb5 structures store some OCTET STRING values in krb5_octet
 	 arrays and others in krb5_data structures 
-	PROTOTYPE((which use char arrays).
+	 (which use char arrays).
 	 From the ASN.1 point of view, the two string types are the same,
 	 only the receptacles differ. */
 asn1_error_code asn1_decode_printablestring
-	PROTOTYPE((asn1buf *buf, int *retlen, char **val));
+	(asn1buf *buf, int *retlen, char **val);
 asn1_error_code asn1_decode_ia5string
-	PROTOTYPE((asn1buf *buf, int *retlen, char **val));
+	(asn1buf *buf, int *retlen, char **val);
 
 asn1_error_code asn1_decode_generaltime
-	PROTOTYPE((asn1buf *buf, time_t *val));
+	(asn1buf *buf, time_t *val);
 
 #endif
diff --git a/src/lib/krb5/asn.1/asn1_encode.h b/src/lib/krb5/asn.1/asn1_encode.h
index 06ba6f3..e5ae4bb 100644
--- a/src/lib/krb5/asn.1/asn1_encode.h
+++ b/src/lib/krb5/asn.1/asn1_encode.h
@@ -50,7 +50,7 @@
 */
 
 asn1_error_code asn1_encode_integer
-	PROTOTYPE((asn1buf *buf, const long val, unsigned int *retlen));
+	(asn1buf *buf, const long val, unsigned int *retlen);
 /* requires  *buf is allocated
    modifies  *buf, *retlen
    effects   Inserts the encoding of val into *buf and returns 
@@ -59,8 +59,8 @@ asn1_error_code asn1_encode_integer
               to expand the buffer. */
 
 asn1_error_code asn1_encode_unsigned_integer
-	PROTOTYPE((asn1buf *buf, const unsigned long val, 
-		   unsigned int *retlen));
+	(asn1buf *buf, const unsigned long val, 
+		   unsigned int *retlen);
 /* requires  *buf is allocated
    modifies  *buf, *retlen
    effects   Inserts the encoding of val into *buf and returns 
@@ -69,9 +69,9 @@ asn1_error_code asn1_encode_unsigned_integer
               to expand the buffer. */
 
 asn1_error_code asn1_encode_octetstring
-	PROTOTYPE((asn1buf *buf,
+	(asn1buf *buf,
 		   const unsigned int len, const asn1_octet *val,
-		   unsigned int *retlen));
+		   unsigned int *retlen);
 /* requires  *buf is allocated
    modifies  *buf, *retlen
    effects   Inserts the encoding of val into *buf and returns 
@@ -80,9 +80,9 @@ asn1_error_code asn1_encode_octetstring
               to expand the buffer. */
 
 asn1_error_code asn1_encode_charstring
-	PROTOTYPE((asn1buf *buf,
+	(asn1buf *buf,
 		   const unsigned int len, const char *val,
-		   unsigned int *retlen));
+		   unsigned int *retlen);
 /* requires  *buf is allocated
    modifies  *buf, *retlen
    effects   Inserts the encoding of val into *buf and returns 
@@ -91,7 +91,7 @@ asn1_error_code asn1_encode_charstring
               to expand the buffer. */
 
 asn1_error_code asn1_encode_null
-	PROTOTYPE((asn1buf *buf, int *retlen));
+	(asn1buf *buf, int *retlen);
 /* requires  *buf is allocated
    modifies  *buf, *retlen
    effects   Inserts the encoding of NULL into *buf and returns 
@@ -100,9 +100,9 @@ asn1_error_code asn1_encode_null
               to expand the buffer. */
 
 asn1_error_code asn1_encode_printablestring
-	PROTOTYPE((asn1buf *buf,
+	(asn1buf *buf,
 		   const unsigned int len, const char *val,
-		   int *retlen));
+		   int *retlen);
 /* requires  *buf is allocated
    modifies  *buf, *retlen
    effects   Inserts the encoding of val into *buf and returns 
@@ -111,9 +111,9 @@ asn1_error_code asn1_encode_printablestring
               to expand the buffer. */
 
 asn1_error_code asn1_encode_ia5string
-	PROTOTYPE((asn1buf *buf,
+	(asn1buf *buf,
 		   const unsigned int len, const char *val,
-		   int *retlen));
+		   int *retlen);
 /* requires  *buf is allocated
    modifies  *buf, *retlen
    effects   Inserts the encoding of val into *buf and returns 
@@ -122,7 +122,7 @@ asn1_error_code asn1_encode_ia5string
               to expand the buffer. */
 
 asn1_error_code asn1_encode_generaltime
-	PROTOTYPE((asn1buf *buf, const time_t val, unsigned int *retlen));
+	(asn1buf *buf, const time_t val, unsigned int *retlen);
 /* requires  *buf is allocated
    modifies  *buf, *retlen
    effects   Inserts the encoding of val into *buf and returns
@@ -132,9 +132,9 @@ asn1_error_code asn1_encode_generaltime
    Note: The encoding of GeneralizedTime is YYYYMMDDhhmmZ */
 
 asn1_error_code asn1_encode_generalstring
-	PROTOTYPE((asn1buf *buf,
+	(asn1buf *buf,
 		   const unsigned int len, const char *val,
-		   unsigned int *retlen));
+		   unsigned int *retlen);
 /* requires  *buf is allocated,  val has a length of len characters
    modifies  *buf, *retlen
    effects   Inserts the encoding of val into *buf and returns 
diff --git a/src/lib/krb5/asn.1/asn1_get.h b/src/lib/krb5/asn.1/asn1_get.h
index 4503470..873abc0 100644
--- a/src/lib/krb5/asn.1/asn1_get.h
+++ b/src/lib/krb5/asn.1/asn1_get.h
@@ -34,17 +34,17 @@
 #include "asn1buf.h"
 
 asn1_error_code asn1_get_tag_indef
-	PROTOTYPE((asn1buf *buf,
+	(asn1buf *buf,
 		   asn1_class *class,
 		   asn1_construction *construction,
 		   asn1_tagnum *tagnum,
-		   unsigned int *retlen, int *indef));
+		   unsigned int *retlen, int *indef);
 asn1_error_code asn1_get_tag
-	PROTOTYPE((asn1buf *buf,
+	(asn1buf *buf,
 		   asn1_class *class,
 		   asn1_construction *construction,
 		   asn1_tagnum *tagnum,
-		   unsigned int *retlen));
+		   unsigned int *retlen);
 /* requires  *buf is allocated
    effects   Decodes the tag in *buf.  If class != NULL, returns
               the class in *class.  Similarly, the construction,
@@ -55,7 +55,7 @@ asn1_error_code asn1_get_tag
 	     Returns ASN1_OVERRUN if *buf is exhausted during the parse. */
 
 asn1_error_code asn1_get_sequence
-	PROTOTYPE((asn1buf *buf, unsigned int *retlen, int *indef));
+	(asn1buf *buf, unsigned int *retlen, int *indef);
 /* requires  *buf is allocated
    effects   Decodes a tag from *buf and returns ASN1_BAD_ID if it
               doesn't have a sequence ID.  If retlen != NULL, the
@@ -65,10 +65,10 @@ asn1_error_code asn1_get_sequence
 /* Private Procedures */
 
 asn1_error_code asn1_get_id
-	PROTOTYPE((asn1buf *buf,
+	(asn1buf *buf,
 		   asn1_class *class,
 		   asn1_construction *construction,
-		   asn1_tagnum *tagnum));
+		   asn1_tagnum *tagnum);
 /* requires  *buf is allocated
    effects   Decodes the group of identifier octets at *buf's
               current position.  If class != NULL, returns the class
@@ -77,7 +77,7 @@ asn1_error_code asn1_get_id
 	     Returns ASN1_OVERRUN if *buf is exhausted. */
 
 asn1_error_code asn1_get_length
-	PROTOTYPE((asn1buf *buf, unsigned int *retlen, int *indef));
+	(asn1buf *buf, unsigned int *retlen, int *indef);
 /* requires  *buf is allocated
    effects   Decodes the group of length octets at *buf's
               current position.  If retlen != NULL, the
diff --git a/src/lib/krb5/asn.1/asn1_k_decode.h b/src/lib/krb5/asn.1/asn1_k_decode.h
index 04861a4..22b2d2b 100644
--- a/src/lib/krb5/asn.1/asn1_k_decode.h
+++ b/src/lib/krb5/asn.1/asn1_k_decode.h
@@ -68,112 +68,112 @@
 
 /* scalars */
 asn1_error_code asn1_decode_int
-	PROTOTYPE((asn1buf *buf, int *val));
+	(asn1buf *buf, int *val);
 asn1_error_code asn1_decode_int32
-	PROTOTYPE((asn1buf *buf, krb5_int32 *val));
+	(asn1buf *buf, krb5_int32 *val);
 asn1_error_code asn1_decode_kvno
-	PROTOTYPE((asn1buf *buf, krb5_kvno *val));
+	(asn1buf *buf, krb5_kvno *val);
 asn1_error_code asn1_decode_enctype
-	PROTOTYPE((asn1buf *buf, krb5_enctype *val));
+	(asn1buf *buf, krb5_enctype *val);
 asn1_error_code asn1_decode_msgtype
-	PROTOTYPE((asn1buf *buf, krb5_msgtype *val));
+	(asn1buf *buf, krb5_msgtype *val);
 asn1_error_code asn1_decode_cksumtype
-	PROTOTYPE((asn1buf *buf, krb5_cksumtype *val));
+	(asn1buf *buf, krb5_cksumtype *val);
 asn1_error_code asn1_decode_octet
-	PROTOTYPE((asn1buf *buf, krb5_octet *val));
+	(asn1buf *buf, krb5_octet *val);
 asn1_error_code asn1_decode_addrtype
-	PROTOTYPE((asn1buf *buf, krb5_addrtype *val));
+	(asn1buf *buf, krb5_addrtype *val);
 asn1_error_code asn1_decode_authdatatype
-	PROTOTYPE((asn1buf *buf, krb5_authdatatype *val));
+	(asn1buf *buf, krb5_authdatatype *val);
 asn1_error_code asn1_decode_ui_2
-	PROTOTYPE((asn1buf *buf, krb5_ui_2 *val));
+	(asn1buf *buf, krb5_ui_2 *val);
 asn1_error_code asn1_decode_ui_4
-	PROTOTYPE((asn1buf *buf, krb5_ui_4 *val));
+	(asn1buf *buf, krb5_ui_4 *val);
 asn1_error_code asn1_decode_kerberos_time
-	PROTOTYPE((asn1buf *buf, krb5_timestamp *val));
+	(asn1buf *buf, krb5_timestamp *val);
 asn1_error_code asn1_decode_sam_flags
-	PROTOTYPE((asn1buf *buf, krb5_flags *val));
+	(asn1buf *buf, krb5_flags *val);
 
 /* structures */
 asn1_error_code asn1_decode_realm
-	PROTOTYPE((asn1buf *buf, krb5_principal *val));
+	(asn1buf *buf, krb5_principal *val);
 asn1_error_code asn1_decode_principal_name
-	PROTOTYPE((asn1buf *buf, krb5_principal *val));
+	(asn1buf *buf, krb5_principal *val);
 asn1_error_code asn1_decode_checksum
-	PROTOTYPE((asn1buf *buf, krb5_checksum *val));
+	(asn1buf *buf, krb5_checksum *val);
 asn1_error_code asn1_decode_encryption_key
-	PROTOTYPE((asn1buf *buf, krb5_keyblock *val));
+	(asn1buf *buf, krb5_keyblock *val);
 asn1_error_code asn1_decode_encrypted_data
-	PROTOTYPE((asn1buf *buf, krb5_enc_data *val));
+	(asn1buf *buf, krb5_enc_data *val);
 asn1_error_code asn1_decode_ticket_flags
-	PROTOTYPE((asn1buf *buf, krb5_flags *val));
+	(asn1buf *buf, krb5_flags *val);
 asn1_error_code asn1_decode_transited_encoding
-	PROTOTYPE((asn1buf *buf, krb5_transited *val));
+	(asn1buf *buf, krb5_transited *val);
 asn1_error_code asn1_decode_enc_kdc_rep_part
-	PROTOTYPE((asn1buf *buf, krb5_enc_kdc_rep_part *val));
+	(asn1buf *buf, krb5_enc_kdc_rep_part *val);
 asn1_error_code asn1_decode_krb5_flags
-	PROTOTYPE((asn1buf *buf, krb5_flags *val));
+	(asn1buf *buf, krb5_flags *val);
 asn1_error_code asn1_decode_ap_options
-	PROTOTYPE((asn1buf *buf, krb5_flags *val));
+	(asn1buf *buf, krb5_flags *val);
 asn1_error_code asn1_decode_kdc_options
-	PROTOTYPE((asn1buf *buf, krb5_flags *val));
+	(asn1buf *buf, krb5_flags *val);
 asn1_error_code asn1_decode_ticket
-	PROTOTYPE((asn1buf *buf, krb5_ticket *val));
+	(asn1buf *buf, krb5_ticket *val);
 asn1_error_code asn1_decode_kdc_req
-	PROTOTYPE((asn1buf *buf, krb5_kdc_req *val));
+	(asn1buf *buf, krb5_kdc_req *val);
 asn1_error_code asn1_decode_kdc_req_body
-	PROTOTYPE((asn1buf *buf, krb5_kdc_req *val));
+	(asn1buf *buf, krb5_kdc_req *val);
 asn1_error_code asn1_decode_krb_safe_body
-	PROTOTYPE((asn1buf *buf, krb5_safe *val));
+	(asn1buf *buf, krb5_safe *val);
 asn1_error_code asn1_decode_host_address
-	PROTOTYPE((asn1buf *buf, krb5_address *val));
+	(asn1buf *buf, krb5_address *val);
 asn1_error_code asn1_decode_kdc_rep
-	PROTOTYPE((asn1buf *buf, krb5_kdc_rep *val));
+	(asn1buf *buf, krb5_kdc_rep *val);
 asn1_error_code asn1_decode_last_req_entry
-	PROTOTYPE((asn1buf *buf, krb5_last_req_entry *val));
+	(asn1buf *buf, krb5_last_req_entry *val);
 asn1_error_code asn1_decode_authdata_elt
-	PROTOTYPE((asn1buf *buf, krb5_authdata *val));
+	(asn1buf *buf, krb5_authdata *val);
 asn1_error_code asn1_decode_krb_cred_info
-	PROTOTYPE((asn1buf *buf, krb5_cred_info *val));
+	(asn1buf *buf, krb5_cred_info *val);
 asn1_error_code asn1_decode_pa_data
-	PROTOTYPE((asn1buf *buf, krb5_pa_data *val));
+	(asn1buf *buf, krb5_pa_data *val);
 asn1_error_code asn1_decode_passwdsequence
-	PROTOTYPE((asn1buf *buf, passwd_phrase_element *val));
+	(asn1buf *buf, passwd_phrase_element *val);
 asn1_error_code asn1_decode_etype_info_entry
-	PROTOTYPE((asn1buf *buf, krb5_etype_info_entry *val));
+	(asn1buf *buf, krb5_etype_info_entry *val);
 asn1_error_code asn1_decode_sam_challenge
-	PROTOTYPE((asn1buf *buf, krb5_sam_challenge *val));
+	(asn1buf *buf, krb5_sam_challenge *val);
 asn1_error_code asn1_decode_enc_sam_key
-	PROTOTYPE((asn1buf *buf, krb5_sam_key *val));
+	(asn1buf *buf, krb5_sam_key *val);
 asn1_error_code asn1_decode_enc_sam_response_enc
-	PROTOTYPE((asn1buf *buf, krb5_enc_sam_response_enc *val));
+	(asn1buf *buf, krb5_enc_sam_response_enc *val);
 asn1_error_code asn1_decode_sam_response
-	PROTOTYPE((asn1buf *buf, krb5_sam_response *val));
+	(asn1buf *buf, krb5_sam_response *val);
 asn1_error_code asn1_decode_predicted_sam_response
-	PROTOTYPE((asn1buf *buf, krb5_predicted_sam_response *val));
+	(asn1buf *buf, krb5_predicted_sam_response *val);
 
 /* arrays */
 asn1_error_code asn1_decode_authorization_data
-	PROTOTYPE((asn1buf *buf, krb5_authdata ***val));
+	(asn1buf *buf, krb5_authdata ***val);
 asn1_error_code asn1_decode_host_addresses
-	PROTOTYPE((asn1buf *buf, krb5_address ***val));
+	(asn1buf *buf, krb5_address ***val);
 asn1_error_code asn1_decode_sequence_of_ticket
-	PROTOTYPE((asn1buf *buf, krb5_ticket ***val));
+	(asn1buf *buf, krb5_ticket ***val);
 asn1_error_code asn1_decode_sequence_of_krb_cred_info
-	PROTOTYPE((asn1buf *buf, krb5_cred_info ***val));
+	(asn1buf *buf, krb5_cred_info ***val);
 asn1_error_code asn1_decode_sequence_of_pa_data
-	PROTOTYPE((asn1buf *buf, krb5_pa_data ***val));
+	(asn1buf *buf, krb5_pa_data ***val);
 asn1_error_code asn1_decode_last_req
-	PROTOTYPE((asn1buf *buf, krb5_last_req_entry ***val));
+	(asn1buf *buf, krb5_last_req_entry ***val);
 
 asn1_error_code asn1_decode_sequence_of_enctype
-	PROTOTYPE((asn1buf *buf, int *num, krb5_enctype **val));
+	(asn1buf *buf, int *num, krb5_enctype **val);
 
 asn1_error_code asn1_decode_sequence_of_passwdsequence
-	PROTOTYPE((asn1buf *buf, passwd_phrase_element ***val));
+	(asn1buf *buf, passwd_phrase_element ***val);
 
 asn1_error_code asn1_decode_etype_info
-	PROTOTYPE((asn1buf *buf, krb5_etype_info_entry ***val));
+	(asn1buf *buf, krb5_etype_info_entry ***val);
 
 
 #endif
diff --git a/src/lib/krb5/asn.1/asn1_k_encode.h b/src/lib/krb5/asn.1/asn1_k_encode.h
index 6a83ecb..6d36335 100644
--- a/src/lib/krb5/asn.1/asn1_k_encode.h
+++ b/src/lib/krb5/asn.1/asn1_k_encode.h
@@ -105,147 +105,147 @@ asn1_error_code asn1_encode_asn1_type(asn1buf *buf,
 	     Returns ENOMEM if memory runs out.
 */
 
-asn1_error_code asn1_encode_ui_4 PROTOTYPE((asn1buf *buf,
+asn1_error_code asn1_encode_ui_4 (asn1buf *buf,
 					    const krb5_ui_4 val,
-					    unsigned int *retlen));
+					    unsigned int *retlen);
 
-asn1_error_code asn1_encode_msgtype PROTOTYPE((asn1buf *buf,
+asn1_error_code asn1_encode_msgtype (asn1buf *buf,
 					       const /*krb5_msgtype*/int val,
-					       unsigned int *retlen));
+					       unsigned int *retlen);
 
 asn1_error_code asn1_encode_realm
-	PROTOTYPE((asn1buf *buf, const krb5_principal val, unsigned int *retlen));
+	(asn1buf *buf, const krb5_principal val, unsigned int *retlen);
 
 asn1_error_code asn1_encode_principal_name
-	PROTOTYPE((asn1buf *buf, const krb5_principal val, unsigned int *retlen));
+	(asn1buf *buf, const krb5_principal val, unsigned int *retlen);
 
 asn1_error_code asn1_encode_encrypted_data
-	PROTOTYPE((asn1buf *buf, const krb5_enc_data *val, unsigned int *retlen));
+	(asn1buf *buf, const krb5_enc_data *val, unsigned int *retlen);
 
 asn1_error_code asn1_encode_krb5_flags
-	PROTOTYPE((asn1buf *buf, const krb5_flags val, unsigned int *retlen));
+	(asn1buf *buf, const krb5_flags val, unsigned int *retlen);
 
 asn1_error_code asn1_encode_ap_options
-	PROTOTYPE((asn1buf *buf, const krb5_flags val, unsigned int *retlen));
+	(asn1buf *buf, const krb5_flags val, unsigned int *retlen);
 
 asn1_error_code asn1_encode_ticket_flags
-	PROTOTYPE((asn1buf *buf, const krb5_flags val, unsigned int *retlen));
+	(asn1buf *buf, const krb5_flags val, unsigned int *retlen);
 
 asn1_error_code asn1_encode_kdc_options
-	PROTOTYPE((asn1buf *buf, const krb5_flags val, unsigned int *retlen));
+	(asn1buf *buf, const krb5_flags val, unsigned int *retlen);
 
 asn1_error_code asn1_encode_authorization_data
-	PROTOTYPE((asn1buf *buf, const krb5_authdata **val, unsigned int *retlen));
+	(asn1buf *buf, const krb5_authdata **val, unsigned int *retlen);
 
 asn1_error_code asn1_encode_krb5_authdata_elt
-	PROTOTYPE((asn1buf *buf, const krb5_authdata *val, unsigned int *retlen));
+	(asn1buf *buf, const krb5_authdata *val, unsigned int *retlen);
 
 asn1_error_code asn1_encode_kdc_rep
-	PROTOTYPE((int msg_type, asn1buf *buf, const krb5_kdc_rep *val,
-		   unsigned int *retlen));
+	(int msg_type, asn1buf *buf, const krb5_kdc_rep *val,
+		   unsigned int *retlen);
 
 asn1_error_code asn1_encode_enc_kdc_rep_part
-	PROTOTYPE((asn1buf *buf, const krb5_enc_kdc_rep_part *val,
-		   unsigned int *retlen));
+	(asn1buf *buf, const krb5_enc_kdc_rep_part *val,
+		   unsigned int *retlen);
 
 asn1_error_code asn1_encode_ticket
-	PROTOTYPE((asn1buf *buf, const krb5_ticket *val, unsigned int *retlen));
+	(asn1buf *buf, const krb5_ticket *val, unsigned int *retlen);
 
 asn1_error_code asn1_encode_encryption_key
-	PROTOTYPE((asn1buf *buf, const krb5_keyblock *val, unsigned int *retlen));
+	(asn1buf *buf, const krb5_keyblock *val, unsigned int *retlen);
 
 asn1_error_code asn1_encode_kerberos_time
-	PROTOTYPE((asn1buf *buf, const krb5_timestamp val, unsigned int *retlen));
+	(asn1buf *buf, const krb5_timestamp val, unsigned int *retlen);
 
 asn1_error_code asn1_encode_checksum
-	PROTOTYPE((asn1buf *buf, const krb5_checksum *val, unsigned int *retlen));
+	(asn1buf *buf, const krb5_checksum *val, unsigned int *retlen);
 
 asn1_error_code asn1_encode_host_address
-	PROTOTYPE((asn1buf *buf, const krb5_address *val, unsigned int *retlen));
+	(asn1buf *buf, const krb5_address *val, unsigned int *retlen);
 
 asn1_error_code asn1_encode_host_addresses
-	PROTOTYPE((asn1buf *buf, const krb5_address **val, unsigned int *retlen));
+	(asn1buf *buf, const krb5_address **val, unsigned int *retlen);
 
 asn1_error_code asn1_encode_transited_encoding
-	PROTOTYPE((asn1buf *buf, const krb5_transited *val, unsigned int *retlen));
+	(asn1buf *buf, const krb5_transited *val, unsigned int *retlen);
 
 asn1_error_code asn1_encode_last_req
-	PROTOTYPE((asn1buf *buf, const krb5_last_req_entry **val,
-		   unsigned int *retlen));
+	(asn1buf *buf, const krb5_last_req_entry **val,
+		   unsigned int *retlen);
 
 asn1_error_code asn1_encode_sequence_of_pa_data
-	PROTOTYPE((asn1buf *buf, const krb5_pa_data **val, unsigned int *retlen));
+	(asn1buf *buf, const krb5_pa_data **val, unsigned int *retlen);
 
 asn1_error_code asn1_encode_sequence_of_ticket
-	PROTOTYPE((asn1buf *buf, const krb5_ticket **val, unsigned int *retlen));
+	(asn1buf *buf, const krb5_ticket **val, unsigned int *retlen);
 
 asn1_error_code asn1_encode_sequence_of_enctype
-	PROTOTYPE((asn1buf *buf,
+	(asn1buf *buf,
 		   const int len, const krb5_enctype *val,
-		   unsigned int *retlen));
+		   unsigned int *retlen);
 
 asn1_error_code asn1_encode_kdc_req
-	PROTOTYPE((int msg_type,
+	(int msg_type,
 		   asn1buf *buf,
 		   const krb5_kdc_req *val,
-		   unsigned int *retlen));
+		   unsigned int *retlen);
 
 asn1_error_code asn1_encode_kdc_req_body
-	PROTOTYPE((asn1buf *buf, const krb5_kdc_req *val, unsigned int *retlen));
+	(asn1buf *buf, const krb5_kdc_req *val, unsigned int *retlen);
 
 asn1_error_code asn1_encode_krb_safe_body
-	PROTOTYPE((asn1buf *buf, const krb5_safe *val, unsigned int *retlen));
+	(asn1buf *buf, const krb5_safe *val, unsigned int *retlen);
 
 asn1_error_code asn1_encode_sequence_of_krb_cred_info
-	PROTOTYPE((asn1buf *buf, const krb5_cred_info **val, unsigned int *retlen));
+	(asn1buf *buf, const krb5_cred_info **val, unsigned int *retlen);
 
 asn1_error_code asn1_encode_krb_cred_info
-	PROTOTYPE((asn1buf *buf, const krb5_cred_info *val, unsigned int *retlen));
+	(asn1buf *buf, const krb5_cred_info *val, unsigned int *retlen);
 
 asn1_error_code asn1_encode_last_req_entry
-	PROTOTYPE((asn1buf *buf, const krb5_last_req_entry *val,
-		   unsigned int *retlen));
+	(asn1buf *buf, const krb5_last_req_entry *val,
+		   unsigned int *retlen);
 
 asn1_error_code asn1_encode_pa_data
-	PROTOTYPE((asn1buf *buf, const krb5_pa_data *val, unsigned int *retlen));
+	(asn1buf *buf, const krb5_pa_data *val, unsigned int *retlen);
 
 asn1_error_code asn1_encode_alt_method
-	PROTOTYPE((asn1buf *buf, const krb5_alt_method *val,
-		   unsigned int *retlen));
+	(asn1buf *buf, const krb5_alt_method *val,
+		   unsigned int *retlen);
 
 asn1_error_code asn1_encode_etype_info_entry
-	PROTOTYPE((asn1buf *buf, const krb5_etype_info_entry *val,
-		   unsigned int *retlen));
+	(asn1buf *buf, const krb5_etype_info_entry *val,
+		   unsigned int *retlen);
 
 asn1_error_code asn1_encode_etype_info
-	PROTOTYPE((asn1buf *buf, const krb5_etype_info_entry **val,
-		   unsigned int *retlen));
+	(asn1buf *buf, const krb5_etype_info_entry **val,
+		   unsigned int *retlen);
 
 asn1_error_code asn1_encode_passwdsequence
-	PROTOTYPE((asn1buf *buf, const passwd_phrase_element *val, unsigned int *retlen));
+	(asn1buf *buf, const passwd_phrase_element *val, unsigned int *retlen);
 
 asn1_error_code asn1_encode_sequence_of_passwdsequence
-	PROTOTYPE((asn1buf *buf, const passwd_phrase_element **val,
-	unsigned int *retlen));
+	(asn1buf *buf, const passwd_phrase_element **val,
+	unsigned int *retlen);
 
 asn1_error_code asn1_encode_sam_flags
-	PROTOTYPE((asn1buf * buf, const krb5_flags val, unsigned int *retlen));
+	(asn1buf * buf, const krb5_flags val, unsigned int *retlen);
 
 asn1_error_code asn1_encode_sam_challenge
-	PROTOTYPE((asn1buf *buf, const krb5_sam_challenge * val, unsigned int *retlen));
+	(asn1buf *buf, const krb5_sam_challenge * val, unsigned int *retlen);
 
 asn1_error_code asn1_encode_sam_key
-	PROTOTYPE((asn1buf *buf, const krb5_sam_key *val, unsigned int *retlen));
+	(asn1buf *buf, const krb5_sam_key *val, unsigned int *retlen);
 
 asn1_error_code asn1_encode_enc_sam_response_enc
-	PROTOTYPE((asn1buf *buf, const krb5_enc_sam_response_enc *val,
-		   unsigned int *retlen));
+	(asn1buf *buf, const krb5_enc_sam_response_enc *val,
+		   unsigned int *retlen);
 
 asn1_error_code asn1_encode_sam_response
-	PROTOTYPE((asn1buf *buf, const krb5_sam_response *val, unsigned int *retlen));
+	(asn1buf *buf, const krb5_sam_response *val, unsigned int *retlen);
 
 asn1_error_code asn1_encode_predicted_sam_response
-	PROTOTYPE((asn1buf *buf, const krb5_predicted_sam_response *val, 
-		   unsigned int *retlen));
+	(asn1buf *buf, const krb5_predicted_sam_response *val, 
+		   unsigned int *retlen);
 
 #endif
diff --git a/src/lib/krb5/asn.1/asn1_make.h b/src/lib/krb5/asn.1/asn1_make.h
index 51562f2..3fe2fca 100644
--- a/src/lib/krb5/asn.1/asn1_make.h
+++ b/src/lib/krb5/asn.1/asn1_make.h
@@ -47,11 +47,11 @@
 */
 
 asn1_error_code asn1_make_etag
-	PROTOTYPE((asn1buf *buf,
+	(asn1buf *buf,
 		   const asn1_class class,
 		   const asn1_tagnum tagnum,
 		   const unsigned int in_len,
-		   unsigned int *retlen));
+		   unsigned int *retlen);
 /* requires  *buf is allocated, in_len is the length of an ASN.1 encoding
              which has just been inserted in *buf
    modifies  *buf, *retlen
@@ -61,11 +61,11 @@ asn1_error_code asn1_make_etag
 	     Returns ENOMEM if memory runs out. */
 
 asn1_error_code asn1_make_tag
-	PROTOTYPE((asn1buf *buf, const asn1_class class,
+	(asn1buf *buf, const asn1_class class,
 		   const asn1_construction construction,
 		   const asn1_tagnum tagnum,
 		   const unsigned int in_len,
-		   unsigned int *retlen));
+		   unsigned int *retlen);
 /* requires  *buf is allocated, in_len is the length of an ASN.1 encoding
              which has just been inserted in *buf
    modifies  *buf, *retlen
@@ -78,7 +78,7 @@ asn1_error_code asn1_make_tag
 	      the implementation. */
 
 asn1_error_code asn1_make_sequence
-	PROTOTYPE((asn1buf *buf, const unsigned int seq_len, unsigned int *len));
+	(asn1buf *buf, const unsigned int seq_len, unsigned int *len);
 /* requires  *buf is allocated, seq_len is the length of a series of
              sequence components which have just been inserted in *buf
    modifies  *buf, *retlen
@@ -87,8 +87,8 @@ asn1_error_code asn1_make_sequence
              Returns ENOMEM if memory runs out. */
 
 asn1_error_code asn1_make_set
-	PROTOTYPE((asn1buf *buf, const unsigned int set_len, 
-		   unsigned int *retlen));
+	(asn1buf *buf, const unsigned int set_len, 
+		   unsigned int *retlen);
 /* requires  *buf is allocated, seq_len is the length of a series of
              sequence components which have just been inserted in *buf
    modifies  *buf, *retlen
@@ -97,12 +97,11 @@ asn1_error_code asn1_make_set
              Returns ENOMEM if memory runs out. */
 
 asn1_error_code asn1_make_string
-	PROTOTYPE((asn1buf *buf,
+	(asn1buf *buf,
 		   const unsigned int len, const char *string,
-		   int *retlen));
+		   int *retlen);
 /* requires  *buf is allocated, len is the length of *string
-   effects   Inserts the encoding of *string 
-	PROTOTYPE((a series of octets) in *buf.
+   effects   Inserts the encoding of *string (a series of octets) in *buf.
              Returns the length of this encoding in *retlen.
              Returns ENOMEM if memory runs out. */
 
@@ -112,26 +111,24 @@ asn1_error_code asn1_make_string
 
 /* "helper" procedure for asn1_make_tag */
 asn1_error_code asn1_make_length
-	PROTOTYPE((asn1buf *buf, const unsigned int in_len, 
-		   unsigned int *retlen));
+	(asn1buf *buf, const unsigned int in_len, 
+		   unsigned int *retlen);
 /* requires  *buf is allocated, in_len is the length of an ASN.1 encoding
              which has just been inserted in *buf
    modifies  *buf, *retlen
-   effects   inserts length octet
-	PROTOTYPE((s) for in_len into *buf */
+   effects   inserts length octet(s) for in_len into *buf */
 
 /* "helper" procedure for asn1_make_tag */
 asn1_error_code asn1_make_id
-	PROTOTYPE((asn1buf *buf,
+	(asn1buf *buf,
 		   const asn1_class class,
 		   const asn1_construction construction,
 		   const asn1_tagnum tagnum,
-		   unsigned int *retlen));
+		   unsigned int *retlen);
 /* requires  *buf is allocated, class and tagnum are appropriate for
              the ASN.1 encoding which has just been inserted in *buf
    modifies  *buf, *retlen
-   effects   Inserts id octet
-	PROTOTYPE((s) of class class and tag number tagnum
+   effects   Inserts id octet(s) of class class and tag number tagnum
              into *buf */
 
 #endif
diff --git a/src/lib/krb5/asn.1/asn1_misc.h b/src/lib/krb5/asn.1/asn1_misc.h
index 14a5b2a..31b30da 100644
--- a/src/lib/krb5/asn.1/asn1_misc.h
+++ b/src/lib/krb5/asn.1/asn1_misc.h
@@ -31,7 +31,7 @@
 #include "krbasn1.h"
 
 asn1_error_code asn1_krb5_realm_copy
-	PROTOTYPE((krb5_principal target, krb5_principal source));
+	(krb5_principal target, krb5_principal source);
 /* requires  target, source, and source->realm are allocated
    effects   Copies source->realm into target->realm.
              Returns ENOMEM if memory is exhausted. */
diff --git a/src/lib/krb5/asn.1/asn1buf.h b/src/lib/krb5/asn.1/asn1buf.h
index 9d4d245..f0f8ad2 100644
--- a/src/lib/krb5/asn.1/asn1buf.h
+++ b/src/lib/krb5/asn.1/asn1buf.h
@@ -13,17 +13,17 @@ typedef struct code_buffer_rep {
 /**************** Private Procedures ****************/
 
 int asn1buf_size
-	PROTOTYPE((const asn1buf *buf));
+	(const asn1buf *buf);
 /* requires  *buf has been created and not destroyed
    effects   Returns the total size 
-	PROTOTYPE((in octets) of buf's octet buffer. */
+	(in octets) of buf's octet buffer. */
 #define asn1buf_size(buf) \
   (((buf) == NULL || (buf)->base == NULL) \
    ? 0 \
    : ((buf)->bound - (buf)->base + 1))
 
 int asn1buf_free
-	PROTOTYPE((const asn1buf *buf));
+	(const asn1buf *buf);
 /* requires  *buf is allocated
    effects   Returns the number of unused, allocated octets in *buf. */
 #define asn1buf_free(buf) \
@@ -33,7 +33,7 @@ int asn1buf_free
 
 
 asn1_error_code asn1buf_ensure_space
-	PROTOTYPE((asn1buf *buf, const unsigned int amount));
+	(asn1buf *buf, const unsigned int amount);
 /* requires  *buf is allocated
    modifies  *buf
    effects  If buf has less than amount octets of free space, then it is
@@ -46,14 +46,14 @@ asn1_error_code asn1buf_ensure_space
 
 
 asn1_error_code asn1buf_expand
-	PROTOTYPE((asn1buf *buf, unsigned int inc));
+	(asn1buf *buf, unsigned int inc);
 /* requires  *buf is allocated
    modifies  *buf
    effects   Expands *buf by allocating space for inc more octets.
              Returns ENOMEM if memory is exhausted. */
 
 int asn1buf_len
-	PROTOTYPE((const asn1buf *buf));
+	(const asn1buf *buf);
 /* requires  *buf is allocated
    effects   Returns the length of the encoding in *buf. */
 #define asn1buf_len(buf)	((buf)->next - (buf)->base)
@@ -98,12 +98,12 @@ int asn1buf_len
 */
 
 asn1_error_code asn1buf_create
-	PROTOTYPE((asn1buf **buf));
+	(asn1buf **buf);
 /* effects   Creates a new encoding buffer pointed to by *buf.
              Returns ENOMEM if the buffer can't be created. */
 
 asn1_error_code asn1buf_wrap_data
-	PROTOTYPE((asn1buf *buf, const krb5_data *code));
+	(asn1buf *buf, const krb5_data *code);
 /* requires  *buf has already been allocated
    effects   Turns *buf into a "wrapper" for *code.  i.e. *buf is set up
               such that its bottom is the beginning of *code, and its top
@@ -111,9 +111,9 @@ asn1_error_code asn1buf_wrap_data
 	     Returns ASN1_MISSING_FIELD if code is empty. */
 
 asn1_error_code asn1buf_imbed
-	PROTOTYPE((asn1buf *subbuf, const asn1buf *buf, 
+	(asn1buf *subbuf, const asn1buf *buf, 
 		   const unsigned int length,
-		   const int indef));
+		   const int indef);
 /* requires  *subbuf and *buf are allocated
    effects   *subbuf becomes a sub-buffer of *buf.  *subbuf begins
               at *buf's current position and is length octets long.
@@ -122,27 +122,27 @@ asn1_error_code asn1buf_imbed
 	      position starts at the beginning of *subbuf. */
 
 asn1_error_code asn1buf_sync
-	PROTOTYPE((asn1buf *buf, asn1buf *subbuf, const asn1_class class, 
+	(asn1buf *buf, asn1buf *subbuf, const asn1_class class, 
 		   const asn1_tagnum lasttag,
 		   const unsigned int length, const int indef,
-		   const int seqindef));
+		   const int seqindef);
 /* requires  *subbuf is a sub-buffer of *buf, as created by asn1buf_imbed.
              lasttag is the last tagnumber read.
    effects   Synchronizes *buf's current position to match that of *subbuf. */
 
 asn1_error_code asn1buf_skiptail
-	PROTOTYPE((asn1buf *buf, const unsigned int length,
-		   const int indef));
+	(asn1buf *buf, const unsigned int length,
+		   const int indef);
 /* requires  *buf is a subbuffer used in a decoding of a
              constructed indefinite sequence.
    effects   skips trailing fields. */
 
 asn1_error_code asn1buf_destroy
-	PROTOTYPE((asn1buf **buf));
+	(asn1buf **buf);
 /* effects   Deallocates **buf, sets *buf to NULL. */
 
 asn1_error_code asn1buf_insert_octet
-	PROTOTYPE((asn1buf *buf, const int o));
+	(asn1buf *buf, const int o);
 /* requires  *buf is allocated
    effects   Inserts o into the buffer *buf, expanding the buffer if
              necessary.  Returns ENOMEM memory is exhausted. */
@@ -162,7 +162,7 @@ extern __inline__ asn1_error_code asn1buf_insert_octet(buf, o)
 #endif
 
 asn1_error_code asn1buf_insert_octetstring
-	PROTOTYPE((asn1buf *buf, const unsigned int len, const asn1_octet *s));
+	(asn1buf *buf, const unsigned int len, const asn1_octet *s);
 /* requires  *buf is allocated
    modifies  *buf
    effects   Inserts the contents of s (an octet array of length len)
@@ -170,7 +170,7 @@ asn1_error_code asn1buf_insert_octetstring
 	     Returns ENOMEM if memory is exhausted. */
 
 asn1_error_code asn1buf_insert_charstring
-	PROTOTYPE((asn1buf *buf, const unsigned int len, const char *s));
+	(asn1buf *buf, const unsigned int len, const char *s);
 /* requires  *buf is allocated
    modifies  *buf
    effects   Inserts the contents of s (a character array of length len)
@@ -178,7 +178,7 @@ asn1_error_code asn1buf_insert_charstring
 	     Returns ENOMEM if memory is exhausted. */
 
 asn1_error_code asn1buf_remove_octet
-	PROTOTYPE((asn1buf *buf, asn1_octet *o));
+	(asn1buf *buf, asn1_octet *o);
 /* requires  *buf is allocated
    effects   Returns *buf's current octet in *o and advances to
               the next octet.
@@ -189,7 +189,7 @@ asn1_error_code asn1buf_remove_octet
    : ((*(o) = (asn1_octet)(*(((buf)->next)++))),0))
 
 asn1_error_code asn1buf_remove_octetstring
-	PROTOTYPE((asn1buf *buf, const unsigned int len, asn1_octet **s));
+	(asn1buf *buf, const unsigned int len, asn1_octet **s);
 /* requires  *buf is allocated
    effects   Removes the next len octets of *buf and returns them in **s.
 	     Returns ASN1_OVERRUN if there are fewer than len unread octets
@@ -197,8 +197,8 @@ asn1_error_code asn1buf_remove_octetstring
 	     Returns ENOMEM if *s could not be allocated. */
 
 asn1_error_code asn1buf_remove_charstring
-	PROTOTYPE((asn1buf *buf, const unsigned int len,
-					  char **s));
+	(asn1buf *buf, const unsigned int len,
+					  char **s);
 /* requires  *buf is allocated
    effects   Removes the next len octets of *buf and returns them in **s.
 	     Returns ASN1_OVERRUN if there are fewer than len unread octets
@@ -206,26 +206,26 @@ asn1_error_code asn1buf_remove_charstring
 	     Returns ENOMEM if *s could not be allocated. */
 
 asn1_error_code asn1buf_unparse
-	PROTOTYPE((const asn1buf *buf, char **s));
+	(const asn1buf *buf, char **s);
 /* modifies  *s
    effects   Returns a human-readable representation of *buf in *s,
              where each octet in *buf is represented by a character in *s. */
 
 asn1_error_code asn1buf_hex_unparse
-	PROTOTYPE((const asn1buf *buf, char **s));
+	(const asn1buf *buf, char **s);
 /* modifies  *s
    effects   Returns a human-readable representation of *buf in *s,
              where each octet in *buf is represented by a 2-digit
 	     hexadecimal number in *s. */
 
 asn1_error_code asn12krb5_buf
-	PROTOTYPE((const asn1buf *buf, krb5_data **code));
+	(const asn1buf *buf, krb5_data **code);
 /* modifies  *code
    effects   Instantiates **code with the krb5_data representation of **buf. */
 
 
 int asn1buf_remains
-	PROTOTYPE((asn1buf *buf, int indef));
+	(asn1buf *buf, int indef);
 /* requires  *buf is a buffer containing an asn.1 structure or array
    modifies  *buf
    effects   Returns the number of unprocessed octets remaining in *buf. */
diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog
index 227af04..8c7f508 100644
--- a/src/lib/krb5/ccache/ChangeLog
+++ b/src/lib/krb5/ccache/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* cc_file.c, cc_memory.c, cc_stdio.c, ser_cc.c: Make prototypes
+	unconditional.
+
 2001-10-05  Ken Raeburn  <raeburn@mit.edu>
 
 	* cc_file.c, cc_stdio.c: Delete _MSDOS (win16) support.
diff --git a/src/lib/krb5/ccache/cc_file.c b/src/lib/krb5/ccache/cc_file.c
index 2334307..68e1395 100644
--- a/src/lib/krb5/ccache/cc_file.c
+++ b/src/lib/krb5/ccache/cc_file.c
@@ -93,122 +93,122 @@ fcc_nseq.c and fcc_read don't check return values a lot.
 #endif
 
 krb5_error_code KRB5_CALLCONV krb5_fcc_close
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id ));
+        (krb5_context, krb5_ccache id );
 
 krb5_error_code KRB5_CALLCONV krb5_fcc_destroy 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id ));
+        (krb5_context, krb5_ccache id );
 
 krb5_error_code KRB5_CALLCONV krb5_fcc_end_seq_get 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_cc_cursor *cursor ));
+        (krb5_context, krb5_ccache id , krb5_cc_cursor *cursor );
 
 krb5_error_code KRB5_CALLCONV krb5_fcc_generate_new 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache *id ));
+        (krb5_context, krb5_ccache *id );
 
 const char * KRB5_CALLCONV krb5_fcc_get_name 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id ));
+        (krb5_context, krb5_ccache id );
 
 krb5_error_code KRB5_CALLCONV krb5_fcc_get_principal 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal *princ ));
+        (krb5_context, krb5_ccache id , krb5_principal *princ );
 
 krb5_error_code KRB5_CALLCONV krb5_fcc_initialize 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal princ ));
+        (krb5_context, krb5_ccache id , krb5_principal princ );
 
 krb5_error_code KRB5_CALLCONV krb5_fcc_next_cred 
-        KRB5_PROTOTYPE((krb5_context, 
+        (krb5_context, 
 		   krb5_ccache id , 
 		   krb5_cc_cursor *cursor , 
-		   krb5_creds *creds ));
+		   krb5_creds *creds );
 
 krb5_error_code krb5_fcc_read
-        KRB5_PROTOTYPE((krb5_context, 
+        (krb5_context, 
 		   krb5_ccache id , 
 		   krb5_pointer buf,
-		   unsigned int len));
+		   unsigned int len);
 krb5_error_code krb5_fcc_read_principal 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal *princ ));
+        (krb5_context, krb5_ccache id , krb5_principal *princ );
 krb5_error_code krb5_fcc_read_keyblock 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_keyblock *keyblock ));
+        (krb5_context, krb5_ccache id , krb5_keyblock *keyblock );
 krb5_error_code krb5_fcc_read_data 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_data *data ));
+        (krb5_context, krb5_ccache id , krb5_data *data );
 krb5_error_code krb5_fcc_read_int32 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_int32 *i ));
+        (krb5_context, krb5_ccache id , krb5_int32 *i );
 krb5_error_code krb5_fcc_read_ui_2 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_ui_2 *i ));
+        (krb5_context, krb5_ccache id , krb5_ui_2 *i );
 krb5_error_code krb5_fcc_read_octet 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_octet *i ));
+        (krb5_context, krb5_ccache id , krb5_octet *i );
 krb5_error_code krb5_fcc_read_times 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_ticket_times *t ));
+        (krb5_context, krb5_ccache id , krb5_ticket_times *t );
 krb5_error_code krb5_fcc_read_addrs 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache, krb5_address ***));
+        (krb5_context, krb5_ccache, krb5_address ***);
 krb5_error_code krb5_fcc_read_addr 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache, krb5_address *));
+        (krb5_context, krb5_ccache, krb5_address *);
 krb5_error_code krb5_fcc_read_authdata 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache , krb5_authdata ***));
+        (krb5_context, krb5_ccache , krb5_authdata ***);
 krb5_error_code krb5_fcc_read_authdatum 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache , krb5_authdata *));
+        (krb5_context, krb5_ccache , krb5_authdata *);
 
 krb5_error_code KRB5_CALLCONV krb5_fcc_resolve 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache *id , const char *residual ));
+        (krb5_context, krb5_ccache *id , const char *residual );
 
 krb5_error_code KRB5_CALLCONV krb5_fcc_retrieve 
-        KRB5_PROTOTYPE((krb5_context, 
+        (krb5_context, 
 		   krb5_ccache id , 
 		   krb5_flags whichfields , 
 		   krb5_creds *mcreds , 
-		   krb5_creds *creds ));
+		   krb5_creds *creds );
 
 krb5_error_code KRB5_CALLCONV krb5_fcc_start_seq_get 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_cc_cursor *cursor ));
+        (krb5_context, krb5_ccache id , krb5_cc_cursor *cursor );
 
 krb5_error_code KRB5_CALLCONV krb5_fcc_store 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_creds *creds ));
+        (krb5_context, krb5_ccache id , krb5_creds *creds );
 
 krb5_error_code krb5_fcc_skip_header
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache));
+        (krb5_context, krb5_ccache);
 krb5_error_code krb5_fcc_skip_principal 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id ));
+        (krb5_context, krb5_ccache id );
 
 krb5_error_code KRB5_CALLCONV krb5_fcc_set_flags 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_flags flags ));
+        (krb5_context, krb5_ccache id , krb5_flags flags );
 
 extern krb5_cc_ops krb5_cc_file_ops;
 krb5_error_code krb5_change_cache
-   KRB5_PROTOTYPE((void));
+   (void);
 
 krb5_error_code krb5_fcc_write 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_pointer buf , unsigned int len ));
+        (krb5_context, krb5_ccache id , krb5_pointer buf , unsigned int len );
 krb5_error_code krb5_fcc_store_principal 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal princ ));
+        (krb5_context, krb5_ccache id , krb5_principal princ );
 krb5_error_code krb5_fcc_store_keyblock 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_keyblock *keyblock ));
+        (krb5_context, krb5_ccache id , krb5_keyblock *keyblock );
 krb5_error_code krb5_fcc_store_data 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_data *data ));
+        (krb5_context, krb5_ccache id , krb5_data *data );
 krb5_error_code krb5_fcc_store_int32 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_int32 i ));
+        (krb5_context, krb5_ccache id , krb5_int32 i );
 krb5_error_code krb5_fcc_store_ui_4
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_ui_4 i ));
+        (krb5_context, krb5_ccache id , krb5_ui_4 i );
 krb5_error_code krb5_fcc_store_ui_2 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_int32 i ));
+        (krb5_context, krb5_ccache id , krb5_int32 i );
 krb5_error_code krb5_fcc_store_octet 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_int32 i ));
+        (krb5_context, krb5_ccache id , krb5_int32 i );
 krb5_error_code krb5_fcc_store_times 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_ticket_times *t ));
+        (krb5_context, krb5_ccache id , krb5_ticket_times *t );
 krb5_error_code krb5_fcc_store_addrs 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache , krb5_address ** ));
+        (krb5_context, krb5_ccache , krb5_address ** );
 krb5_error_code krb5_fcc_store_addr 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache , krb5_address * ));
+        (krb5_context, krb5_ccache , krb5_address * );
 krb5_error_code krb5_fcc_store_authdata 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache , krb5_authdata **));
+        (krb5_context, krb5_ccache , krb5_authdata **);
 krb5_error_code krb5_fcc_store_authdatum 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache , krb5_authdata *));
+        (krb5_context, krb5_ccache , krb5_authdata *);
 
 krb5_error_code krb5_fcc_interpret 
-        KRB5_PROTOTYPE((krb5_context, int ));
+        (krb5_context, int );
 
 krb5_error_code krb5_fcc_close_file 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache));
+        (krb5_context, krb5_ccache);
 krb5_error_code krb5_fcc_open_file 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache, int));
+        (krb5_context, krb5_ccache, int);
 
 
 #define KRB5_OK 0
diff --git a/src/lib/krb5/ccache/cc_memory.c b/src/lib/krb5/ccache/cc_memory.c
index 9979a3b..76748cd 100644
--- a/src/lib/krb5/ccache/cc_memory.c
+++ b/src/lib/krb5/ccache/cc_memory.c
@@ -35,53 +35,53 @@
 #include <errno.h>
 
 krb5_error_code KRB5_CALLCONV krb5_mcc_close
-	PROTOTYPE((krb5_context, krb5_ccache id ));
+	(krb5_context, krb5_ccache id );
 
 krb5_error_code KRB5_CALLCONV krb5_mcc_destroy 
-	PROTOTYPE((krb5_context, krb5_ccache id ));
+	(krb5_context, krb5_ccache id );
 
 krb5_error_code KRB5_CALLCONV krb5_mcc_end_seq_get 
-	PROTOTYPE((krb5_context, krb5_ccache id , krb5_cc_cursor *cursor ));
+	(krb5_context, krb5_ccache id , krb5_cc_cursor *cursor );
 
 krb5_error_code KRB5_CALLCONV krb5_mcc_generate_new 
-	PROTOTYPE((krb5_context, krb5_ccache *id ));
+	(krb5_context, krb5_ccache *id );
 
 const char * KRB5_CALLCONV krb5_mcc_get_name 
-	PROTOTYPE((krb5_context, krb5_ccache id ));
+	(krb5_context, krb5_ccache id );
 
 krb5_error_code KRB5_CALLCONV krb5_mcc_get_principal 
-	PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal *princ ));
+	(krb5_context, krb5_ccache id , krb5_principal *princ );
 
 krb5_error_code KRB5_CALLCONV krb5_mcc_initialize 
-	PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal princ ));
+	(krb5_context, krb5_ccache id , krb5_principal princ );
 
 krb5_error_code KRB5_CALLCONV krb5_mcc_next_cred 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache id , 
 		   krb5_cc_cursor *cursor , 
-		   krb5_creds *creds ));
+		   krb5_creds *creds );
 
 krb5_error_code KRB5_CALLCONV krb5_mcc_resolve 
-	PROTOTYPE((krb5_context, krb5_ccache *id , const char *residual ));
+	(krb5_context, krb5_ccache *id , const char *residual );
 
 krb5_error_code KRB5_CALLCONV krb5_mcc_retrieve 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache id , 
 		   krb5_flags whichfields , 
 		   krb5_creds *mcreds , 
-		   krb5_creds *creds ));
+		   krb5_creds *creds );
 
 krb5_error_code KRB5_CALLCONV krb5_mcc_start_seq_get 
-	PROTOTYPE((krb5_context, krb5_ccache id , krb5_cc_cursor *cursor ));
+	(krb5_context, krb5_ccache id , krb5_cc_cursor *cursor );
 
 krb5_error_code KRB5_CALLCONV krb5_mcc_store 
-	PROTOTYPE((krb5_context, krb5_ccache id , krb5_creds *creds ));
+	(krb5_context, krb5_ccache id , krb5_creds *creds );
 
 krb5_error_code KRB5_CALLCONV krb5_mcc_set_flags 
-	PROTOTYPE((krb5_context, krb5_ccache id , krb5_flags flags ));
+	(krb5_context, krb5_ccache id , krb5_flags flags );
 
 extern krb5_cc_ops krb5_mcc_ops;
-krb5_error_code krb5_change_cache PROTOTYPE(());
+krb5_error_code krb5_change_cache ();
 
 #define KRB5_OK 0
 
@@ -111,7 +111,7 @@ static krb5_mcc_data *mcc_head = 0;
  * system errors
  * permission errors
  */
-void krb5_mcc_free KRB5_PROTOTYPE((krb5_context context, krb5_ccache id));
+void krb5_mcc_free (krb5_context context, krb5_ccache id);
 
 krb5_error_code KRB5_CALLCONV
 krb5_mcc_initialize(context, id, princ)
diff --git a/src/lib/krb5/ccache/cc_stdio.c b/src/lib/krb5/ccache/cc_stdio.c
index 4b82919..9a2a991 100644
--- a/src/lib/krb5/ccache/cc_stdio.c
+++ b/src/lib/krb5/ccache/cc_stdio.c
@@ -83,192 +83,192 @@ end-of-file versus other errors.
 #include "k5-int.h"
 
 krb5_error_code KRB5_CALLCONV krb5_scc_close
-	PROTOTYPE((krb5_context, 
-		   krb5_ccache id ));
+	(krb5_context, 
+		   krb5_ccache id );
 
 krb5_error_code KRB5_CALLCONV krb5_scc_destroy
-	PROTOTYPE((krb5_context, 
-		   krb5_ccache id ));
+	(krb5_context, 
+		   krb5_ccache id );
 
 krb5_error_code KRB5_CALLCONV krb5_scc_end_seq_get
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache id , 
-		   krb5_cc_cursor *cursor ));
+		   krb5_cc_cursor *cursor );
 
 krb5_error_code KRB5_CALLCONV krb5_scc_generate_new
-	PROTOTYPE((krb5_context, 
-		   krb5_ccache *id ));
+	(krb5_context, 
+		   krb5_ccache *id );
 
 const char * KRB5_CALLCONV krb5_scc_get_name
-	PROTOTYPE((krb5_context, 
-		   krb5_ccache id ));
+	(krb5_context, 
+		   krb5_ccache id );
 
 krb5_error_code KRB5_CALLCONV krb5_scc_get_principal
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache id , 
-		   krb5_principal *princ ));
+		   krb5_principal *princ );
 
 krb5_error_code KRB5_CALLCONV krb5_scc_initialize 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache id , 
-		   krb5_principal princ ));
+		   krb5_principal princ );
 
 krb5_error_code krb5_scc_close_file 
-	PROTOTYPE((krb5_context, 
-		   krb5_ccache));
+	(krb5_context, 
+		   krb5_ccache);
 krb5_error_code krb5_scc_open_file 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache,
-		   int));
+		   int);
 
 krb5_error_code KRB5_CALLCONV krb5_scc_next_cred 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache id , 
 		   krb5_cc_cursor *cursor , 
-		   krb5_creds *creds ));
+		   krb5_creds *creds );
 
 krb5_error_code krb5_scc_read
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache id , 
 		   krb5_pointer buf,
-		   unsigned int len));
+		   unsigned int len);
 krb5_error_code krb5_scc_read_principal 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache id , 
-		   krb5_principal *princ ));
+		   krb5_principal *princ );
 krb5_error_code krb5_scc_read_keyblock 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache id , 
-		   krb5_keyblock *keyblock ));
+		   krb5_keyblock *keyblock );
 krb5_error_code krb5_scc_read_data 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache id , 
-		   krb5_data *data ));
+		   krb5_data *data );
 krb5_error_code krb5_scc_read_int32 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache id , 
-		   krb5_int32 *i ));
+		   krb5_int32 *i );
 krb5_error_code krb5_scc_read_ui_2 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache id , 
-		   krb5_ui_2 *i ));
+		   krb5_ui_2 *i );
 krb5_error_code krb5_scc_read_octet 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache id , 
-		   krb5_octet *i ));
+		   krb5_octet *i );
 krb5_error_code krb5_scc_read_times 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache id , 
-		   krb5_ticket_times *t ));
+		   krb5_ticket_times *t );
 krb5_error_code krb5_scc_read_addrs 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache, 
-		   krb5_address ***));
+		   krb5_address ***);
 krb5_error_code krb5_scc_read_addr 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache, 
-		   krb5_address *));
+		   krb5_address *);
 krb5_error_code krb5_scc_read_authdata 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache, 
-		   krb5_authdata***));
+		   krb5_authdata***);
 krb5_error_code krb5_scc_read_authdatum 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache, 
-		   krb5_authdata*));
+		   krb5_authdata*);
 
 krb5_error_code KRB5_CALLCONV krb5_scc_resolve 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache *id , 
-		   const char *residual ));
+		   const char *residual );
 
 krb5_error_code KRB5_CALLCONV krb5_scc_retrieve 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache id , 
 		   krb5_flags whichfields , 
 		   krb5_creds *mcreds , 
-		   krb5_creds *creds ));
+		   krb5_creds *creds );
 
 krb5_error_code KRB5_CALLCONV krb5_scc_start_seq_get 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache id , 
-		   krb5_cc_cursor *cursor ));
+		   krb5_cc_cursor *cursor );
 
 krb5_error_code KRB5_CALLCONV krb5_scc_store 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache id , 
-		   krb5_creds *creds ));
+		   krb5_creds *creds );
 
 krb5_error_code krb5_scc_skip_header
-	PROTOTYPE((krb5_context, krb5_ccache));
+	(krb5_context, krb5_ccache);
 krb5_error_code krb5_scc_skip_principal 
-	PROTOTYPE((krb5_context, 
-		   krb5_ccache id ));
+	(krb5_context, 
+		   krb5_ccache id );
 
 krb5_error_code KRB5_CALLCONV krb5_scc_set_flags 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache id , 
-		   krb5_flags flags ));
+		   krb5_flags flags );
 
 extern krb5_cc_ops krb5_scc_ops;
 
 krb5_error_code krb5_scc_write 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache id , 
 		   krb5_pointer buf , 
-		   unsigned int len ));
+		   unsigned int len );
 krb5_error_code krb5_scc_store_principal 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache id , 
-		   krb5_principal princ ));
+		   krb5_principal princ );
 krb5_error_code krb5_scc_store_keyblock 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache id , 
-		   krb5_keyblock *keyblock ));
+		   krb5_keyblock *keyblock );
 krb5_error_code krb5_scc_store_data 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache id , 
-		   krb5_data *data ));
+		   krb5_data *data );
 krb5_error_code krb5_scc_store_int32 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache id , 
-		   krb5_int32 i ));
+		   krb5_int32 i );
 krb5_error_code krb5_scc_store_ui_4 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache id , 
-		   krb5_ui_4 i ));
+		   krb5_ui_4 i );
 krb5_error_code krb5_scc_store_ui_2 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache id , 
-		   krb5_int32 i ));
+		   krb5_int32 i );
 krb5_error_code krb5_scc_store_octet 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache id , 
-		   krb5_int32 i ));
+		   krb5_int32 i );
 krb5_error_code krb5_scc_store_times 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache id , 
-		   krb5_ticket_times *t ));
+		   krb5_ticket_times *t );
 krb5_error_code krb5_scc_store_addrs 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache , 
-		   krb5_address ** ));
+		   krb5_address ** );
 krb5_error_code krb5_scc_store_addr 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache , 
-		   krb5_address * ));
+		   krb5_address * );
 krb5_error_code krb5_scc_store_authdata 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache, 
-		   krb5_authdata **));
+		   krb5_authdata **);
 krb5_error_code krb5_scc_store_authdatum 
-	PROTOTYPE((krb5_context, 
+	(krb5_context, 
 		   krb5_ccache, 
-		   krb5_authdata *));
+		   krb5_authdata *);
 
 krb5_error_code krb5_scc_interpret 
-	PROTOTYPE((krb5_context, 
-		   int ));
+	(krb5_context, 
+		   int );
 
 #include <stdio.h>
 
diff --git a/src/lib/krb5/ccache/ccapi/ChangeLog b/src/lib/krb5/ccache/ccapi/ChangeLog
index 973583a..732b8eb 100644
--- a/src/lib/krb5/ccache/ccapi/ChangeLog
+++ b/src/lib/krb5/ccache/ccapi/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* stdcc.h: Make prototypes unconditional.
+
 2001-10-05  Ken Raeburn  <raeburn@mit.edu>
 
 	* stdcc.c, stdcc.h, stdcc_util.c, stdcc_util.h, winccld.c: Delete
diff --git a/src/lib/krb5/ccache/ccapi/stdcc.h b/src/lib/krb5/ccache/ccapi/stdcc.h
index e2d1131..705cdf5 100644
--- a/src/lib/krb5/ccache/ccapi/stdcc.h
+++ b/src/lib/krb5/ccache/ccapi/stdcc.h
@@ -26,50 +26,50 @@ typedef struct _stdccCacheData {
 /* function protoypes  */
 
 krb5_error_code KRB5_CALLCONV krb5_stdcc_close
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id ));
+        (krb5_context, krb5_ccache id );
 
 krb5_error_code KRB5_CALLCONV krb5_stdcc_destroy 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id ));
+        (krb5_context, krb5_ccache id );
 
 krb5_error_code KRB5_CALLCONV krb5_stdcc_end_seq_get 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_cc_cursor *cursor ));
+        (krb5_context, krb5_ccache id , krb5_cc_cursor *cursor );
 
 krb5_error_code KRB5_CALLCONV krb5_stdcc_generate_new 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache *id ));
+        (krb5_context, krb5_ccache *id );
 
 const char * KRB5_CALLCONV krb5_stdcc_get_name 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id ));
+        (krb5_context, krb5_ccache id );
 
 krb5_error_code KRB5_CALLCONV krb5_stdcc_get_principal 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal *princ ));
+        (krb5_context, krb5_ccache id , krb5_principal *princ );
 
 krb5_error_code KRB5_CALLCONV krb5_stdcc_initialize 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal princ ));
+        (krb5_context, krb5_ccache id , krb5_principal princ );
 
 krb5_error_code KRB5_CALLCONV krb5_stdcc_next_cred 
-        KRB5_PROTOTYPE((krb5_context, 
+        (krb5_context, 
 		   krb5_ccache id , 
 		   krb5_cc_cursor *cursor , 
-		   krb5_creds *creds ));
+		   krb5_creds *creds );
 
 krb5_error_code KRB5_CALLCONV krb5_stdcc_resolve 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache *id , const char *residual ));
+        (krb5_context, krb5_ccache *id , const char *residual );
      
 krb5_error_code KRB5_CALLCONV krb5_stdcc_retrieve 
-        KRB5_PROTOTYPE((krb5_context, 
+        (krb5_context, 
 		   krb5_ccache id , 
 		   krb5_flags whichfields , 
 		   krb5_creds *mcreds , 
-		   krb5_creds *creds ));
+		   krb5_creds *creds );
 
 krb5_error_code KRB5_CALLCONV krb5_stdcc_start_seq_get 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_cc_cursor *cursor ));
+        (krb5_context, krb5_ccache id , krb5_cc_cursor *cursor );
 
 krb5_error_code KRB5_CALLCONV krb5_stdcc_store 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_creds *creds ));
+        (krb5_context, krb5_ccache id , krb5_creds *creds );
 
 krb5_error_code KRB5_CALLCONV krb5_stdcc_set_flags 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_flags flags ));
+        (krb5_context, krb5_ccache id , krb5_flags flags );
 
 krb5_error_code KRB5_CALLCONV krb5_stdcc_remove 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_flags flags, krb5_creds *creds));
+        (krb5_context, krb5_ccache id , krb5_flags flags, krb5_creds *creds);
diff --git a/src/lib/krb5/ccache/ser_cc.c b/src/lib/krb5/ccache/ser_cc.c
index 0380992..23eefe4 100644
--- a/src/lib/krb5/ccache/ser_cc.c
+++ b/src/lib/krb5/ccache/ser_cc.c
@@ -37,11 +37,11 @@
  *	krb5_ccache_internalize();
  */
 static krb5_error_code krb5_ccache_size
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *));
+	(krb5_context, krb5_pointer, size_t *);
 static krb5_error_code krb5_ccache_externalize
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *));
+	(krb5_context, krb5_pointer, krb5_octet **, size_t *);
 static krb5_error_code krb5_ccache_internalize
-	KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *));
+	(krb5_context,krb5_pointer *, krb5_octet **, size_t *);
 
 /*
  * Serialization entry for this type.
diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog
index ad3cbb7..9567938 100644
--- a/src/lib/krb5/keytab/ChangeLog
+++ b/src/lib/krb5/keytab/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* ktbase.c: Make prototypes unconditional.
+
 2001-10-03  Ken Raeburn  <raeburn@mit.edu>
 
 	* ktadd.c, ktbase.c, ktdefault.c, ktfr_entry.c, ktremove.c,
diff --git a/src/lib/krb5/keytab/file/ChangeLog b/src/lib/krb5/keytab/file/ChangeLog
index e23c9b1..199cf0c 100644
--- a/src/lib/krb5/keytab/file/ChangeLog
+++ b/src/lib/krb5/keytab/file/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* ktfile.h, ser_ktf.c: Make prototypes unconditional.
+
 2001-10-05  Ken Raeburn  <raeburn@mit.edu>
 
 	* ser_ktf.c: Drop _MSDOS support.
diff --git a/src/lib/krb5/keytab/file/ktfile.h b/src/lib/krb5/keytab/file/ktfile.h
index 6481bc2..2f17b9f 100644
--- a/src/lib/krb5/keytab/file/ktfile.h
+++ b/src/lib/krb5/keytab/file/ktfile.h
@@ -66,103 +66,103 @@ extern struct _krb5_kt_ops krb5_ktf_ops;
 extern struct _krb5_kt_ops krb5_ktf_writable_ops;
 
 krb5_error_code KRB5_CALLCONV krb5_ktfile_resolve 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   const char *,
-		   krb5_keytab *));
+		   krb5_keytab *);
 
 krb5_error_code KRB5_CALLCONV krb5_ktfile_wresolve 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   const char *,
-		   krb5_keytab *));
+		   krb5_keytab *);
 
 krb5_error_code KRB5_CALLCONV krb5_ktfile_get_name 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_keytab,
 		   char *,
-		   unsigned int));
+		   unsigned int);
 
 krb5_error_code KRB5_CALLCONV krb5_ktfile_close 
-	PROTOTYPE((krb5_context,
-		   krb5_keytab));
+	(krb5_context,
+		   krb5_keytab);
 
 krb5_error_code KRB5_CALLCONV krb5_ktfile_get_entry 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_keytab,
 		   krb5_const_principal,
 		   krb5_kvno,
 		   krb5_enctype,
-		   krb5_keytab_entry *));
+		   krb5_keytab_entry *);
 
 krb5_error_code KRB5_CALLCONV krb5_ktfile_start_seq_get 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_keytab,
-		   krb5_kt_cursor *));
+		   krb5_kt_cursor *);
 
 krb5_error_code KRB5_CALLCONV krb5_ktfile_get_next 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_keytab,
 		   krb5_keytab_entry *,
-		   krb5_kt_cursor *));
+		   krb5_kt_cursor *);
 
 krb5_error_code KRB5_CALLCONV krb5_ktfile_end_get 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_keytab,
-		   krb5_kt_cursor *));
+		   krb5_kt_cursor *);
 
 /* routines to be included on extended version (write routines) */
 krb5_error_code KRB5_CALLCONV krb5_ktfile_add 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_keytab,
-		   krb5_keytab_entry *));
+		   krb5_keytab_entry *);
 
 krb5_error_code KRB5_CALLCONV krb5_ktfile_remove 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_keytab,
-		   krb5_keytab_entry *));
+		   krb5_keytab_entry *);
 
 krb5_error_code krb5_ktfileint_openr 
-	PROTOTYPE((krb5_context,
-		   krb5_keytab));
+	(krb5_context,
+		   krb5_keytab);
 
 krb5_error_code krb5_ktfileint_openw 
-	PROTOTYPE((krb5_context,
-		   krb5_keytab));
+	(krb5_context,
+		   krb5_keytab);
 
 krb5_error_code krb5_ktfileint_close 
-	PROTOTYPE((krb5_context,
-		   krb5_keytab));
+	(krb5_context,
+		   krb5_keytab);
 
 krb5_error_code krb5_ktfileint_read_entry 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_keytab,
-		   krb5_keytab_entry *));
+		   krb5_keytab_entry *);
 
 krb5_error_code krb5_ktfileint_write_entry 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_keytab,
-		   krb5_keytab_entry *));
+		   krb5_keytab_entry *);
 
 krb5_error_code krb5_ktfileint_delete_entry 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_keytab,
-                   krb5_int32));
+                   krb5_int32);
 
 krb5_error_code krb5_ktfileint_internal_read_entry 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_keytab,
 		   krb5_keytab_entry *,
-                   krb5_int32 *));
+                   krb5_int32 *);
 
 krb5_error_code krb5_ktfileint_size_entry 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_keytab_entry *,
-                   krb5_int32 *));
+                   krb5_int32 *);
 
 krb5_error_code krb5_ktfileint_find_slot 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_keytab,
                    krb5_int32 *,
-                   krb5_int32 *));
+                   krb5_int32 *);
 
 
 #endif /* KRB5_KTFILE__ */
diff --git a/src/lib/krb5/keytab/file/ser_ktf.c b/src/lib/krb5/keytab/file/ser_ktf.c
index ca54f93..4655e8c 100644
--- a/src/lib/krb5/keytab/file/ser_ktf.c
+++ b/src/lib/krb5/keytab/file/ser_ktf.c
@@ -40,11 +40,11 @@ static const char ktfile_def_name[] = ".";
  *	krb5_ktf_keytab_internalize();
  */
 static krb5_error_code krb5_ktf_keytab_size
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *));
+	(krb5_context, krb5_pointer, size_t *);
 static krb5_error_code krb5_ktf_keytab_externalize
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *));
+	(krb5_context, krb5_pointer, krb5_octet **, size_t *);
 static krb5_error_code krb5_ktf_keytab_internalize
-	KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *));
+	(krb5_context,krb5_pointer *, krb5_octet **, size_t *);
 
 /*
  * Serialization entry for this type.
diff --git a/src/lib/krb5/keytab/ktbase.c b/src/lib/krb5/keytab/ktbase.c
index b808ec4..5f03e61 100644
--- a/src/lib/krb5/keytab/ktbase.c
+++ b/src/lib/krb5/keytab/ktbase.c
@@ -126,11 +126,11 @@ krb5_kt_resolve (context, name, ktid)
  *	krb5_keytab_internalize();
  */
 static krb5_error_code krb5_keytab_size
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *));
+	(krb5_context, krb5_pointer, size_t *);
 static krb5_error_code krb5_keytab_externalize
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *));
+	(krb5_context, krb5_pointer, krb5_octet **, size_t *);
 static krb5_error_code krb5_keytab_internalize
-	KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *));
+	(krb5_context,krb5_pointer *, krb5_octet **, size_t *);
 
 /*
  * Serialization entry for this type.
diff --git a/src/lib/krb5/keytab/srvtab/ChangeLog b/src/lib/krb5/keytab/srvtab/ChangeLog
index 8c43586..aab09dc 100644
--- a/src/lib/krb5/keytab/srvtab/ChangeLog
+++ b/src/lib/krb5/keytab/srvtab/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* ktsrvtab.h: Make prototypes unconditional.
+
 2000-10-17  Ezra Peisach  <epeisach@mit.edu>
 
 	* kts_g_name.c, ktsrvtab.h (krb5_ktsrvtab_get_name): Uses unsigned
diff --git a/src/lib/krb5/keytab/srvtab/ktsrvtab.h b/src/lib/krb5/keytab/srvtab/ktsrvtab.h
index c7e0695..9f6764d 100644
--- a/src/lib/krb5/keytab/srvtab/ktsrvtab.h
+++ b/src/lib/krb5/keytab/srvtab/ktsrvtab.h
@@ -63,55 +63,55 @@ typedef struct _krb5_ktsrvtab_data {
 extern struct _krb5_kt_ops krb5_kts_ops;
 
 krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_resolve
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   const char *,
-		   krb5_keytab *));
+		   krb5_keytab *);
 
 krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_get_name
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_keytab,
 		   char *,
-		   unsigned int));
+		   unsigned int);
 
 krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_close
-	PROTOTYPE((krb5_context,
-		   krb5_keytab));
+	(krb5_context,
+		   krb5_keytab);
 
 krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_get_entry
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_keytab,
 		   krb5_const_principal,
 		   krb5_kvno,
 		   krb5_enctype,
-		   krb5_keytab_entry *));
+		   krb5_keytab_entry *);
 
 krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_start_seq_get
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_keytab,
-		   krb5_kt_cursor *));
+		   krb5_kt_cursor *);
 
 krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_get_next
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_keytab,
 		   krb5_keytab_entry *,
-		   krb5_kt_cursor *));
+		   krb5_kt_cursor *);
 
 krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_end_get
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_keytab,
-		   krb5_kt_cursor *));
+		   krb5_kt_cursor *);
 
 krb5_error_code krb5_ktsrvint_open
-	PROTOTYPE((krb5_context,
-		   krb5_keytab));
+	(krb5_context,
+		   krb5_keytab);
 
 krb5_error_code krb5_ktsrvint_close
-	PROTOTYPE((krb5_context,
-		   krb5_keytab));
+	(krb5_context,
+		   krb5_keytab);
 
 krb5_error_code krb5_ktsrvint_read_entry 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_keytab,
-		   krb5_keytab_entry *));
+		   krb5_keytab_entry *);
 
 #endif /* KRB5_KTSRVTAB__ */
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 65d9b6e..ee68a87 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,11 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* get_in_tkt.c, in_tkt_ktb.c, in_tkt_pwd.c, in_tkt_sky.c,
+	int-proto.h, mk_req_ext.c, pr_to_salt.c, rd_req_dec.c, ser_actx.c,
+	ser_adata.c, ser_addr.c, ser_auth.c, ser_cksum.c, ser_ctx.c,
+	ser_eblk.c, ser_key.c, ser_princ.c, t_kerb.c: Make prototypes
+	unconditional.
+
 2001-10-05  Ken Raeburn  <raeburn@mit.edu>
 
 	* init_ctx.c, preauth.c: Drop _MSDOS support.
diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c
index 0a8f690..d6e469d 100644
--- a/src/lib/krb5/krb/get_in_tkt.c
+++ b/src/lib/krb5/krb/get_in_tkt.c
@@ -64,20 +64,20 @@
 
 /* some typedef's for the function args to make things look a bit cleaner */
 
-typedef krb5_error_code (*git_key_proc) PROTOTYPE((krb5_context,
+typedef krb5_error_code (*git_key_proc) (krb5_context,
 						   const krb5_enctype,
 						   krb5_data *,
 						   krb5_const_pointer,
-						   krb5_keyblock **));
+						   krb5_keyblock **);
 
-typedef krb5_error_code (*git_decrypt_proc) PROTOTYPE((krb5_context,
+typedef krb5_error_code (*git_decrypt_proc) (krb5_context,
 						       const krb5_keyblock *,
 						       krb5_const_pointer,
-						       krb5_kdc_rep * ));
+						       krb5_kdc_rep * );
 
-static krb5_error_code make_preauth_list PROTOTYPE((krb5_context, 
+static krb5_error_code make_preauth_list (krb5_context, 
 						    krb5_preauthtype *,
-						    int, krb5_pa_data ***));
+						    int, krb5_pa_data ***);
 /*
  * This function sends a request to the KDC, and gets back a response;
  * the response is parsed into ret_err_reply or ret_as_reply if the
diff --git a/src/lib/krb5/krb/in_tkt_ktb.c b/src/lib/krb5/krb/in_tkt_ktb.c
index cb9c41e..9991c97 100644
--- a/src/lib/krb5/krb/in_tkt_ktb.c
+++ b/src/lib/krb5/krb/in_tkt_ktb.c
@@ -41,11 +41,11 @@ struct keytab_keyproc_arg {
  * from system area.
  */
 static krb5_error_code keytab_keyproc
-    PROTOTYPE((krb5_context,
+    (krb5_context,
                const krb5_enctype,
                krb5_data *,
                krb5_const_pointer,
-               krb5_keyblock **));
+               krb5_keyblock **);
 
 static krb5_error_code
 keytab_keyproc(context, type, salt, keyseed, key)
diff --git a/src/lib/krb5/krb/in_tkt_pwd.c b/src/lib/krb5/krb/in_tkt_pwd.c
index b494f11..775a85f 100644
--- a/src/lib/krb5/krb/in_tkt_pwd.c
+++ b/src/lib/krb5/krb/in_tkt_pwd.c
@@ -35,11 +35,11 @@ extern char *krb5_default_pwd_prompt1;
  * key-producing procedure for use by krb5_get_in_tkt_with_password.
  */
 static krb5_error_code pwd_keyproc
-    PROTOTYPE((krb5_context,
+    (krb5_context,
                const krb5_enctype,
                krb5_data *,
                krb5_const_pointer,
-               krb5_keyblock **));
+               krb5_keyblock **);
 
 static krb5_error_code
 pwd_keyproc(context, type, salt, keyseed, key)
diff --git a/src/lib/krb5/krb/in_tkt_sky.c b/src/lib/krb5/krb/in_tkt_sky.c
index 0ca1e7e..245a032 100644
--- a/src/lib/krb5/krb/in_tkt_sky.c
+++ b/src/lib/krb5/krb/in_tkt_sky.c
@@ -41,11 +41,11 @@ struct skey_keyproc_arg {
  * from system area.
  */
 static krb5_error_code skey_keyproc
-    PROTOTYPE((krb5_context,
+    (krb5_context,
                const krb5_enctype,
                krb5_data *,
                krb5_const_pointer,
-               krb5_keyblock **));
+               krb5_keyblock **);
 
 static krb5_error_code
 skey_keyproc(context, type, salt, keyseed, key)
diff --git a/src/lib/krb5/krb/int-proto.h b/src/lib/krb5/krb/int-proto.h
index d2df9f8..75ffa55 100644
--- a/src/lib/krb5/krb/int-proto.h
+++ b/src/lib/krb5/krb/int-proto.h
@@ -32,21 +32,21 @@
 #define KRB5_INT_FUNC_PROTO__
 
 krb5_error_code krb5_tgtname
-    	PROTOTYPE((krb5_context context,
+    	(krb5_context context,
 	           const krb5_data *,
 	           const krb5_data *,
-	           krb5_principal *));
+	           krb5_principal *);
 
 krb5_error_code krb5_libdefault_boolean
-        KRB5_PROTOTYPE((krb5_context, const krb5_data *, const char *,
-			int *));
+        (krb5_context, const krb5_data *, const char *,
+			int *);
 
-krb5_error_code krb5_ser_authdata_init KRB5_PROTOTYPE((krb5_context));
-krb5_error_code krb5_ser_address_init KRB5_PROTOTYPE((krb5_context));
-krb5_error_code krb5_ser_authenticator_init KRB5_PROTOTYPE((krb5_context));
-krb5_error_code krb5_ser_checksum_init KRB5_PROTOTYPE((krb5_context));
-krb5_error_code krb5_ser_keyblock_init KRB5_PROTOTYPE((krb5_context));
-krb5_error_code krb5_ser_principal_init KRB5_PROTOTYPE((krb5_context));
+krb5_error_code krb5_ser_authdata_init (krb5_context);
+krb5_error_code krb5_ser_address_init (krb5_context);
+krb5_error_code krb5_ser_authenticator_init (krb5_context);
+krb5_error_code krb5_ser_checksum_init (krb5_context);
+krb5_error_code krb5_ser_keyblock_init (krb5_context);
+krb5_error_code krb5_ser_principal_init (krb5_context);
 
 #endif /* KRB5_INT_FUNC_PROTO__ */
 
diff --git a/src/lib/krb5/krb/mk_req_ext.c b/src/lib/krb5/krb/mk_req_ext.c
index 8b7b5bb..7725746 100644
--- a/src/lib/krb5/krb/mk_req_ext.c
+++ b/src/lib/krb5/krb/mk_req_ext.c
@@ -65,10 +65,10 @@
 */
 
 static krb5_error_code 
-krb5_generate_authenticator PROTOTYPE((krb5_context,
+krb5_generate_authenticator (krb5_context,
 				       krb5_authenticator *, krb5_principal,
 				       krb5_checksum *, krb5_keyblock *,
-				       krb5_int32, krb5_authdata ** ));
+				       krb5_int32, krb5_authdata ** );
 
 krb5_error_code KRB5_CALLCONV
 krb5_mk_req_extended(context, auth_context, ap_req_options, in_data, in_creds,
diff --git a/src/lib/krb5/krb/pr_to_salt.c b/src/lib/krb5/krb/pr_to_salt.c
index 9efe1b7..00d4f9f 100644
--- a/src/lib/krb5/krb/pr_to_salt.c
+++ b/src/lib/krb5/krb/pr_to_salt.c
@@ -30,7 +30,7 @@
 #include "k5-int.h"
 
 static krb5_error_code krb5_principal2salt_internal
-    PROTOTYPE((krb5_context, krb5_const_principal, krb5_data *ret, int));
+    (krb5_context, krb5_const_principal, krb5_data *ret, int);
 
 /*
  * Convert a krb5_principal into the default salt for that principal.
diff --git a/src/lib/krb5/krb/rd_req_dec.c b/src/lib/krb5/krb/rd_req_dec.c
index 31c02dd..0eed509 100644
--- a/src/lib/krb5/krb/rd_req_dec.c
+++ b/src/lib/krb5/krb/rd_req_dec.c
@@ -60,8 +60,8 @@
  */
 
 static krb5_error_code decrypt_authenticator
-	PROTOTYPE((krb5_context, const krb5_ap_req *, krb5_authenticator **,
-		   int));
+	(krb5_context, const krb5_ap_req *, krb5_authenticator **,
+		   int);
 
 #define in_clock_skew(date) (labs((date)-currenttime) < context->clockskew)
 
diff --git a/src/lib/krb5/krb/ser_actx.c b/src/lib/krb5/krb/ser_actx.c
index aa634cc..ec82aaa 100644
--- a/src/lib/krb5/krb/ser_actx.c
+++ b/src/lib/krb5/krb/ser_actx.c
@@ -47,11 +47,11 @@
  *	krb5_auth_context_internalize();
  */
 static krb5_error_code krb5_auth_context_size
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *));
+	(krb5_context, krb5_pointer, size_t *);
 static krb5_error_code krb5_auth_context_externalize
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *));
+	(krb5_context, krb5_pointer, krb5_octet **, size_t *);
 static krb5_error_code krb5_auth_context_internalize
-	KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *));
+	(krb5_context,krb5_pointer *, krb5_octet **, size_t *);
 
 /*
  * Other metadata serialization initializers.
diff --git a/src/lib/krb5/krb/ser_adata.c b/src/lib/krb5/krb/ser_adata.c
index 1293a9b..0f27e89 100644
--- a/src/lib/krb5/krb/ser_adata.c
+++ b/src/lib/krb5/krb/ser_adata.c
@@ -38,11 +38,11 @@
  *	krb5_authdata_internalize();
  */
 static krb5_error_code krb5_authdata_size
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *));
+	(krb5_context, krb5_pointer, size_t *);
 static krb5_error_code krb5_authdata_externalize
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *));
+	(krb5_context, krb5_pointer, krb5_octet **, size_t *);
 static krb5_error_code krb5_authdata_internalize
-	KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *));
+	(krb5_context,krb5_pointer *, krb5_octet **, size_t *);
 
 /* Local data */
 static const krb5_ser_entry krb5_authdata_ser_entry = {
diff --git a/src/lib/krb5/krb/ser_addr.c b/src/lib/krb5/krb/ser_addr.c
index 196ecb2..0988960 100644
--- a/src/lib/krb5/krb/ser_addr.c
+++ b/src/lib/krb5/krb/ser_addr.c
@@ -38,11 +38,11 @@
  *	krb5_address_internalize();
  */
 static krb5_error_code krb5_address_size
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *));
+	(krb5_context, krb5_pointer, size_t *);
 static krb5_error_code krb5_address_externalize
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *));
+	(krb5_context, krb5_pointer, krb5_octet **, size_t *);
 static krb5_error_code krb5_address_internalize
-	KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *));
+	(krb5_context,krb5_pointer *, krb5_octet **, size_t *);
 
 /* Local data */
 static const krb5_ser_entry krb5_address_ser_entry = {
diff --git a/src/lib/krb5/krb/ser_auth.c b/src/lib/krb5/krb/ser_auth.c
index 5c21ebd..983ce8b 100644
--- a/src/lib/krb5/krb/ser_auth.c
+++ b/src/lib/krb5/krb/ser_auth.c
@@ -38,11 +38,11 @@
  *	krb5_authenticator_internalize();
  */
 static krb5_error_code krb5_authenticator_size
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *));
+	(krb5_context, krb5_pointer, size_t *);
 static krb5_error_code krb5_authenticator_externalize
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *));
+	(krb5_context, krb5_pointer, krb5_octet **, size_t *);
 static krb5_error_code krb5_authenticator_internalize
-	KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *));
+	(krb5_context,krb5_pointer *, krb5_octet **, size_t *);
 
 /* Local data */
 static const krb5_ser_entry krb5_authenticator_ser_entry = {
diff --git a/src/lib/krb5/krb/ser_cksum.c b/src/lib/krb5/krb/ser_cksum.c
index ac97574..101c853 100644
--- a/src/lib/krb5/krb/ser_cksum.c
+++ b/src/lib/krb5/krb/ser_cksum.c
@@ -38,11 +38,11 @@
  *	krb5_checksum_internalize();
  */
 static krb5_error_code krb5_checksum_esize
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *));
+	(krb5_context, krb5_pointer, size_t *);
 static krb5_error_code krb5_checksum_externalize
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *));
+	(krb5_context, krb5_pointer, krb5_octet **, size_t *);
 static krb5_error_code krb5_checksum_internalize
-	KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *));
+	(krb5_context,krb5_pointer *, krb5_octet **, size_t *);
 
 /* Local data */
 static const krb5_ser_entry krb5_checksum_ser_entry = {
diff --git a/src/lib/krb5/krb/ser_ctx.c b/src/lib/krb5/krb/ser_ctx.c
index c957a81..5c6647e 100644
--- a/src/lib/krb5/krb/ser_ctx.c
+++ b/src/lib/krb5/krb/ser_ctx.c
@@ -51,23 +51,23 @@
  *	krb5_ser_context_init();
  */
 static krb5_error_code krb5_context_size
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *));
+	(krb5_context, krb5_pointer, size_t *);
 static krb5_error_code krb5_context_externalize
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *));
+	(krb5_context, krb5_pointer, krb5_octet **, size_t *);
 static krb5_error_code krb5_context_internalize
-	KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *));
+	(krb5_context,krb5_pointer *, krb5_octet **, size_t *);
 static krb5_error_code krb5_oscontext_size
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *));
+	(krb5_context, krb5_pointer, size_t *);
 static krb5_error_code krb5_oscontext_externalize
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *));
+	(krb5_context, krb5_pointer, krb5_octet **, size_t *);
 static krb5_error_code krb5_oscontext_internalize
-	KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *));
+	(krb5_context,krb5_pointer *, krb5_octet **, size_t *);
 krb5_error_code profile_ser_size
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *));
+	(krb5_context, krb5_pointer, size_t *);
 krb5_error_code profile_ser_externalize
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *));
+	(krb5_context, krb5_pointer, krb5_octet **, size_t *);
 krb5_error_code profile_ser_internalize
-	KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *));
+	(krb5_context,krb5_pointer *, krb5_octet **, size_t *);
 
 /* Local data */
 static const krb5_ser_entry krb5_context_ser_entry = {
diff --git a/src/lib/krb5/krb/ser_eblk.c b/src/lib/krb5/krb/ser_eblk.c
index bd4b4c5..aed806c 100644
--- a/src/lib/krb5/krb/ser_eblk.c
+++ b/src/lib/krb5/krb/ser_eblk.c
@@ -39,11 +39,11 @@
  *	krb5_encrypt_block_internalize();
  */
 static krb5_error_code krb5_encrypt_block_size
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *));
+	(krb5_context, krb5_pointer, size_t *);
 static krb5_error_code krb5_encrypt_block_externalize
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *));
+	(krb5_context, krb5_pointer, krb5_octet **, size_t *);
 static krb5_error_code krb5_encrypt_block_internalize
-	KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *));
+	(krb5_context,krb5_pointer *, krb5_octet **, size_t *);
 
 /* Local data */
 static const krb5_ser_entry krb5_encrypt_block_ser_entry = {
diff --git a/src/lib/krb5/krb/ser_key.c b/src/lib/krb5/krb/ser_key.c
index 9ea7b1c..a7ef5d0 100644
--- a/src/lib/krb5/krb/ser_key.c
+++ b/src/lib/krb5/krb/ser_key.c
@@ -38,11 +38,11 @@
  *	krb5_keyblock_internalize();
  */
 static krb5_error_code krb5_keyblock_size
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *));
+	(krb5_context, krb5_pointer, size_t *);
 static krb5_error_code krb5_keyblock_externalize
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *));
+	(krb5_context, krb5_pointer, krb5_octet **, size_t *);
 static krb5_error_code krb5_keyblock_internalize
-	KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *));
+	(krb5_context,krb5_pointer *, krb5_octet **, size_t *);
 
 /* Local data */
 static const krb5_ser_entry krb5_keyblock_ser_entry = {
diff --git a/src/lib/krb5/krb/ser_princ.c b/src/lib/krb5/krb/ser_princ.c
index 4435f6e..148c3d5 100644
--- a/src/lib/krb5/krb/ser_princ.c
+++ b/src/lib/krb5/krb/ser_princ.c
@@ -38,11 +38,11 @@
  *	krb5_principal_internalize();
  */
 static krb5_error_code krb5_principal_size
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *));
+	(krb5_context, krb5_pointer, size_t *);
 static krb5_error_code krb5_principal_externalize
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *));
+	(krb5_context, krb5_pointer, krb5_octet **, size_t *);
 static krb5_error_code krb5_principal_internalize
-	KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *));
+	(krb5_context,krb5_pointer *, krb5_octet **, size_t *);
 
 /* Local data */
 static const krb5_ser_entry krb5_principal_ser_entry = {
diff --git a/src/lib/krb5/krb/t_kerb.c b/src/lib/krb5/krb/t_kerb.c
index 89242d9..485f584 100644
--- a/src/lib/krb5/krb/t_kerb.c
+++ b/src/lib/krb5/krb/t_kerb.c
@@ -16,12 +16,12 @@
 
 #include "com_err.h"
 
-void test_string_to_timestamp KRB5_PROTOTYPE((krb5_context, char *));
-void test_425_conv_principal KRB5_PROTOTYPE((krb5_context, char *, char*, char *));
-void test_524_conv_principal KRB5_PROTOTYPE((krb5_context, char *));
-void test_parse_name KRB5_PROTOTYPE((krb5_context, const char *));
-void test_set_realm KRB5_PROTOTYPE((krb5_context, const char *, const char *));
-void usage KRB5_PROTOTYPE((char *));
+void test_string_to_timestamp (krb5_context, char *);
+void test_425_conv_principal (krb5_context, char *, char*, char *);
+void test_524_conv_principal (krb5_context, char *);
+void test_parse_name (krb5_context, const char *);
+void test_set_realm (krb5_context, const char *, const char *);
+void usage (char *);
 
 void test_string_to_timestamp(ctx, ktime)
 	krb5_context ctx;
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index b5c0e13..a39c1f1 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* os-proto.h: Make prototypes unconditional.
+
 2001-10-05  Ken Raeburn  <raeburn@mit.edu>
 
 	* an_to_ln.c, c_ustime.c, ccdefname.c, init_os_ctx.c, ktdefname.c,
diff --git a/src/lib/krb5/os/os-proto.h b/src/lib/krb5/os/os-proto.h
index 7be2c3f..48910b5 100644
--- a/src/lib/krb5/os/os-proto.h
+++ b/src/lib/krb5/os/os-proto.h
@@ -32,22 +32,22 @@
 
 #ifdef SOCK_DGRAM			/* XXX hack... */
 krb5_error_code krb5_locate_kdc
-    PROTOTYPE((krb5_context, const krb5_data *, struct addrlist *, int));
+    (krb5_context, const krb5_data *, struct addrlist *, int);
 #endif
 
 #ifdef HAVE_NETINET_IN_H
 krb5_error_code krb5_unpack_full_ipaddr
-    PROTOTYPE((krb5_context,
+	      (krb5_context,
 	       const krb5_address *,
 	       krb5_int32 *,
-	       krb5_int16 *));
+	       krb5_int16 *);
 
 krb5_error_code krb5_make_full_ipaddr
-    PROTOTYPE((krb5_context,
+              (krb5_context,
 	       krb5_int32,
 	       int,			/* unsigned short promotes to signed
 					   int */
-	       krb5_address **));
+	       krb5_address **);
 
 #endif /* HAVE_NETINET_IN_H */
 
@@ -57,9 +57,9 @@ krb5_error_code krb5_try_realm_txt_rr(const char *, const char *,
 /* Obsolete interface - leave prototype here until code removed */
 krb5_error_code krb5_secure_config_files(krb5_context ctx);
 
-int _krb5_use_dns_realm KRB5_PROTOTYPE((krb5_context));
-int _krb5_use_dns_kdc KRB5_PROTOTYPE((krb5_context));
-int _krb5_conf_boolean KRB5_PROTOTYPE((const char *));
+int _krb5_use_dns_realm (krb5_context);
+int _krb5_use_dns_kdc (krb5_context);
+int _krb5_conf_boolean (const char *);
 
 extern unsigned int krb5_max_skdc_timeout;
 extern unsigned int krb5_skdc_timeout_shift;
diff --git a/src/lib/krb5/rcache/ChangeLog b/src/lib/krb5/rcache/ChangeLog
index 23c28a3..b57895d 100644
--- a/src/lib/krb5/rcache/ChangeLog
+++ b/src/lib/krb5/rcache/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* rc_dfl.h, rc_io.h, ser_rc.c: Make prototypes unconditional.
+
 2001-10-05  Ken Raeburn  <raeburn@mit.edu>
 
 	* rc_io.c: Drop _MSDOS support.
diff --git a/src/lib/krb5/rcache/rc_dfl.h b/src/lib/krb5/rcache/rc_dfl.h
index aaa5e82..51c62ef 100644
--- a/src/lib/krb5/rcache/rc_dfl.h
+++ b/src/lib/krb5/rcache/rc_dfl.h
@@ -16,41 +16,41 @@
 extern krb5_rc_ops krb5_rc_dfl_ops; /* initialized to the following */
 
 krb5_error_code KRB5_CALLCONV krb5_rc_dfl_init 
-    	PROTOTYPE((krb5_context,
+    	(krb5_context,
 		   krb5_rcache,
-		   krb5_deltat));
+		   krb5_deltat);
 krb5_error_code KRB5_CALLCONV krb5_rc_dfl_recover 
-	PROTOTYPE((krb5_context,
-		   krb5_rcache)); 
+	(krb5_context,
+		   krb5_rcache); 
 krb5_error_code KRB5_CALLCONV krb5_rc_dfl_destroy 
-	PROTOTYPE((krb5_context,
-		   krb5_rcache));
+	(krb5_context,
+		   krb5_rcache);
 krb5_error_code KRB5_CALLCONV krb5_rc_dfl_close 
-	PROTOTYPE((krb5_context,
-		   krb5_rcache));
+	(krb5_context,
+		   krb5_rcache);
 krb5_error_code KRB5_CALLCONV krb5_rc_dfl_store 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_rcache,
-		   krb5_donot_replay *));
+		   krb5_donot_replay *);
 krb5_error_code KRB5_CALLCONV krb5_rc_dfl_expunge 
-	PROTOTYPE((krb5_context,
-		   krb5_rcache));
+	(krb5_context,
+		   krb5_rcache);
 krb5_error_code KRB5_CALLCONV krb5_rc_dfl_get_span 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_rcache,
-		   krb5_deltat *));
+		   krb5_deltat *);
 char * KRB5_CALLCONV krb5_rc_dfl_get_name 
-	PROTOTYPE((krb5_context,
-		   krb5_rcache));
+	(krb5_context,
+		   krb5_rcache);
 krb5_error_code KRB5_CALLCONV krb5_rc_dfl_resolve 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_rcache,
-		   char *));
+		   char *);
 krb5_error_code krb5_rc_dfl_close_no_free
-	PROTOTYPE((krb5_context,
-		   krb5_rcache));
+	(krb5_context,
+		   krb5_rcache);
 void krb5_rc_free_entry 
-	PROTOTYPE((krb5_context,
-		   krb5_donot_replay **));
+	(krb5_context,
+		   krb5_donot_replay **);
 #endif
 
diff --git a/src/lib/krb5/rcache/rc_io.h b/src/lib/krb5/rcache/rc_io.h
index 8a1c241..77eb34f 100644
--- a/src/lib/krb5/rcache/rc_io.h
+++ b/src/lib/krb5/rcache/rc_io.h
@@ -28,43 +28,43 @@ krb5_rc_iostuff;
 /* first argument is always iostuff for result file */
 
 krb5_error_code krb5_rc_io_creat 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_rc_iostuff *,
-		   char **));
+		   char **);
 krb5_error_code krb5_rc_io_open 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_rc_iostuff *,
-		   char *));
+		   char *);
 krb5_error_code krb5_rc_io_move 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_rc_iostuff *,
-		   krb5_rc_iostuff *));
+		   krb5_rc_iostuff *);
 krb5_error_code krb5_rc_io_write 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_rc_iostuff *,
 		   krb5_pointer,
-		   unsigned int));
+		   unsigned int);
 krb5_error_code krb5_rc_io_read 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_rc_iostuff *,
 		   krb5_pointer,
-		   unsigned int));
+		   unsigned int);
 krb5_error_code krb5_rc_io_close 
-	PROTOTYPE((krb5_context,
-		   krb5_rc_iostuff *));
+	(krb5_context,
+		   krb5_rc_iostuff *);
 krb5_error_code krb5_rc_io_destroy 
-	PROTOTYPE((krb5_context,
-		   krb5_rc_iostuff *));
+	(krb5_context,
+		   krb5_rc_iostuff *);
 krb5_error_code krb5_rc_io_mark 
-	PROTOTYPE((krb5_context,
-		   krb5_rc_iostuff *));
+	(krb5_context,
+		   krb5_rc_iostuff *);
 krb5_error_code krb5_rc_io_unmark 
-	PROTOTYPE((krb5_context,
-		   krb5_rc_iostuff *));
+	(krb5_context,
+		   krb5_rc_iostuff *);
 krb5_error_code krb5_rc_io_sync
-	PROTOTYPE((krb5_context,
-		   krb5_rc_iostuff *));
+	(krb5_context,
+		   krb5_rc_iostuff *);
 long krb5_rc_io_size
-	PROTOTYPE((krb5_context,
-		   krb5_rc_iostuff *));
+	(krb5_context,
+		   krb5_rc_iostuff *);
 #endif
diff --git a/src/lib/krb5/rcache/ser_rc.c b/src/lib/krb5/rcache/ser_rc.c
index 2df993f..a4ed0f8 100644
--- a/src/lib/krb5/rcache/ser_rc.c
+++ b/src/lib/krb5/rcache/ser_rc.c
@@ -37,11 +37,11 @@
  *	krb5_rcache_internalize();
  */
 static krb5_error_code krb5_rcache_size
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *));
+	(krb5_context, krb5_pointer, size_t *);
 static krb5_error_code krb5_rcache_externalize
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *));
+	(krb5_context, krb5_pointer, krb5_octet **, size_t *);
 static krb5_error_code krb5_rcache_internalize
-	KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *));
+	(krb5_context,krb5_pointer *, krb5_octet **, size_t *);
 
 /*
  * Serialization entry for this type.
diff --git a/src/lib/rpc/ChangeLog b/src/lib/rpc/ChangeLog
index f829ce7..ca3f0a4 100644
--- a/src/lib/rpc/ChangeLog
+++ b/src/lib/rpc/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* auth_gssapi.h, auth_gssapi_misc.c, getrpcent.c,
+	svc_auth_gssapi.c, xdr.h: Make prototypes unconditional.  Don't
+	define PROTOTYPE.
+
 2001-10-05  Ken Raeburn  <raeburn@mit.edu>
 
 	* auth_gssapi.h, getrpcent.c, xdr.h: Drop _MSDOS support.
diff --git a/src/lib/rpc/auth_gssapi.h b/src/lib/rpc/auth_gssapi.h
index 3f5c030..b3d4dc4 100644
--- a/src/lib/rpc/auth_gssapi.h
+++ b/src/lib/rpc/auth_gssapi.h
@@ -23,17 +23,6 @@
 #undef minor
 #endif
 
-/*
- * Make sure we have a definition for PROTOTYPE.
- */
-#if !defined(PROTOTYPE)
-#if defined(__STDC__) || defined(_WIN32) || defined(__ultrix)
-#define PROTOTYPE(x) x
-#else
-#define PROTOTYPE(x) ()
-#endif
-#endif
-
 typedef struct _auth_gssapi_name {
      char *name;
      gss_OID type;
@@ -59,23 +48,23 @@ typedef struct _auth_gssapi_init_res {
 } auth_gssapi_init_res;
 
 typedef void (*auth_gssapi_log_badauth_func)
-     PROTOTYPE((OM_uint32 major,
+     (OM_uint32 major,
 		OM_uint32 minor,
 		struct sockaddr_in *raddr,
-		caddr_t data));
+		caddr_t data);
    
 typedef void (*auth_gssapi_log_badverf_func)
-     PROTOTYPE((gss_name_t client,
+     (gss_name_t client,
 		gss_name_t server,
 		struct svc_req *rqst,
 		struct rpc_msg *msg,
-		caddr_t data));
+		caddr_t data);
 
 typedef void (*auth_gssapi_log_miscerr_func)
-     PROTOTYPE((struct svc_req *rqst,
+     (struct svc_req *rqst,
 		struct rpc_msg *msg,
 		char *error,
-		caddr_t data));
+		caddr_t data);
 
 bool_t xdr_gss_buf(XDR *, gss_buffer_t);
 bool_t xdr_authgssapi_creds(XDR *, auth_gssapi_creds *);
@@ -83,18 +72,18 @@ bool_t xdr_authgssapi_init_arg(XDR *, auth_gssapi_init_arg *);
 bool_t xdr_authgssapi_init_res(XDR *, auth_gssapi_init_res *);
 
 bool_t auth_gssapi_wrap_data
-PROTOTYPE((OM_uint32 *major, OM_uint32 *minor,
+(OM_uint32 *major, OM_uint32 *minor,
 	   gss_ctx_id_t context, rpc_u_int32 seq_num, XDR
 	   *out_xdrs, bool_t (*xdr_func)(), caddr_t
-	   xdr_ptr));
+	   xdr_ptr);
 bool_t auth_gssapi_unwrap_data
-PROTOTYPE((OM_uint32 *major, OM_uint32 *minor,
+(OM_uint32 *major, OM_uint32 *minor,
 	   gss_ctx_id_t context, rpc_u_int32 seq_num, XDR
 	   *in_xdrs, bool_t (*xdr_func)(), caddr_t
-	   xdr_ptr));
+	   xdr_ptr);
 
 AUTH *auth_gssapi_create
-PROTOTYPE((CLIENT *clnt,
+(CLIENT *clnt,
 	   OM_uint32 *major_status,
 	   OM_uint32 *minor_status,
 	   gss_cred_id_t claimant_cred_handle,
@@ -104,35 +93,35 @@ PROTOTYPE((CLIENT *clnt,
 	   OM_uint32 time_req,
 	   gss_OID *actual_mech_type,
 	   OM_uint32 *ret_flags,
-	   OM_uint32 *time_rec));
+	   OM_uint32 *time_rec);
 
 AUTH *auth_gssapi_create_default
-PROTOTYPE((CLIENT *clnt, char *service_name));
+(CLIENT *clnt, char *service_name);
 
 void auth_gssapi_display_status
-PROTOTYPE((char *msg, OM_uint32 major,
-	   OM_uint32 minor)); 
+(char *msg, OM_uint32 major,
+	   OM_uint32 minor); 
 
 bool_t auth_gssapi_seal_seq
-PROTOTYPE((gss_ctx_id_t context, rpc_u_int32 seq_num, gss_buffer_t out_buf));
+(gss_ctx_id_t context, rpc_u_int32 seq_num, gss_buffer_t out_buf);
 
 bool_t auth_gssapi_unseal_seq
-PROTOTYPE((gss_ctx_id_t context, gss_buffer_t in_buf, rpc_u_int32 *seq_num));
+(gss_ctx_id_t context, gss_buffer_t in_buf, rpc_u_int32 *seq_num);
 
 bool_t _svcauth_gssapi_set_names
-PROTOTYPE((auth_gssapi_name *names, int num));
+(auth_gssapi_name *names, int num);
 void _svcauth_gssapi_unset_names
-PROTOTYPE((void));
+(void);
 
 void _svcauth_gssapi_set_log_badauth_func
-PROTOTYPE((auth_gssapi_log_badauth_func func,
-	   caddr_t data));
+(auth_gssapi_log_badauth_func func,
+	   caddr_t data);
 void _svcauth_gssapi_set_log_badverf_func
-PROTOTYPE((auth_gssapi_log_badverf_func func,
-	   caddr_t data));
+(auth_gssapi_log_badverf_func func,
+	   caddr_t data);
 void _svcauth_gssapi_set_log_miscerr_func
-PROTOTYPE((auth_gssapi_log_miscerr_func func,
-	   caddr_t data));
+(auth_gssapi_log_miscerr_func func,
+	   caddr_t data);
 
 #define GSS_COPY_BUFFER(dest, src) { \
      (dest).length = (src).length; \
diff --git a/src/lib/rpc/auth_gssapi_misc.c b/src/lib/rpc/auth_gssapi_misc.c
index f111013..00420aa 100644
--- a/src/lib/rpc/auth_gssapi_misc.c
+++ b/src/lib/rpc/auth_gssapi_misc.c
@@ -26,7 +26,7 @@ int misc_debug_gssapi = DEBUG_GSSAPI;
 #endif
    
 static void auth_gssapi_display_status_1
-	PROTOTYPE((char *, OM_uint32, int, int));
+	(char *, OM_uint32, int, int);
    
 bool_t xdr_gss_buf(xdrs, buf)
    XDR *xdrs;
diff --git a/src/lib/rpc/getrpcent.c b/src/lib/rpc/getrpcent.c
index 1b22b53..08ad02d 100644
--- a/src/lib/rpc/getrpcent.c
+++ b/src/lib/rpc/getrpcent.c
@@ -43,21 +43,8 @@ static  char sccsid[] = "@(#)getrpcent.c 1.9 87/08/11  Copyr 1984 Sun Micro";
 #include <string.h>
 #include <sys/socket.h>
 
-/*
- * Make sure we have a definition for PROTOTYPE.
- */
-#if !defined(PROTOTYPE)
-#if defined(__STDC__) || defined(_WIN32) || defined(__ultrix)
-#define PROTOTYPE(x) x
-#else
-#define PROTOTYPE(x) ()
-#endif
-#endif
-
-SETRPCENT_TYPE setrpcent
-PROTOTYPE((int));
-ENDRPCENT_TYPE endrpcent
-PROTOTYPE((void));
+SETRPCENT_TYPE setrpcent (int);
+ENDRPCENT_TYPE endrpcent (void);
 
 /*
  * Internet version.
diff --git a/src/lib/rpc/svc_auth_gssapi.c b/src/lib/rpc/svc_auth_gssapi.c
index af52e8e..5473815 100644
--- a/src/lib/rpc/svc_auth_gssapi.c
+++ b/src/lib/rpc/svc_auth_gssapi.c
@@ -77,14 +77,13 @@ static bool_t	svc_auth_gssapi_wrap(SVCAUTH *, XDR *, xdrproc_t, caddr_t);
 static bool_t	svc_auth_gssapi_unwrap(SVCAUTH *, XDR *, xdrproc_t, caddr_t);
 static svc_auth_gssapi_data *create_client(void);
 static svc_auth_gssapi_data *get_client
-       PROTOTYPE((gss_buffer_t client_handle));
+       (gss_buffer_t client_handle);
 static void destroy_client
-       PROTOTYPE((svc_auth_gssapi_data *client_data));
+       (svc_auth_gssapi_data *client_data);
 static void clean_client(void), cleanup(void);
 static void client_expire
-       PROTOTYPE((svc_auth_gssapi_data *client_data, rpc_u_int32 exp));
-static void dump_db
-PROTOTYPE((char *msg));
+       (svc_auth_gssapi_data *client_data, rpc_u_int32 exp);
+static void dump_db (char *msg);
 
 struct svc_auth_ops svc_auth_gssapi_ops = {
      svc_auth_gssapi_wrap,
diff --git a/src/lib/rpc/xdr.h b/src/lib/rpc/xdr.h
index b94984d..9181fc7 100644
--- a/src/lib/rpc/xdr.h
+++ b/src/lib/rpc/xdr.h
@@ -42,17 +42,6 @@
 #include <stdio.h>
 
 /*
- * Make sure we have a definition for PROTOTYPE.
- */
-#if !defined(PROTOTYPE)
-#if defined(__STDC__) || defined(_WIN32) || defined(__ultrix)
-#define PROTOTYPE(x) x
-#else
-#define PROTOTYPE(x) ()
-#endif
-#endif
-
-/*
  * XDR provides a conventional way for converting between C data
  * types and an external bit-string representation.  Library supplied
  * routines provide for the conversion on built-in C data types.  These
@@ -277,47 +266,47 @@ struct xdr_discrim {
 
 extern bool_t	xdr_void(XDR *, void *);
 extern bool_t	xdr_int
-PROTOTYPE((XDR *, int *));
+(XDR *, int *);
 extern bool_t	xdr_u_int
-PROTOTYPE((XDR *, unsigned int *));
+(XDR *, unsigned int *);
 extern bool_t	xdr_long
-PROTOTYPE((XDR *, long *));
+(XDR *, long *);
 extern bool_t	xdr_u_long
-PROTOTYPE((XDR *, unsigned long *));
+(XDR *, unsigned long *);
 extern bool_t	xdr_short
-PROTOTYPE((XDR *, short *));
+(XDR *, short *);
 extern bool_t	xdr_u_short
-PROTOTYPE((XDR *, unsigned short *));
+(XDR *, unsigned short *);
 extern bool_t	xdr_bool
-PROTOTYPE((XDR *, bool_t *));
+(XDR *, bool_t *);
 extern bool_t	xdr_enum
-PROTOTYPE((XDR *, enum_t *));
+(XDR *, enum_t *);
 extern bool_t	xdr_array
-PROTOTYPE((XDR *, caddr_t *, unsigned int*, unsigned int, unsigned int, xdrproc_t));
+(XDR *, caddr_t *, unsigned int*, unsigned int, unsigned int, xdrproc_t);
 extern bool_t	xdr_bytes
-PROTOTYPE((XDR *, char **, unsigned int *, unsigned int));
+(XDR *, char **, unsigned int *, unsigned int);
 extern bool_t	xdr_opaque
-PROTOTYPE((XDR *, caddr_t, unsigned int));
+(XDR *, caddr_t, unsigned int);
 extern bool_t	xdr_string
-PROTOTYPE((XDR *, char **, unsigned int));
+(XDR *, char **, unsigned int);
 extern bool_t	xdr_union
-PROTOTYPE((XDR *, enum_t *, char *, struct xdr_discrim *, xdrproc_t));
+(XDR *, enum_t *, char *, struct xdr_discrim *, xdrproc_t);
 extern bool_t	xdr_char
-PROTOTYPE((XDR *, char *));
+(XDR *, char *);
 extern bool_t	xdr_u_char
-PROTOTYPE((XDR *, unsigned char *));
+(XDR *, unsigned char *);
 extern bool_t	xdr_vector
-PROTOTYPE((XDR *, char *, unsigned int, unsigned int, xdrproc_t));
+(XDR *, char *, unsigned int, unsigned int, xdrproc_t);
 extern bool_t	xdr_float
-PROTOTYPE((XDR *, float *));
+(XDR *, float *);
 extern bool_t	xdr_double
-PROTOTYPE((XDR *, double *));
+(XDR *, double *);
 extern bool_t	xdr_reference
-PROTOTYPE((XDR *, caddr_t *, unsigned int, xdrproc_t));
+(XDR *, caddr_t *, unsigned int, xdrproc_t);
 extern bool_t	xdr_pointer
-PROTOTYPE((XDR *, char **, unsigned int, xdrproc_t));
+(XDR *, char **, unsigned int, xdrproc_t);
 extern bool_t	xdr_wrapstring
-PROTOTYPE((XDR *, char **));
+(XDR *, char **);
 
 /*
  * Common opaque bytes objects used by many rpc protocols;
@@ -334,12 +323,12 @@ struct netobj {
 };
 typedef struct netobj netobj;
 extern bool_t   xdr_netobj
-PROTOTYPE((XDR *, struct netobj *));
+(XDR *, struct netobj *);
 
 extern bool_t	xdr_int32
-PROTOTYPE((XDR *, rpc_int32 *));
+(XDR *, rpc_int32 *);
 extern bool_t	xdr_u_int32
-PROTOTYPE((XDR *, rpc_u_int32 *));
+(XDR *, rpc_u_int32 *);
 
 /*
  * These are the public routines for the various implementations of
@@ -356,37 +345,37 @@ PROTOTYPE((XDR *, rpc_u_int32 *));
 #define xdralloc_getdata	gssrpc_xdralloc_getdata
 
 /* XDR allocating memory buffer */
-extern void   xdralloc_create PROTOTYPE((XDR *xdrs, enum xdr_op op));	
+extern void   xdralloc_create (XDR *xdrs, enum xdr_op op);	
 
 /* destroy xdralloc, save buf */
-extern void   xdralloc_release PROTOTYPE((XDR *xdrs));	
+extern void   xdralloc_release (XDR *xdrs);	
 
 /* get buffer from xdralloc */
-extern caddr_t xdralloc_getdata PROTOTYPE((XDR *xdrs));	
+extern caddr_t xdralloc_getdata (XDR *xdrs);	
 
 /* XDR using memory buffers */
-extern void xdrmem_create PROTOTYPE((XDR *xdrs, caddr_t addr,
-				     unsigned int size, enum xdr_op xop));
+extern void xdrmem_create (XDR *xdrs, caddr_t addr,
+				     unsigned int size, enum xdr_op xop);
 
 /* XDR using stdio library */
-extern void xdrstdio_create PROTOTYPE((XDR *xdrs, FILE *file,
-					enum xdr_op op));
+extern void xdrstdio_create (XDR *xdrs, FILE *file,
+					enum xdr_op op);
 
 /* XDR pseudo records for tcp */
-extern void xdrrec_create PROTOTYPE((XDR *xdrs, unsigned int sendsize,
+extern void xdrrec_create (XDR *xdrs, unsigned int sendsize,
 				     unsigned int recvsize, caddr_t tcp_handle,
 				     int (*readit) (caddr_t, caddr_t, int),
-				     int (*writeit) (caddr_t, caddr_t, int)));
+				     int (*writeit) (caddr_t, caddr_t, int));
 
 /* make end of xdr record */
-extern bool_t xdrrec_endofrecord PROTOTYPE((XDR *xdrs, bool_t sendnow));
+extern bool_t xdrrec_endofrecord (XDR *xdrs, bool_t sendnow);
 
 /* move to beginning of next record */
-extern bool_t xdrrec_skiprecord PROTOTYPE((XDR *xdrs));
+extern bool_t xdrrec_skiprecord (XDR *xdrs);
 
 /* true if no more input */
-extern bool_t xdrrec_eof PROTOTYPE((XDR *xdrs));
+extern bool_t xdrrec_eof (XDR *xdrs);
 
 /* free memory buffers for xdr */
-extern void gssrpc_xdr_free PROTOTYPE((xdrproc_t proc, void *__objp));
+extern void gssrpc_xdr_free (xdrproc_t proc, void *__objp);
 #endif /* !__XDR_HEADER__ */
diff --git a/src/mac/libraries/ChangeLog b/src/mac/libraries/ChangeLog
index f33d71c..9cd1ff2 100644
--- a/src/mac/libraries/ChangeLog
+++ b/src/mac/libraries/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* autoconf.h (NO_NESTED_PROTOTYPES): Don't define.
+
 2001-04-26  Ken Raeburn  <raeburn@mit.edu>
 
 	* autoconf.h (KRB5_PROVIDE_PROTOTYPES): Don't define.
diff --git a/src/mac/libraries/autoconf.h b/src/mac/libraries/autoconf.h
index 6fbbd7c..6d52ab8 100644
--- a/src/mac/libraries/autoconf.h
+++ b/src/mac/libraries/autoconf.h
@@ -4,7 +4,6 @@
 #define HAS_ANSI_CONST 1
 #define HAVE_STDLIB_H 1
 #define HAS_VOID_TYPE 1
-#define NO_NESTED_PROTOTYPES 1
 #define NO_YYLINENO 1
 #define USE_DIRENT_H 1
 #define HAVE_STRING_H 1
diff --git a/src/slave/ChangeLog b/src/slave/ChangeLog
index 19ab29b..f30bc7e 100644
--- a/src/slave/ChangeLog
+++ b/src/slave/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* kprop.c, kpropd.c: Make prototypes unconditional.
+
 2001-09-24  Mitchell Berger  <mitchb@mit.edu>
 
 	* kpropd.M: Correct typo (synopsis line should say kpropd, not kprop).
diff --git a/src/slave/kprop.c b/src/slave/kprop.c
index edf8d0f..a8ee700 100644
--- a/src/slave/kprop.c
+++ b/src/slave/kprop.c
@@ -65,27 +65,27 @@ krb5_address	sender_addr;
 krb5_address	receiver_addr;
 
 void	PRS
-	PROTOTYPE((int, char **));
+	(int, char **);
 void	get_tickets
-	PROTOTYPE((krb5_context));
+	(krb5_context);
 static void usage 
-	PROTOTYPE((void));
+	(void);
 krb5_error_code open_connection 
-	PROTOTYPE((char *, int *, char *, unsigned int));
+	(char *, int *, char *, unsigned int);
 void	kerberos_authenticate 
-	PROTOTYPE((krb5_context, krb5_auth_context *, 
-		   int, krb5_principal, krb5_creds **));
+	(krb5_context, krb5_auth_context *, 
+		   int, krb5_principal, krb5_creds **);
 int	open_database 
-	PROTOTYPE((krb5_context, char *, int *));
+	(krb5_context, char *, int *);
 void	close_database 
-	PROTOTYPE((krb5_context, int));
+	(krb5_context, int);
 void	xmit_database 
-	PROTOTYPE((krb5_context, krb5_auth_context, krb5_creds *, 
-		   int, int, int));
+	(krb5_context, krb5_auth_context, krb5_creds *, 
+		   int, int, int);
 void	send_error 
-	PROTOTYPE((krb5_context, krb5_creds *, int, char *, krb5_error_code));
+	(krb5_context, krb5_creds *, int, char *, krb5_error_code);
 void	update_last_prop_file 
-	PROTOTYPE((char *, char *));
+	(char *, char *);
 
 static void usage()
 {
diff --git a/src/slave/kpropd.c b/src/slave/kpropd.c
index 85817b9..6adf484 100644
--- a/src/slave/kpropd.c
+++ b/src/slave/kpropd.c
@@ -111,38 +111,38 @@ krb5_address	receiver_addr;
 short 		port = 0;
 
 void	PRS
-	PROTOTYPE((char**));
+	(char**);
 void	do_standalone
-	PROTOTYPE((void));
+	(void);
 void	doit
-	PROTOTYPE((int));
+	(int);
 void	kerberos_authenticate
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   krb5_principal *,
 		   krb5_enctype *,
-		   struct sockaddr_in));
+		   struct sockaddr_in);
 krb5_boolean authorized_principal
-	PROTOTYPE((krb5_context,
+	(krb5_context,
     		   krb5_principal,
-		   krb5_enctype));
+		   krb5_enctype);
 void	recv_database
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   int,
-		   krb5_data *));
+		   krb5_data *);
 void	load_database
-	PROTOTYPE((krb5_context,
+	(krb5_context,
     		   char *,
-    		   char *));
+    		   char *);
 void	send_error
-	PROTOTYPE((krb5_context,
+	(krb5_context,
     		   int,
 		   krb5_error_code,
-    		   char	*));
+    		   char	*);
 void	recv_error
-	PROTOTYPE((krb5_context,
-    		   krb5_data *));
+	(krb5_context,
+    		   krb5_data *);
 
 static void usage()
 {
diff --git a/src/tests/asn.1/ChangeLog b/src/tests/asn.1/ChangeLog
index 79f7c6c..5c8f449 100644
--- a/src/tests/asn.1/ChangeLog
+++ b/src/tests/asn.1/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* ktest.h, ktest_equal.h, utility.c, utility.h: Make prototypes
+	unconditional.
+
 2001-07-06  Ezra Peisach  <epeisach@mit.edu>
 
 	* trval.c: Include string.h for strcmp prototype.
diff --git a/src/tests/asn.1/ktest.h b/src/tests/asn.1/ktest.h
index f1db33d..59e8704 100644
--- a/src/tests/asn.1/ktest.h
+++ b/src/tests/asn.1/ktest.h
@@ -10,138 +10,138 @@
 #define SAMPLE_FLAGS 0xFEDCBA98
 #define SAMPLE_ERROR 0x3C;
 krb5_error_code ktest_make_sample_data
-	KRB5_PROTOTYPE((krb5_data *d));
+	(krb5_data *d);
 krb5_error_code ktest_make_sample_authenticator
-	KRB5_PROTOTYPE((krb5_authenticator *a));
+	(krb5_authenticator *a);
   krb5_error_code ktest_make_sample_principal
-	KRB5_PROTOTYPE((krb5_principal *p));
+	(krb5_principal *p);
   krb5_error_code ktest_make_sample_checksum
-	KRB5_PROTOTYPE((krb5_checksum *cs));
+	(krb5_checksum *cs);
   krb5_error_code ktest_make_sample_keyblock
-	KRB5_PROTOTYPE((krb5_keyblock *kb));
+	(krb5_keyblock *kb);
 krb5_error_code ktest_make_sample_ticket
-	KRB5_PROTOTYPE((krb5_ticket *tkt));
+	(krb5_ticket *tkt);
   krb5_error_code ktest_make_sample_enc_data
-	KRB5_PROTOTYPE((krb5_enc_data *ed));
+	(krb5_enc_data *ed);
 krb5_error_code ktest_make_sample_enc_tkt_part
-	KRB5_PROTOTYPE((krb5_enc_tkt_part *etp));
+	(krb5_enc_tkt_part *etp);
   krb5_error_code ktest_make_sample_transited
-	KRB5_PROTOTYPE((krb5_transited *t));
+	(krb5_transited *t);
   krb5_error_code ktest_make_sample_ticket_times
-	KRB5_PROTOTYPE((krb5_ticket_times *tt));
+	(krb5_ticket_times *tt);
   krb5_error_code ktest_make_sample_addresses
-	KRB5_PROTOTYPE((krb5_address ***caddrs));
+	(krb5_address ***caddrs);
   krb5_error_code ktest_make_sample_address
-	KRB5_PROTOTYPE((krb5_address *a));
+	(krb5_address *a);
   krb5_error_code ktest_make_sample_authorization_data
-	KRB5_PROTOTYPE((krb5_authdata ***ad));
+	(krb5_authdata ***ad);
   krb5_error_code ktest_make_sample_authdata
-	KRB5_PROTOTYPE((krb5_authdata *ad));
+	(krb5_authdata *ad);
 krb5_error_code ktest_make_sample_enc_kdc_rep_part
-	KRB5_PROTOTYPE((krb5_enc_kdc_rep_part *ekr));
+	(krb5_enc_kdc_rep_part *ekr);
 krb5_error_code ktest_make_sample_kdc_req
-	KRB5_PROTOTYPE((krb5_kdc_req *kr));
+	(krb5_kdc_req *kr);
 
   krb5_error_code ktest_make_sample_last_req
-	KRB5_PROTOTYPE((krb5_last_req_entry ***lr));
+	(krb5_last_req_entry ***lr);
   krb5_error_code ktest_make_sample_last_req_entry
-	KRB5_PROTOTYPE((krb5_last_req_entry **lre));
+	(krb5_last_req_entry **lre);
 krb5_error_code ktest_make_sample_kdc_rep
-	KRB5_PROTOTYPE((krb5_kdc_rep *kdcr));
+	(krb5_kdc_rep *kdcr);
   krb5_error_code ktest_make_sample_pa_data_array
-	KRB5_PROTOTYPE((krb5_pa_data ***pad));
+	(krb5_pa_data ***pad);
   krb5_error_code ktest_make_sample_empty_pa_data_array
-	KRB5_PROTOTYPE((krb5_pa_data ***pad));
+	(krb5_pa_data ***pad);
   krb5_error_code ktest_make_sample_pa_data
-	KRB5_PROTOTYPE((krb5_pa_data *pad));
+	(krb5_pa_data *pad);
 krb5_error_code ktest_make_sample_ap_req
-	KRB5_PROTOTYPE((krb5_ap_req *ar));
+	(krb5_ap_req *ar);
 krb5_error_code ktest_make_sample_ap_rep
-	KRB5_PROTOTYPE((krb5_ap_rep *ar));
+	(krb5_ap_rep *ar);
 krb5_error_code ktest_make_sample_ap_rep_enc_part
-	KRB5_PROTOTYPE((krb5_ap_rep_enc_part *arep));
+	(krb5_ap_rep_enc_part *arep);
 krb5_error_code ktest_make_sample_kdc_req_body
-	KRB5_PROTOTYPE((krb5_kdc_req *krb));
+	(krb5_kdc_req *krb);
 krb5_error_code ktest_make_sample_safe
-	KRB5_PROTOTYPE((krb5_safe *s));
+	(krb5_safe *s);
 krb5_error_code ktest_make_sample_priv
-	KRB5_PROTOTYPE((krb5_priv *p));
+	(krb5_priv *p);
 krb5_error_code ktest_make_sample_priv_enc_part
-	KRB5_PROTOTYPE((krb5_priv_enc_part *pep));
+	(krb5_priv_enc_part *pep);
 krb5_error_code ktest_make_sample_cred
-	KRB5_PROTOTYPE((krb5_cred *c));
+	(krb5_cred *c);
 krb5_error_code ktest_make_sample_cred_enc_part
-	KRB5_PROTOTYPE((krb5_cred_enc_part *cep));
+	(krb5_cred_enc_part *cep);
   krb5_error_code ktest_make_sample_sequence_of_ticket
-	KRB5_PROTOTYPE((krb5_ticket ***sot));
+	(krb5_ticket ***sot);
 krb5_error_code ktest_make_sample_error
-	KRB5_PROTOTYPE((krb5_error *kerr));
+	(krb5_error *kerr);
 krb5_error_code ktest_make_sequence_of_cred_info
-	KRB5_PROTOTYPE((krb5_cred_info ***soci));
+	(krb5_cred_info ***soci);
   krb5_error_code ktest_make_sample_cred_info
-	KRB5_PROTOTYPE((krb5_cred_info *ci));
+	(krb5_cred_info *ci);
 krb5_error_code ktest_make_sample_passwd_phrase_element
-	KRB5_PROTOTYPE((passwd_phrase_element *ppe));
+	(passwd_phrase_element *ppe);
 krb5_error_code ktest_make_sample_krb5_pwd_data
-	KRB5_PROTOTYPE((krb5_pwd_data *pd));
+	(krb5_pwd_data *pd);
 krb5_error_code ktest_make_sample_alt_method
-	KRB5_PROTOTYPE((krb5_alt_method *am));
+	(krb5_alt_method *am);
 
 krb5_error_code ktest_make_sample_etype_info
-    KRB5_PROTOTYPE((krb5_etype_info_entry *** p));
+    (krb5_etype_info_entry *** p);
 krb5_error_code ktest_make_sample_pa_enc_ts
-	KRB5_PROTOTYPE((krb5_pa_enc_ts *am));
+	(krb5_pa_enc_ts *am);
 krb5_error_code ktest_make_sample_sam_challenge
-	KRB5_PROTOTYPE((krb5_sam_challenge * p));
+	(krb5_sam_challenge * p);
 krb5_error_code ktest_make_sample_sam_response
-	KRB5_PROTOTYPE((krb5_sam_response * p));
+	(krb5_sam_response * p);
 
 /*----------------------------------------------------------------------*/
 
 void ktest_empty_authorization_data
-	KRB5_PROTOTYPE((krb5_authdata **ad));
+	(krb5_authdata **ad);
 void ktest_destroy_authorization_data
-	KRB5_PROTOTYPE((krb5_authdata ***ad));
+	(krb5_authdata ***ad);
   void ktest_destroy_authorization_data
-	KRB5_PROTOTYPE((krb5_authdata ***ad));
+	(krb5_authdata ***ad);
 void ktest_empty_addresses
-	KRB5_PROTOTYPE((krb5_address **a));
+	(krb5_address **a);
 void ktest_destroy_addresses
-	KRB5_PROTOTYPE((krb5_address ***a));
+	(krb5_address ***a);
   void ktest_destroy_address
-	KRB5_PROTOTYPE((krb5_address **a));
+	(krb5_address **a);
 void ktest_empty_pa_data_array
-	KRB5_PROTOTYPE((krb5_pa_data **pad));
+	(krb5_pa_data **pad);
 void ktest_destroy_pa_data_array
-	KRB5_PROTOTYPE((krb5_pa_data ***pad));
+	(krb5_pa_data ***pad);
   void ktest_destroy_pa_data
-	KRB5_PROTOTYPE((krb5_pa_data **pad));
+	(krb5_pa_data **pad);
 
 void ktest_destroy_data
-	KRB5_PROTOTYPE((krb5_data **d));
+	(krb5_data **d);
 void ktest_empty_data
-	KRB5_PROTOTYPE((krb5_data *d));
+	(krb5_data *d);
 void ktest_destroy_principal
-	KRB5_PROTOTYPE((krb5_principal *p));
+	(krb5_principal *p);
 void ktest_destroy_checksum
-	KRB5_PROTOTYPE((krb5_checksum **cs));
+	(krb5_checksum **cs);
 void ktest_destroy_keyblock
-	KRB5_PROTOTYPE((krb5_keyblock **kb));
+	(krb5_keyblock **kb);
 void ktest_destroy_authdata
-	KRB5_PROTOTYPE((krb5_authdata **ad));
+	(krb5_authdata **ad);
 void ktest_destroy_sequence_of_integer
-	KRB5_PROTOTYPE((long **soi));
+	(long **soi);
 void ktest_destroy_sequence_of_ticket
-	KRB5_PROTOTYPE((krb5_ticket ***sot));
+	(krb5_ticket ***sot);
   void ktest_destroy_ticket
-	KRB5_PROTOTYPE((krb5_ticket **tkt));
+	(krb5_ticket **tkt);
 void ktest_destroy_enc_data
-	KRB5_PROTOTYPE((krb5_enc_data *ed));
+	(krb5_enc_data *ed);
 
 void ktest_destroy_etype_info_entry
-	KRB5_PROTOTYPE((krb5_etype_info_entry *i));
+	(krb5_etype_info_entry *i);
 void ktest_destroy_etype_info
-	KRB5_PROTOTYPE((krb5_etype_info_entry **info));
+	(krb5_etype_info_entry **info);
 
 extern krb5_context test_context;
 extern char *sample_principal_name;
diff --git a/src/tests/asn.1/ktest_equal.h b/src/tests/asn.1/ktest_equal.h
index aa150f2..d45cf51 100644
--- a/src/tests/asn.1/ktest_equal.h
+++ b/src/tests/asn.1/ktest_equal.h
@@ -10,12 +10,12 @@
 	    Returns false (zero) if ref and var differ. */
 
 #define generic(funcname,type)\
-int funcname KRB5_PROTOTYPE((type *ref, type *var))
+int funcname (type *ref, type *var)
 
 #define len_array(funcname,type)\
-int funcname KRB5_PROTOTYPE((const int length, type *ref, type *var))
+int funcname (const int length, type *ref, type *var)
 #define len_unsigned_array(funcname,type)\
-int funcname KRB5_PROTOTYPE((const unsigned int length, type *ref, type *var))
+int funcname (const unsigned int length, type *ref, type *var)
 
 generic(ktest_equal_authenticator,krb5_authenticator);
 generic(ktest_equal_principal_data,krb5_principal_data);
@@ -61,33 +61,33 @@ generic(ktest_equal_sam_challenge,krb5_sam_challenge);
 generic(ktest_equal_sam_response,krb5_sam_response);
 
 int ktest_equal_last_req
-	KRB5_PROTOTYPE((krb5_last_req_entry **ref, krb5_last_req_entry **var));
+	(krb5_last_req_entry **ref, krb5_last_req_entry **var);
 int ktest_equal_sequence_of_ticket
-	KRB5_PROTOTYPE((krb5_ticket **ref, krb5_ticket **var));
+	(krb5_ticket **ref, krb5_ticket **var);
 int ktest_equal_sequence_of_pa_data
-	KRB5_PROTOTYPE((krb5_pa_data **ref, krb5_pa_data **var));
+	(krb5_pa_data **ref, krb5_pa_data **var);
 int ktest_equal_sequence_of_cred_info
-	KRB5_PROTOTYPE((krb5_cred_info **ref, krb5_cred_info **var));
+	(krb5_cred_info **ref, krb5_cred_info **var);
 
 len_array(ktest_equal_array_of_enctype,krb5_enctype);
 len_array(ktest_equal_array_of_data,krb5_data);
 len_unsigned_array(ktest_equal_array_of_octet,krb5_octet);
 
 int ktest_equal_array_of_passwd_phrase_element
-	KRB5_PROTOTYPE((passwd_phrase_element **ref, passwd_phrase_element **var));
+	(passwd_phrase_element **ref, passwd_phrase_element **var);
 int ktest_equal_authorization_data
-	KRB5_PROTOTYPE((krb5_authdata **ref, krb5_authdata **var));
+	(krb5_authdata **ref, krb5_authdata **var);
 int ktest_equal_addresses
-	KRB5_PROTOTYPE((krb5_address **ref, krb5_address **var));
+	(krb5_address **ref, krb5_address **var);
 int ktest_equal_array_of_char
-	KRB5_PROTOTYPE((const unsigned int length, char *ref, char *var));
+	(const unsigned int length, char *ref, char *var);
 
 int ktest_equal_etype_info
-    KRB5_PROTOTYPE((krb5_etype_info_entry ** ref,
-		    krb5_etype_info_entry ** var));
+    (krb5_etype_info_entry ** ref,
+		    krb5_etype_info_entry ** var);
 
 int ktest_equal_krb5_etype_info_entry
-    KRB5_PROTOTYPE((krb5_etype_info_entry * ref,
-		    krb5_etype_info_entry * var));
+    (krb5_etype_info_entry * ref,
+		    krb5_etype_info_entry * var);
 
 #endif
diff --git a/src/tests/asn.1/utility.c b/src/tests/asn.1/utility.c
index f2dda9e..07addc4 100644
--- a/src/tests/asn.1/utility.c
+++ b/src/tests/asn.1/utility.c
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-char hexchar PROTOTYPE((const unsigned int digit));
+char hexchar (const unsigned int digit);
 
 asn1_error_code asn1_krb5_data_unparse(code, s)
      const krb5_data * code;
diff --git a/src/tests/asn.1/utility.h b/src/tests/asn.1/utility.h
index 0fda2c0..fa79258 100644
--- a/src/tests/asn.1/utility.h
+++ b/src/tests/asn.1/utility.h
@@ -6,7 +6,7 @@
 #include "asn1buf.h"
 
 asn1_error_code asn1_krb5_data_unparse
-	PROTOTYPE((const krb5_data *code, char **s));
+	(const krb5_data *code, char **s);
 /* modifies  *s;
    effects   Instantiates *s with a string representation of the series
 	      of hex octets in *code.  (e.g. "02 02 00 7F")  If code==NULL,
@@ -17,16 +17,16 @@ asn1_error_code asn1_krb5_data_unparse
 	     Returns ENOMEM or the string rep cannot be created. */
 
 krb5_error_code krb5_data_parse
-	PROTOTYPE((krb5_data *d, const char *s));
+	(krb5_data *d, const char *s);
 /* effects  Parses character string *s into krb5_data *d. */
 
 krb5_error_code krb5_data_hex_parse
-	PROTOTYPE((krb5_data *d, const char *s));
+	(krb5_data *d, const char *s);
 /* requires  *s is the string representation of a sequence of
               hexadecimal octets.  (e.g. "02 01 00")
    effects  Parses *s into krb5_data *d. */
 
 void asn1buf_print
-	PROTOTYPE((const asn1buf *buf));
+	(const asn1buf *buf);
 
 #endif
diff --git a/src/tests/create/ChangeLog b/src/tests/create/ChangeLog
index b6910af..e8817cb 100644
--- a/src/tests/create/ChangeLog
+++ b/src/tests/create/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* kdb5_mkdums.c: Make prototypes unconditional.
+
 2000-07-28  Ezra Peisach  <epeisach@engrailed.mit.edu>
 
 	* kdb5_mkdums.c: Remove unused quit().
diff --git a/src/tests/create/kdb5_mkdums.c b/src/tests/create/kdb5_mkdums.c
index c20b7cc..50f2c9b 100644
--- a/src/tests/create/kdb5_mkdums.c
+++ b/src/tests/create/kdb5_mkdums.c
@@ -50,7 +50,7 @@ struct mblock {
     1
 };
 
-int set_dbname_help PROTOTYPE((char *, char *));
+int set_dbname_help (char *, char *);
 
 static void
 usage(who, status)
@@ -77,7 +77,7 @@ static char *mkey_name = 0;
 static char *mkey_password = 0;
 static krb5_boolean manual_mkey = FALSE;
 
-void add_princ PROTOTYPE((krb5_context, char *));
+void add_princ (krb5_context, char *);
 
 int
 main(argc, argv)
diff --git a/src/tests/gssapi/ChangeLog b/src/tests/gssapi/ChangeLog
index 178dd73..84872da 100644
--- a/src/tests/gssapi/ChangeLog
+++ b/src/tests/gssapi/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* t_imp_name.c: Make prototypes unconditional.
+
 2001-09-01  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (SRCS): Use srcdir.
diff --git a/src/tests/gssapi/t_imp_name.c b/src/tests/gssapi/t_imp_name.c
index 6c90b72..f4ca413 100644
--- a/src/tests/gssapi/t_imp_name.c
+++ b/src/tests/gssapi/t_imp_name.c
@@ -34,10 +34,10 @@
 #include <gssapi/gssapi_generic.h>
 
 #define GSSAPI_V2
-void display_status PROTOTYPE((char *, OM_uint32, OM_uint32));
-static void display_status_1 PROTOTYPE((char *, OM_uint32, int));
-static void display_buffer PROTOTYPE((gss_buffer_desc));
-static int test_import_name PROTOTYPE((char *));
+void display_status (char *, OM_uint32, OM_uint32);
+static void display_status_1 (char *, OM_uint32, int);
+static void display_buffer (gss_buffer_desc);
+static int test_import_name (char *);
 
 FILE *display_file;
 
diff --git a/src/tests/hammer/ChangeLog b/src/tests/hammer/ChangeLog
index d5f83cc..86dff00 100644
--- a/src/tests/hammer/ChangeLog
+++ b/src/tests/hammer/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* kdb5_hammer.c: Make prototypes unconditional.
+
 2001-08-29  Ken Raeburn  <raeburn@mit.edu>
 
 	* kdc5_hammer.c (main): Initialize enctype at entry; eliminate
diff --git a/src/tests/hammer/kdc5_hammer.c b/src/tests/hammer/kdc5_hammer.c
index fa14fd9..4aa750a 100644
--- a/src/tests/hammer/kdc5_hammer.c
+++ b/src/tests/hammer/kdc5_hammer.c
@@ -59,19 +59,19 @@ krb5_data tgtname = {
 };
 
 int verify_cs_pair 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   char *,
 		   krb5_principal,
 		   char *,
 		   char *,
 		   int, int, int,
-		   krb5_ccache));
+		   krb5_ccache);
 
 int get_tgt 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   char *,
 		   krb5_principal *,
-		   krb5_ccache));
+		   krb5_ccache);
 
 static void
 usage(who, status)
diff --git a/src/tests/verify/ChangeLog b/src/tests/verify/ChangeLog
index 016ff12..c12b37d 100644
--- a/src/tests/verify/ChangeLog
+++ b/src/tests/verify/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* kdb5_verify.c: Make prototypes unconditional.
+
 2000-07-28  Ezra Peisach  <epeisach@mit.edu>
 
 	* kdb5_verify.c (check_princ): Compiler warning cleanup. Get rid
diff --git a/src/tests/verify/kdb5_verify.c b/src/tests/verify/kdb5_verify.c
index 291accb..f15abaa 100644
--- a/src/tests/verify/kdb5_verify.c
+++ b/src/tests/verify/kdb5_verify.c
@@ -49,7 +49,7 @@ struct mblock {
     0
 };
 
-int set_dbname_help PROTOTYPE((krb5_context, char *, char *));
+int set_dbname_help (krb5_context, char *, char *);
 
 static void
 usage(who, status)
@@ -78,7 +78,7 @@ static char *mkey_password = 0;
 static krb5_boolean manual_mkey = FALSE;
 
 
-int check_princ PROTOTYPE((krb5_context, char *));
+int check_princ (krb5_context, char *);
 
 int
 main(argc, argv)
diff --git a/src/util/dyn/ChangeLog b/src/util/dyn/ChangeLog
index f6f22c9..1ced115 100644
--- a/src/util/dyn/ChangeLog
+++ b/src/util/dyn/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* dyn.h, dynP.h: Make prototypes unconditional.  Don't define
+	P().
+
 2001-04-25  Ezra Peisach  <epeisach@mit.edu>
 
 	* test.c: Always include stdlib.h
diff --git a/src/util/dyn/dyn.h b/src/util/dyn/dyn.h
index 267d758..86cd0b2 100644
--- a/src/util/dyn/dyn.h
+++ b/src/util/dyn/dyn.h
@@ -36,28 +36,21 @@ typedef struct _DynObject {
 #define DYN_BADINDEX	-1002
 #define DYN_BADVALUE	-1003
      
-/* Function declarations */
-#if defined(__STDC__) || defined(__LCLINT__)
-#define P(args) args
-#else
-#define P(args) ()
-#endif /* __STDC__ */
-
-/*@null@*//*@only@*/ DynObject DynCreate P((int el_size, int inc));
-/*@null@*//*@only@*/ DynObject DynCopy P((DynObject obj));
-int DynDestroy P((/*@only@*/DynObject obj)), DynRelease P((DynObject obj));
-int DynAdd P((DynObject obj, void *el));
-int DynPut P((DynObject obj, void *el, int idx));
-int DynInsert P((DynObject obj, int idx, /*@observer@*/void *els, int num));
-int DynDelete P((DynObject obj, int idx));
-/*@dependent@*//*@null@*/ DynPtr DynGet P((DynObject obj, int num));
-/*@observer@*/ DynPtr DynArray P((DynObject obj));
-int DynDebug P((DynObject obj, int state));
-int DynParanoid P((DynObject obj, int state));
-int DynInitzero P((DynObject obj, int state));
-int DynSize P((DynObject obj));
-int DynCapacity P((DynObject obj));
-int DynAppend P((DynObject obj, DynPtr els, int num));
+/*@null@*//*@only@*/ DynObject DynCreate (int el_size, int inc);
+/*@null@*//*@only@*/ DynObject DynCopy (DynObject obj);
+int DynDestroy (/*@only@*/DynObject obj), DynRelease (DynObject obj);
+int DynAdd (DynObject obj, void *el);
+int DynPut (DynObject obj, void *el, int idx);
+int DynInsert (DynObject obj, int idx, /*@observer@*/void *els, int num);
+int DynDelete (DynObject obj, int idx);
+/*@dependent@*//*@null@*/ DynPtr DynGet (DynObject obj, int num);
+/*@observer@*/ DynPtr DynArray (DynObject obj);
+int DynDebug (DynObject obj, int state);
+int DynParanoid (DynObject obj, int state);
+int DynInitzero (DynObject obj, int state);
+int DynSize (DynObject obj);
+int DynCapacity (DynObject obj);
+int DynAppend (DynObject obj, DynPtr els, int num);
 
 #undef P
 
diff --git a/src/util/dyn/dynP.h b/src/util/dyn/dynP.h
index 6cc6e58..bd86637 100644
--- a/src/util/dyn/dynP.h
+++ b/src/util/dyn/dynP.h
@@ -37,16 +37,9 @@
 
 typedef struct _DynObject DynObjectRecP, *DynObjectP;
 
-/* Function declarations */
-#ifdef __STDC__
-#define P(args) args
-#else
-#define P(args) ()
-#endif /* __STDC__ */
-
 /* Internal functions */
-int _DynRealloc P((DynObjectP obj, int req)), 
-  _DynResize P((DynObjectP obj, int req));
+int _DynRealloc (DynObjectP obj, int req), 
+  _DynResize (DynObjectP obj, int req);
 
 #undef P
 
diff --git a/src/util/profile/ChangeLog b/src/util/profile/ChangeLog
index 25a73a8..8108968 100644
--- a/src/util/profile/ChangeLog
+++ b/src/util/profile/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* prof_int.h, profile.hin, test_parse.c: Make prototypes
+	unconditional.  Don't define PROTOTYPE.
+
 2001-10-05  Ken Raeburn  <raeburn@mit.edu>
 
 	* profile.hin (KRB5_EXPORTVAR): Don't define.
diff --git a/src/util/profile/prof_int.h b/src/util/profile/prof_int.h
index 3d24f23..3f120a7 100644
--- a/src/util/profile/prof_int.h
+++ b/src/util/profile/prof_int.h
@@ -7,12 +7,6 @@
 #include "prof_err.h"
 #include "profile.h"
 
-#if defined(__STDC__) || defined(_WIN32)
-#define PROTOTYPE(x) x
-#else
-#define PROTOTYPE(x) ()
-#endif
-
 #if defined(_WIN32)
 #define SIZEOF_INT      4
 #define SIZEOF_SHORT    2
@@ -81,120 +75,120 @@ struct _profile_t {
 /* profile_parse.c */
 
 errcode_t profile_parse_file
-	PROTOTYPE((FILE *f, struct profile_node **root));
+	(FILE *f, struct profile_node **root);
 
 errcode_t profile_write_tree_file
-	PROTOTYPE((struct profile_node *root, FILE *dstfile));
+	(struct profile_node *root, FILE *dstfile);
 
 
 /* prof_tree.c */
 
 void profile_free_node
-	PROTOTYPE((struct profile_node *relation));
+	(struct profile_node *relation);
 
 errcode_t profile_create_node
-	PROTOTYPE((const char *name, const char *value,
-		   struct profile_node **ret_node));
+	(const char *name, const char *value,
+		   struct profile_node **ret_node);
 
 errcode_t profile_verify_node
-	PROTOTYPE((struct profile_node *node));
+	(struct profile_node *node);
 
 errcode_t profile_add_node
-	PROTOTYPE ((struct profile_node *section,
+	(struct profile_node *section,
 		    const char *name, const char *value,
-		    struct profile_node **ret_node));
+		    struct profile_node **ret_node);
 
 errcode_t profile_make_node_final
-	PROTOTYPE((struct profile_node *node));
+	(struct profile_node *node);
 	
 int profile_is_node_final
-	PROTOTYPE((struct profile_node *node));
+	(struct profile_node *node);
 
 const char *profile_get_node_name
-	PROTOTYPE((struct profile_node *node));
+	(struct profile_node *node);
 
 const char *profile_get_node_value
-	PROTOTYPE((struct profile_node *node));
+	(struct profile_node *node);
 
 errcode_t profile_find_node
-	PROTOTYPE ((struct profile_node *section,
+	(struct profile_node *section,
 		    const char *name, const char *value,
 		    int section_flag, void **state,
-		    struct profile_node **node));
+		    struct profile_node **node);
 
 errcode_t profile_find_node_relation
-	PROTOTYPE ((struct profile_node *section,
+	(struct profile_node *section,
 		    const char *name, void **state,
-		    char **ret_name, char **value));
+		    char **ret_name, char **value);
 
 errcode_t profile_find_node_subsection
-	PROTOTYPE ((struct profile_node *section,
+	(struct profile_node *section,
 		    const char *name, void **state,
-		    char **ret_name, struct profile_node **subsection));
+		    char **ret_name, struct profile_node **subsection);
 		   
 errcode_t profile_get_node_parent
-	PROTOTYPE ((struct profile_node *section,
-		   struct profile_node **parent));
+	(struct profile_node *section,
+		   struct profile_node **parent);
 		   
 errcode_t profile_delete_node_relation
-	PROTOTYPE ((struct profile_node *section, const char *name));
+	(struct profile_node *section, const char *name);
 
 errcode_t profile_find_node_name
-	PROTOTYPE ((struct profile_node *section, void **state,
-		    char **ret_name));
+	(struct profile_node *section, void **state,
+		    char **ret_name);
 
 errcode_t profile_node_iterator_create
-	PROTOTYPE((profile_t profile, const char *const *names,
-		   int flags, void **ret_iter));
+	(profile_t profile, const char *const *names,
+		   int flags, void **ret_iter);
 
 void profile_node_iterator_free
-	PROTOTYPE((void	**iter_p));
+	(void	**iter_p);
 
 errcode_t profile_node_iterator
-	PROTOTYPE((void	**iter_p, struct profile_node **ret_node,
-		   char **ret_name, char **ret_value));
+	(void	**iter_p, struct profile_node **ret_node,
+		   char **ret_name, char **ret_value);
 
 errcode_t profile_remove_node
-	PROTOTYPE((struct profile_node *node));
+	(struct profile_node *node);
 
 errcode_t profile_set_relation_value
-	PROTOTYPE((struct profile_node *node, const char *new_value));
+	(struct profile_node *node, const char *new_value);
 
 errcode_t profile_rename_node
-	PROTOTYPE((struct profile_node *node, const char *new_name));
+	(struct profile_node *node, const char *new_name);
 
 /* prof_file.c */
 
 errcode_t profile_open_file
-	PROTOTYPE ((const_profile_filespec_t file, prf_file_t *ret_prof));
+	(const_profile_filespec_t file, prf_file_t *ret_prof);
 
 errcode_t profile_update_file
-	PROTOTYPE ((prf_file_t profile));
+	(prf_file_t profile);
 
 errcode_t profile_flush_file
-	PROTOTYPE ((prf_file_t profile));
+	(prf_file_t profile);
 
 void profile_free_file
-	PROTOTYPE ((prf_file_t profile));
+	(prf_file_t profile);
 
 errcode_t profile_close_file
-	PROTOTYPE ((prf_file_t profile));
+	(prf_file_t profile);
 
 /* prof_init.c -- included from profile.h */
 errcode_t profile_ser_size
-        PROTOTYPE ((const char *, profile_t, size_t *));
+        (const char *, profile_t, size_t *);
 
 errcode_t profile_ser_externalize
-        PROTOTYPE ((const char *, profile_t, unsigned char **, size_t *));
+        (const char *, profile_t, unsigned char **, size_t *);
 
 errcode_t profile_ser_internalize
-        PROTOTYPE ((const char *, profile_t *, unsigned char **, size_t *));
+        (const char *, profile_t *, unsigned char **, size_t *);
 
 /* prof_get.c */
 
 errcode_t profile_get_value
-	PROTOTYPE ((profile_t profile, const char **names,
-		    const char	**ret_value));
+	(profile_t profile, const char **names,
+		    const char	**ret_value);
 /* Others included from profile.h */
 	
 /* prof_set.c -- included from profile.h */
diff --git a/src/util/profile/profile.hin b/src/util/profile/profile.hin
index 4186961..2f11524 100644
--- a/src/util/profile/profile.hin
+++ b/src/util/profile/profile.hin
@@ -16,14 +16,6 @@
 
 typedef struct _profile_t *profile_t;
 
-#if !defined(PROTOTYPE)
-#if defined(__STDC__) || defined(__cplusplus) || defined(_WIN32)
-#define PROTOTYPE(x) x
-#else
-#define PROTOTYPE(x) ()
-#endif
-#endif
-
 /*
  * Used by the profile iterator in prof_get.c
  */
@@ -61,72 +53,72 @@ typedef FSSpec* const_profile_filespec_list_t;
 #endif
 
 long KRB5_CALLCONV profile_init
-	PROTOTYPE ((const_profile_filespec_t *files, profile_t *ret_profile));
+	(const_profile_filespec_t *files, profile_t *ret_profile);
 
 long KRB5_CALLCONV profile_init_path
-	PROTOTYPE ((const_profile_filespec_list_t filelist, profile_t *ret_profile));
+	(const_profile_filespec_list_t filelist, profile_t *ret_profile);
 
 long KRB5_CALLCONV profile_flush
-	PROTOTYPE ((profile_t profile));
+	(profile_t profile);
 
 void KRB5_CALLCONV profile_abandon
-	PROTOTYPE ((profile_t profile));
+	(profile_t profile);
 
 void KRB5_CALLCONV profile_release
-	PROTOTYPE ((profile_t profile));
+	(profile_t profile);
 
 long KRB5_CALLCONV profile_get_values
-	PROTOTYPE ((profile_t profile, const char *const *names, char ***ret_values));
+	(profile_t profile, const char *const *names, char ***ret_values);
 
 void KRB5_CALLCONV profile_free_list
-	PROTOTYPE ((char **list));
+	(char **list);
 
 long KRB5_CALLCONV profile_get_string
-	PROTOTYPE((profile_t profile, const char *name, const char *subname, 
+	(profile_t profile, const char *name, const char *subname, 
 			const char *subsubname, const char *def_val,
-			char **ret_string));
+			char **ret_string);
 long KRB5_CALLCONV profile_get_integer
-	PROTOTYPE((profile_t profile, const char *name, const char *subname,
+	(profile_t profile, const char *name, const char *subname,
 			const char *subsubname, int def_val,
-			int *ret_default));
+			int *ret_default);
 
 long KRB5_CALLCONV profile_get_boolean
-	PROTOTYPE((profile_t profile, const char *name, const char *subname,
+	(profile_t profile, const char *name, const char *subname,
 			const char *subsubname, int def_val,
-			int *ret_default));
+			int *ret_default);
 
 long KRB5_CALLCONV profile_get_relation_names
-	PROTOTYPE((profile_t profile, const char **names, char ***ret_names));
+	(profile_t profile, const char **names, char ***ret_names);
 
 long KRB5_CALLCONV profile_get_subsection_names
-	PROTOTYPE((profile_t profile, const char **names, char ***ret_names));
+	(profile_t profile, const char **names, char ***ret_names);
 
 long KRB5_CALLCONV profile_iterator_create
-	PROTOTYPE((profile_t profile, const char **names,
-		   int flags, void **ret_iter));
+	(profile_t profile, const char **names,
+		   int flags, void **ret_iter);
 
 void KRB5_CALLCONV profile_iterator_free
-	PROTOTYPE((void **iter_p));
+	(void **iter_p);
 	
 long KRB5_CALLCONV profile_iterator
-	PROTOTYPE((void	**iter_p, char **ret_name, char **ret_value));
+	(void	**iter_p, char **ret_name, char **ret_value);
 
-void KRB5_CALLCONV profile_release_string PROTOTYPE((char *str));
+void KRB5_CALLCONV profile_release_string (char *str);
 
 long KRB5_CALLCONV profile_update_relation
-	PROTOTYPE((profile_t profile, const char **names, 
-		   const char *old_value, const char *new_value));
+	(profile_t profile, const char **names, 
+		   const char *old_value, const char *new_value);
 
 long KRB5_CALLCONV profile_clear_relation
-	PROTOTYPE((profile_t profile, const char **names));
+	(profile_t profile, const char **names);
 
 long KRB5_CALLCONV profile_rename_section
-	PROTOTYPE((profile_t profile, const char **names, 
-		   const char *new_name));
+	(profile_t profile, const char **names, 
+		   const char *new_name);
 
 long KRB5_CALLCONV profile_add_relation
-	PROTOTYPE((profile_t profile, const char **names, 
-		   const char *new_value));
+	(profile_t profile, const char **names, 
+		   const char *new_value);
 
 #ifdef __cplusplus
 }
diff --git a/src/util/profile/test_parse.c b/src/util/profile/test_parse.c
index 4386750..7aa0eeb 100644
--- a/src/util/profile/test_parse.c
+++ b/src/util/profile/test_parse.c
@@ -8,7 +8,7 @@
 
 #include "prof_int.h"
 
-void dump_profile PROTOTYPE((struct profile_node *root, int level));
+void dump_profile (struct profile_node *root, int level);
 
 int main(argc, argv)
 	int	argc;
diff --git a/src/util/ss/ChangeLog b/src/util/ss/ChangeLog
index 4ec085c..e0668c5 100644
--- a/src/util/ss/ChangeLog
+++ b/src/util/ss/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* mk_cmds.c, ss_internal.h: Make prototypes unconditional.
+	* ss_internal.h (PROTOTYPE, const, volatile): Delete.
+	(pointer): Always use void*.
+
 2001-09-01  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (SRCS): Don't include ss_err.h.
diff --git a/src/util/ss/mk_cmds.c b/src/util/ss/mk_cmds.c
index bba5edd..8e29ccf 100644
--- a/src/util/ss/mk_cmds.c
+++ b/src/util/ss/mk_cmds.c
@@ -19,7 +19,7 @@
 static const char copyright[] =
     "Copyright 1987 by MIT Student Information Processing Board";
 
-extern pointer malloc PROTOTYPE((unsigned));
+extern pointer malloc (unsigned);
 extern char *last_token;
 extern FILE *output_file;
 
diff --git a/src/util/ss/ss_internal.h b/src/util/ss/ss_internal.h
index 01a7197..f8d059d 100644
--- a/src/util/ss/ss_internal.h
+++ b/src/util/ss/ss_internal.h
@@ -13,20 +13,8 @@
 #include <stdlib.h>
 #endif
 
-#ifdef __STDC__
-
-#define PROTOTYPE(p) p
 typedef void * pointer;
 
-#else
-
-#define const
-#define volatile
-#define PROTOTYPE(p) ()
-typedef char * pointer;
-
-#endif /* not __STDC__ */
-
 #include "ss.h"
 
 #if defined(__GNUC__)
@@ -36,13 +24,13 @@ typedef char * pointer;
 #if defined(vax)
 #define LOCAL_ALLOC(x) alloca(x)
 #define LOCAL_FREE(x)
-extern pointer alloca PROTOTYPE((unsigned));
+extern pointer alloca (unsigned);
 #else
 #if defined(__HIGHC__)	/* Barf! */
 pragma on(alloca);
 #define LOCAL_ALLOC(x) alloca(x)
 #define LOCAL_FREE(x)
-extern pointer alloca PROTOTYPE((unsigned));
+extern pointer alloca (unsigned);
 #else
 /* no alloca? */
 #define LOCAL_ALLOC(x) malloc(x)
@@ -101,10 +89,10 @@ typedef struct _ss_data {	/* init values */
      (*code_ptr=0,ss_info(sci_idx)->current_request)
 void ss_unknown_function();
 void ss_delete_info_dir();
-char **ss_parse PROTOTYPE((int, char *, int *));
-ss_abbrev_info *ss_abbrev_initialize PROTOTYPE((char *, int *));
-void ss_page_stdin PROTOTYPE((void));
-int ss_pager_create PROTOTYPE((void));
+char **ss_parse (int, char *, int *);
+ss_abbrev_info *ss_abbrev_initialize (char *, int *);
+void ss_page_stdin (void);
+int ss_pager_create (void);
 void ss_self_identify __SS_PROTO;
 void ss_subsystem_name __SS_PROTO;
 void ss_subsystem_version __SS_PROTO;
@@ -114,9 +102,9 @@ extern ss_data **_ss_table;
 extern char *ss_et_msgs[];
 
 #ifndef HAVE_STDLIB_H
-extern pointer malloc PROTOTYPE((unsigned));
-extern pointer realloc PROTOTYPE((pointer, unsigned));
-extern pointer calloc PROTOTYPE((unsigned, unsigned));
+extern pointer malloc (unsigned);
+extern pointer realloc (pointer, unsigned);
+extern pointer calloc (unsigned, unsigned);
 #endif
 
 #if defined(USE_SIGPROCMASK) && !defined(POSIX_SIGNALS)
diff --git a/src/windows/wintel/ChangeLog b/src/windows/wintel/ChangeLog
index fda97b4..f1125bc 100644
--- a/src/windows/wintel/ChangeLog
+++ b/src/windows/wintel/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* enc_des.c, enc_des.h, encrypt.c, encrypt.h: Make prototypes
+	unconditional.  Don't define P().
+
 2001-10-05  Ken Raeburn  <raeburn@mit.edu>
 
 	* font.c, k5stream.c, k5stream.h, screen.c, screen.h, telnet.c,
diff --git a/src/windows/wintel/enc_des.c b/src/windows/wintel/enc_des.c
index fa1edc6..7bf72f4 100644
--- a/src/windows/wintel/enc_des.c
+++ b/src/windows/wintel/enc_des.c
@@ -104,14 +104,14 @@ struct keyidlist {
 
 extern kstream EncryptKSGlobalHack;
 
-void fb64_stream_iv P((Block, struct stinfo *));
-void fb64_init P((struct fb *));
-static int fb64_start P((struct fb *, int, int));
-int fb64_is P((unsigned char *, int, struct fb *));
-int fb64_reply P((unsigned char *, int, struct fb *));
-static void fb64_session P((Session_Key *, int, struct fb *));
-void fb64_stream_key P((Block, struct stinfo *));
-int fb64_keyid P((int, unsigned char *, int *, struct fb *));
+void fb64_stream_iv (Block, struct stinfo *);
+void fb64_init (struct fb *);
+static int fb64_start (struct fb *, int, int);
+int fb64_is (unsigned char *, int, struct fb *);
+int fb64_reply (unsigned char *, int, struct fb *);
+static void fb64_session (Session_Key *, int, struct fb *);
+void fb64_stream_key (Block, struct stinfo *);
+int fb64_keyid (int, unsigned char *, int *, struct fb *);
 
 	void
 cfb64_init(server)
diff --git a/src/windows/wintel/enc_des.h b/src/windows/wintel/enc_des.h
index dbfb99e..c4108eb 100644
--- a/src/windows/wintel/enc_des.h
+++ b/src/windows/wintel/enc_des.h
@@ -55,75 +55,67 @@
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
  */
-#if	!defined(P)
-#ifdef	__STDC__
-#define	P(x)	x
-#else
-#define	P(x)	()
-#endif
-#endif
-
 #ifdef	ENCRYPTION
-void encrypt_init P((char *, int));
-Encryptions *findencryption P((int));
-void encrypt_send_supprt P((void));
-void encrypt_auto P((int));
-void decrypt_auto P((int));
-void encrypt_is P((unsigned char *, int));
-void encrypt_reply P((unsigned char *, int));
-void encrypt_start_input P((int));
-void encrypt_session_key P((Session_Key *, int));
-void encrypt_end_input P((void));
-void encrypt_start_output P((int));
-void encrypt_end_output P((void));
-void encrypt_send_request_start P((void));
-void encrypt_send_request_end P((void));
-void encrypt_send_end P((void));
-void encrypt_wait P((void));
-int encrypt_is_encrypting P((void));
-void encrypt_send_support P((void));
-void encrypt_send_keyid P((int, unsigned char *, int, int));
-int net_write P((unsigned char *, int));
+void encrypt_init (char *, int);
+Encryptions *findencryption (int);
+void encrypt_send_supprt (void);
+void encrypt_auto (int);
+void decrypt_auto (int);
+void encrypt_is (unsigned char *, int);
+void encrypt_reply (unsigned char *, int);
+void encrypt_start_input (int);
+void encrypt_session_key (Session_Key *, int);
+void encrypt_end_input (void);
+void encrypt_start_output (int);
+void encrypt_end_output (void);
+void encrypt_send_request_start (void);
+void encrypt_send_request_end (void);
+void encrypt_send_end (void);
+void encrypt_wait (void);
+int encrypt_is_encrypting (void);
+void encrypt_send_support (void);
+void encrypt_send_keyid (int, unsigned char *, int, int);
+int net_write (unsigned char *, int);
 
 #ifdef	TELENTD
-void encrypt_wait P((void));
+void encrypt_wait (void);
 #else
-int encrypt_cmd P((int, char **));
-void encrypt_display P((void));
+int encrypt_cmd (int, char **);
+void encrypt_display (void);
 #endif
 
-void krbdes_encrypt P((unsigned char *, int));
-int krbdes_decrypt P((int));
-int krbdes_is P((unsigned char *, int));
-int krbdes_reply P((unsigned char *, int));
-void krbdes_init P((int));
-int krbdes_start P((int, int));
-void krbdes_session P((Session_Key *, int));
-void krbdes_printsub P((unsigned char *, int, unsigned char *, int));
+void krbdes_encrypt (unsigned char *, int);
+int krbdes_decrypt (int);
+int krbdes_is (unsigned char *, int);
+int krbdes_reply (unsigned char *, int);
+void krbdes_init (int);
+int krbdes_start (int, int);
+void krbdes_session (Session_Key *, int);
+void krbdes_printsub (unsigned char *, int, unsigned char *, int);
 
-void cfb64_encrypt P((unsigned char *, int));
-int cfb64_decrypt P((int));
-void cfb64_init P((int));
-int cfb64_start P((int, int));
-int cfb64_is P((unsigned char *, int));
-int cfb64_reply P((unsigned char *, int));
-void cfb64_session P((Session_Key *, int));
-int cfb64_keyid P((int, unsigned char *, int *));
-void cfb64_printsub P((unsigned char *, int, unsigned char *, int));
+void cfb64_encrypt (unsigned char *, int);
+int cfb64_decrypt (int);
+void cfb64_init (int);
+int cfb64_start (int, int);
+int cfb64_is (unsigned char *, int);
+int cfb64_reply (unsigned char *, int);
+void cfb64_session (Session_Key *, int);
+int cfb64_keyid (int, unsigned char *, int *);
+void cfb64_printsub (unsigned char *, int, unsigned char *, int);
 
-void ofb64_encrypt P((unsigned char *, int));
-int ofb64_decrypt P((int));
-void ofb64_init P((int));
-int ofb64_start P((int, int));
-int ofb64_is P((unsigned char *, int));
-int ofb64_reply P((unsigned char *, int));
-void ofb64_session P((Session_Key *, int));
-int ofb64_keyid P((int, unsigned char *, int *));
-void ofb64_printsub P((unsigned char *, int, unsigned char *, int));
+void ofb64_encrypt (unsigned char *, int);
+int ofb64_decrypt (int);
+void ofb64_init (int);
+int ofb64_start (int, int);
+int ofb64_is (unsigned char *, int);
+int ofb64_reply (unsigned char *, int);
+void ofb64_session (Session_Key *, int);
+int ofb64_keyid (int, unsigned char *, int *);
+void ofb64_printsub (unsigned char *, int, unsigned char *, int);
 
-int  des_new_random_key P((Block));
-void des_set_random_generator_seed P((Block));
-void des_key_sched P((Block, Schedule));
-void des_ecb_encrypt P((Block, Block, Schedule, int));
-int  des_string_to_key P((char *, Block));
+int  des_new_random_key (Block);
+void des_set_random_generator_seed (Block);
+void des_key_sched (Block, Schedule);
+void des_ecb_encrypt (Block, Block, Schedule, int);
+int  des_string_to_key (char *, Block);
 #endif	/* ENCRYPTION */
diff --git a/src/windows/wintel/encrypt.c b/src/windows/wintel/encrypt.c
index bbb5496..6d97ccd 100644
--- a/src/windows/wintel/encrypt.c
+++ b/src/windows/wintel/encrypt.c
@@ -86,8 +86,8 @@
  * These function pointers point to the current routines
  * for encrypting and decrypting data.
  */
-void	(*encrypt_output) P((unsigned char *, int));
-int	(*decrypt_input) P((int));
+void	(*encrypt_output) (unsigned char *, int);
+int	(*decrypt_input) (int);
 
 #ifdef DEBUG
 int encrypt_debug_mode = 1;
diff --git a/src/windows/wintel/encrypt.h b/src/windows/wintel/encrypt.h
index a0ae799..3d8a025 100644
--- a/src/windows/wintel/encrypt.h
+++ b/src/windows/wintel/encrypt.h
@@ -78,14 +78,6 @@ typedef	struct {
   unsigned char	*data;
 } Session_Key;
 
-#if !defined(P)
-#ifdef __STDC__
-#define P(x)	x
-#else
-#define P(x)	()
-#endif
-#endif
-
 #ifdef DEBUG
 int printsub(char, unsigned char *, size_t);
 #endif
@@ -95,90 +87,90 @@ void encrypt_parse(kstream, unsigned char *, int);
 typedef struct {
   char	*name;
   int	type;
-  void	(*output) P((unsigned char *, int));
-  int	(*input) P((int));
-  void	(*init) P((int));
-  int	(*start) P((int, int));
-  int	(*is) P((unsigned char *, int));
-  int	(*reply) P((unsigned char *, int));
-  void	(*session) P((Session_Key *, int));
-  int	(*keyid) P((int, unsigned char *, int *));
-  void	(*printsub) P((unsigned char *, int, unsigned char *, int));
+  void	(*output) (unsigned char *, int);
+  int	(*input) (int);
+  void	(*init) (int);
+  int	(*start) (int, int);
+  int	(*is) (unsigned char *, int);
+  int	(*reply) (unsigned char *, int);
+  void	(*session) (Session_Key *, int);
+  int	(*keyid) (int, unsigned char *, int *);
+  void	(*printsub) (unsigned char *, int, unsigned char *, int);
 } Encryptions;
 
 #define	SK_DES		1	/* Matched Kerberos v5 ENCTYPE_DES */
 
-void encrypt_init P((kstream, char *, int));
-Encryptions *findencryption P((int));
-void encrypt_send_supprt P((void));
-void encrypt_auto P((int));
-void decrypt_auto P((int));
-void encrypt_is P((unsigned char *, int));
-void encrypt_reply P((unsigned char *, int));
-void encrypt_start_input P((int));
-void encrypt_session_key P((Session_Key *, int));
-void encrypt_end_input P((void));
-void encrypt_start_output P((int));
-void encrypt_end_output P((void));
-void encrypt_send_request_start P((void));
-void encrypt_send_request_end P((void));
-void encrypt_send_end P((void));
-void encrypt_wait P((void));
-int encrypt_is_encrypting P((void));
-void encrypt_send_support P((void));
-void encrypt_send_keyid P((int, unsigned char *, int, int));
-int net_write P((unsigned char *, int));
-
-int encrypt_cmd P((int, char **));
-void encrypt_display P((void));
-
-void krbdes_encrypt P((unsigned char *, int));
-int krbdes_decrypt P((int));
-int krbdes_is P((unsigned char *, int));
-int krbdes_reply P((unsigned char *, int));
-void krbdes_init P((int));
-int krbdes_start P((int, int));
-void krbdes_session P((Session_Key *, int));
-void krbdes_printsub P((unsigned char *, int, unsigned char *, int));
-
-void cfb64_encrypt P((unsigned char *, int));
-int cfb64_decrypt P((int));
-void cfb64_init P((int));
-int cfb64_start P((int, int));
-int cfb64_is P((unsigned char *, int));
-int cfb64_reply P((unsigned char *, int));
-void cfb64_session P((Session_Key *, int));
-int cfb64_keyid P((int, unsigned char *, int *));
-void cfb64_printsub P((unsigned char *, int, unsigned char *, int));
-
-void ofb64_encrypt P((unsigned char *, int));
-int ofb64_decrypt P((int));
-void ofb64_init P((int));
-int ofb64_start P((int, int));
-int ofb64_is P((unsigned char *, int));
-int ofb64_reply P((unsigned char *, int));
-void ofb64_session P((Session_Key *, int));
-int ofb64_keyid P((int, unsigned char *, int *));
-void ofb64_printsub P((unsigned char *, int, unsigned char *, int));
+void encrypt_init (kstream, char *, int);
+Encryptions *findencryption (int);
+void encrypt_send_supprt (void);
+void encrypt_auto (int);
+void decrypt_auto (int);
+void encrypt_is (unsigned char *, int);
+void encrypt_reply (unsigned char *, int);
+void encrypt_start_input (int);
+void encrypt_session_key (Session_Key *, int);
+void encrypt_end_input (void);
+void encrypt_start_output (int);
+void encrypt_end_output (void);
+void encrypt_send_request_start (void);
+void encrypt_send_request_end (void);
+void encrypt_send_end (void);
+void encrypt_wait (void);
+int encrypt_is_encrypting (void);
+void encrypt_send_support (void);
+void encrypt_send_keyid (int, unsigned char *, int, int);
+int net_write (unsigned char *, int);
+
+int encrypt_cmd (int, char **);
+void encrypt_display (void);
+
+void krbdes_encrypt (unsigned char *, int);
+int krbdes_decrypt (int);
+int krbdes_is (unsigned char *, int);
+int krbdes_reply (unsigned char *, int);
+void krbdes_init (int);
+int krbdes_start (int, int);
+void krbdes_session (Session_Key *, int);
+void krbdes_printsub (unsigned char *, int, unsigned char *, int);
+
+void cfb64_encrypt (unsigned char *, int);
+int cfb64_decrypt (int);
+void cfb64_init (int);
+int cfb64_start (int, int);
+int cfb64_is (unsigned char *, int);
+int cfb64_reply (unsigned char *, int);
+void cfb64_session (Session_Key *, int);
+int cfb64_keyid (int, unsigned char *, int *);
+void cfb64_printsub (unsigned char *, int, unsigned char *, int);
+
+void ofb64_encrypt (unsigned char *, int);
+int ofb64_decrypt (int);
+void ofb64_init (int);
+int ofb64_start (int, int);
+int ofb64_is (unsigned char *, int);
+int ofb64_reply (unsigned char *, int);
+void ofb64_session (Session_Key *, int);
+int ofb64_keyid (int, unsigned char *, int *);
+void ofb64_printsub (unsigned char *, int, unsigned char *, int);
 
 int KRB5_CALLCONV
-	des_new_random_key P((Block));
+	des_new_random_key (Block);
 void KRB5_CALLCONV
-	des_set_random_generator_seed P((Block));
+	des_set_random_generator_seed (Block);
 void KRB5_CALLCONV
-	des_key_sched P((Block, Schedule));
+	des_key_sched (Block, Schedule);
 void KRB5_CALLCONV
-	des_ecb_encrypt P((Block, Block, Schedule, int));
+	des_ecb_encrypt (Block, Block, Schedule, int);
 
-/* int	des_string_to_key P((char *, Block)); */
+/* int	des_string_to_key (char *, Block); */
 
 
 #ifdef DEBUG
 extern int encrypt_debug_mode;
 #endif
 
-extern int (*decrypt_input) P((int));
-extern void (*encrypt_output) P((unsigned char *, int));
+extern int (*decrypt_input) (int);
+extern void (*encrypt_output) (unsigned char *, int);
 
 int decrypt_ks_hack(unsigned char *, int);