diff --git a/ChangeLog b/ChangeLog
index 4e886597b0..14c98e8494 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2015-10-20  Joseph Myers  <joseph@codesourcery.com>
+
+	* crypt/cert.c (main): Convert to prototype-style function
+	definition.
+	* io/pipe.c (__pipe): Likewise.
+	* io/pipe2.c (__pipe2): Likewise.
+	* misc/futimesat.c (futimesat): Likewise.
+	* misc/utimes.c (__utimes): Likewise.
+	* posix/execve.c (__execve): Likewise.
+	* posix/execvp.c (execvp): Likewise.
+	* posix/execvpe.c (__execvpe): Likewise.
+	* posix/fexecve.c (fexecve): Likewise.
+	* socket/socketpair.c (socketpair): Likewise.
+	* stdlib/drand48-iter.c (__drand48_iterate): Likewise.
+	* stdlib/erand48.c (erand48): Likewise.
+	* stdlib/erand48_r.c (__erand48_r): Likewise.
+	* stdlib/jrand48.c (jrand48): Likewise.
+	* stdlib/jrand48_r.c (__jrand48_r): Likewise.
+	* stdlib/lcong48.c (lcong48): Likewise.
+	* stdlib/lcong48_r.c (__lcong48_r): Likewise.
+	* stdlib/nrand48.c (nrand48): Likewise.
+	* stdlib/nrand48_r.c (__nrand48_r): Likewise.
+	* stdlib/seed48.c (seed48): Likewise.
+	* stdlib/seed48_r.c (__seed48_r): Likewise.
+	* sysdeps/mach/hurd/execve.c (__execve): Likewise.
+	* sysdeps/mach/hurd/utimes.c (__utimes): Likewise.
+	* sysdeps/unix/sysv/linux/fexecve.c (fexecve): Likewise.
+
 2015-10-19  Joseph Myers  <joseph@codesourcery.com>
 
 	* configure.ac (libc_cv_asm_unique_object): Remove configure test.
diff --git a/crypt/cert.c b/crypt/cert.c
index d651108860..80029e9078 100644
--- a/crypt/cert.c
+++ b/crypt/cert.c
@@ -30,9 +30,7 @@ good_bye (void)
 }
 
 int
-main(argc, argv)
-     int argc;
-     char *argv[];
+main (int argc, char *argv[])
 {
 	char key[64],plain[64],cipher[64],answer[64];
 	int i;
diff --git a/io/pipe.c b/io/pipe.c
index 8cc20f1ae0..0377ac1b18 100644
--- a/io/pipe.c
+++ b/io/pipe.c
@@ -24,8 +24,7 @@
    bytes written on PIPEDES[1] can be read from PIPEDES[0].
    Returns 0 if successful, -1 if not.  */
 int
-__pipe (__pipedes)
-     int __pipedes[2];
+__pipe (int __pipedes[2])
 {
   if (__pipedes == NULL)
     {
diff --git a/io/pipe2.c b/io/pipe2.c
index d06ed7af9f..cb7805c1de 100644
--- a/io/pipe2.c
+++ b/io/pipe2.c
@@ -24,9 +24,7 @@
    PIPEDES[1] can be read from PIPEDES[0].  Apply FLAGS to the new
    file descriptors.  Returns 0 if successful, -1 if not.  */
 int
-__pipe2 (pipedes, flags)
-     int pipedes[2];
-     int flags;
+__pipe2 (int pipedes[2], int flags)
 {
   if (pipedes == NULL)
     {
diff --git a/misc/futimesat.c b/misc/futimesat.c
index c675aa5ef1..118f6c6812 100644
--- a/misc/futimesat.c
+++ b/misc/futimesat.c
@@ -24,10 +24,7 @@
 /* Change the access time of FILE relative to FD to TVP[0] and
    the modification time of FILE to TVP[1].  */
 int
-futimesat (fd, file, tvp)
-     int fd;
-     const char *file;
-     const struct timeval tvp[2];
+futimesat (int fd, const char *file, const struct timeval tvp[2])
 {
   if (fd < 0
       && (file == NULL
diff --git a/misc/utimes.c b/misc/utimes.c
index 6b969e7b50..c8d6f58e8e 100644
--- a/misc/utimes.c
+++ b/misc/utimes.c
@@ -22,9 +22,7 @@
 /* Change the access time of FILE to TVP[0] and
    the modification time of FILE to TVP[1].  */
 int
-__utimes (file, tvp)
-     const char *file;
-     const struct timeval tvp[2];
+__utimes (const char *file, const struct timeval tvp[2])
 {
   if (file == NULL)
     {
diff --git a/posix/execve.c b/posix/execve.c
index 4f8adcf271..fcf5fa01ec 100644
--- a/posix/execve.c
+++ b/posix/execve.c
@@ -23,10 +23,7 @@
 /* Replace the current process, executing PATH with arguments ARGV and
    environment ENVP.  ARGV and ENVP are terminated by NULL pointers.  */
 int
-__execve (path, argv, envp)
-     const char *path;
-     char *const argv[];
-     char *const envp[];
+__execve (const char *path, char *const argv[], char *const envp[])
 {
   if (path == NULL || argv == NULL || envp == NULL)
     {
diff --git a/posix/execvp.c b/posix/execvp.c
index fa0313911b..586bfd513f 100644
--- a/posix/execvp.c
+++ b/posix/execvp.c
@@ -21,9 +21,7 @@
 /* Execute FILE, searching in the `PATH' environment variable if it contains
    no slashes, with arguments ARGV and environment from `environ'.  */
 int
-execvp (file, argv)
-     const char *file;
-     char *const argv[];
+execvp (const char *file, char *const argv[])
 {
   return __execvpe (file, argv, __environ);
 }
diff --git a/posix/execvpe.c b/posix/execvpe.c
index 5170e043d7..b51c107775 100644
--- a/posix/execvpe.c
+++ b/posix/execvpe.c
@@ -45,10 +45,7 @@ scripts_argv (const char *file, char *const argv[], int argc, char **new_argv)
 /* Execute FILE, searching in the `PATH' environment variable if it contains
    no slashes, with arguments ARGV and environment from ENVP.  */
 int
-__execvpe (file, argv, envp)
-     const char *file;
-     char *const argv[];
-     char *const envp[];
+__execvpe (const char *file, char *const argv[], char *const envp[])
 {
   if (*file == '\0')
     {
diff --git a/posix/fexecve.c b/posix/fexecve.c
index 95c8385bcd..a5505f458a 100644
--- a/posix/fexecve.c
+++ b/posix/fexecve.c
@@ -23,10 +23,7 @@
 /* Execute the file FD refers to, overlaying the running program image.
    ARGV and ENVP are passed to the new program, as for `execve'.  */
 int
-fexecve (fd, argv, envp)
-     int fd;
-     char *const argv[];
-     char *const envp[];
+fexecve (int fd, char *const argv[], char *const envp[])
 {
   if (fd < 0 || argv == NULL || envp == NULL)
     {
diff --git a/socket/socketpair.c b/socket/socketpair.c
index e0948f03bb..646c46b56b 100644
--- a/socket/socketpair.c
+++ b/socket/socketpair.c
@@ -23,11 +23,7 @@
    descriptors for them in FDS[0] and FDS[1].  If PROTOCOL is zero,
    one will be chosen automatically.  Returns 0 on success, -1 for errors.  */
 int
-socketpair (domain, type, protocol, fds)
-     int domain;
-     int type;
-     int protocol;
-     int fds[2];
+socketpair (int domain, int type, int protocol, int fds[2])
 {
   __set_errno (ENOSYS);
   return -1;
diff --git a/stdlib/drand48-iter.c b/stdlib/drand48-iter.c
index 8983776410..90ec1a1d3f 100644
--- a/stdlib/drand48-iter.c
+++ b/stdlib/drand48-iter.c
@@ -27,9 +27,7 @@ struct drand48_data __libc_drand48_data;
 
 
 int
-__drand48_iterate (xsubi, buffer)
-     unsigned short int xsubi[3];
-     struct drand48_data *buffer;
+__drand48_iterate (unsigned short int xsubi[3], struct drand48_data *buffer)
 {
   uint64_t X;
   uint64_t result;
diff --git a/stdlib/erand48.c b/stdlib/erand48.c
index 66af9036d9..5655c72d08 100644
--- a/stdlib/erand48.c
+++ b/stdlib/erand48.c
@@ -20,8 +20,7 @@
 
 
 double
-erand48 (xsubi)
-     unsigned short int xsubi[3];
+erand48 (unsigned short int xsubi[3])
 {
   double result;
 
diff --git a/stdlib/erand48_r.c b/stdlib/erand48_r.c
index ee554a5069..61ed85217e 100644
--- a/stdlib/erand48_r.c
+++ b/stdlib/erand48_r.c
@@ -22,10 +22,8 @@
 
 
 int
-__erand48_r (xsubi, buffer, result)
-     unsigned short int xsubi[3];
-     struct drand48_data *buffer;
-     double *result;
+__erand48_r (unsigned short int xsubi[3], struct drand48_data *buffer,
+	     double *result)
 {
   union ieee754_double temp;
 
diff --git a/stdlib/jrand48.c b/stdlib/jrand48.c
index 63683d75c4..d53224cff4 100644
--- a/stdlib/jrand48.c
+++ b/stdlib/jrand48.c
@@ -20,8 +20,7 @@
 
 
 long int
-jrand48 (xsubi)
-     unsigned short int xsubi[3];
+jrand48 (unsigned short int xsubi[3])
 {
   long int result;
 
diff --git a/stdlib/jrand48_r.c b/stdlib/jrand48_r.c
index 6dfd8aef49..2da4c52b80 100644
--- a/stdlib/jrand48_r.c
+++ b/stdlib/jrand48_r.c
@@ -19,10 +19,8 @@
 #include <stdlib.h>
 
 int
-__jrand48_r (xsubi, buffer, result)
-     unsigned short int xsubi[3];
-     struct drand48_data *buffer;
-     long int *result;
+__jrand48_r (unsigned short int xsubi[3], struct drand48_data *buffer,
+	     long int *result)
 {
   /* Compute next state.  */
   if (__drand48_iterate (xsubi, buffer) < 0)
diff --git a/stdlib/lcong48.c b/stdlib/lcong48.c
index 14d29704ac..be0f024305 100644
--- a/stdlib/lcong48.c
+++ b/stdlib/lcong48.c
@@ -20,8 +20,7 @@
 
 
 void
-lcong48 (param)
-     unsigned short int param[7];
+lcong48 (unsigned short int param[7])
 {
   (void) __lcong48_r (param, &__libc_drand48_data);
 }
diff --git a/stdlib/lcong48_r.c b/stdlib/lcong48_r.c
index 5accc08538..e3e82e833f 100644
--- a/stdlib/lcong48_r.c
+++ b/stdlib/lcong48_r.c
@@ -22,9 +22,7 @@
 #include <limits.h>
 
 int
-__lcong48_r (param, buffer)
-     unsigned short int param[7];
-     struct drand48_data *buffer;
+__lcong48_r (unsigned short int param[7], struct drand48_data *buffer)
 {
   /* Store the given values.  */
   memcpy (buffer->__x, &param[0], sizeof (buffer->__x));
diff --git a/stdlib/nrand48.c b/stdlib/nrand48.c
index a13b3ba643..e15f0c0e2e 100644
--- a/stdlib/nrand48.c
+++ b/stdlib/nrand48.c
@@ -20,8 +20,7 @@
 
 
 long int
-nrand48 (xsubi)
-     unsigned short int xsubi[3];
+nrand48 (unsigned short int xsubi[3])
 {
   long int result;
 
diff --git a/stdlib/nrand48_r.c b/stdlib/nrand48_r.c
index 3b1797f24e..ee4476bc94 100644
--- a/stdlib/nrand48_r.c
+++ b/stdlib/nrand48_r.c
@@ -19,10 +19,8 @@
 #include <stdlib.h>
 
 int
-__nrand48_r (xsubi, buffer, result)
-     unsigned short int xsubi[3];
-     struct drand48_data *buffer;
-     long int *result;
+__nrand48_r (unsigned short int xsubi[3], struct drand48_data *buffer,
+	     long int *result)
 {
   /* Compute next state.  */
   if (__drand48_iterate (xsubi, buffer) < 0)
diff --git a/stdlib/seed48.c b/stdlib/seed48.c
index 4e7f5b7e8a..e3923e3787 100644
--- a/stdlib/seed48.c
+++ b/stdlib/seed48.c
@@ -20,8 +20,7 @@
 
 
 unsigned short int *
-seed48 (seed16v)
-     unsigned short int seed16v[3];
+seed48 (unsigned short int seed16v[3])
 {
   (void) __seed48_r (seed16v, &__libc_drand48_data);
 
diff --git a/stdlib/seed48_r.c b/stdlib/seed48_r.c
index a07b501b03..3056169d71 100644
--- a/stdlib/seed48_r.c
+++ b/stdlib/seed48_r.c
@@ -21,9 +21,7 @@
 #include <limits.h>
 
 int
-__seed48_r (seed16v, buffer)
-     unsigned short int seed16v[3];
-     struct drand48_data *buffer;
+__seed48_r (unsigned short int seed16v[3], struct drand48_data *buffer)
 {
   /* Save old value at a private place to be used as return value.  */
   memcpy (buffer->__old_x, buffer->__x, sizeof (buffer->__x));
diff --git a/sysdeps/mach/hurd/execve.c b/sysdeps/mach/hurd/execve.c
index 00c91c3ee2..4e37cb65b1 100644
--- a/sysdeps/mach/hurd/execve.c
+++ b/sysdeps/mach/hurd/execve.c
@@ -22,10 +22,7 @@
 /* Replace the current process, executing FILE_NAME with arguments ARGV and
    environment ENVP.  ARGV and ENVP are terminated by NULL pointers.  */
 int
-__execve (file_name, argv, envp)
-     const char *file_name;
-     char *const argv[];
-     char *const envp[];
+__execve (const char *file_name, char *const argv[], char *const envp[])
 {
   error_t err;
   file_t file = __file_name_lookup (file_name, O_EXEC, 0);
diff --git a/sysdeps/mach/hurd/utimes.c b/sysdeps/mach/hurd/utimes.c
index e456aecbd4..a379d992b1 100644
--- a/sysdeps/mach/hurd/utimes.c
+++ b/sysdeps/mach/hurd/utimes.c
@@ -23,9 +23,7 @@
 /* Change the access time of FILE to TVP[0] and
    the modification time of FILE to TVP[1].  */
 int
-__utimes (file, tvp)
-     const char *file;
-     const struct timeval tvp[2];
+__utimes (const char *file, const struct timeval tvp[2])
 {
   union tv
   {
diff --git a/sysdeps/unix/sysv/linux/fexecve.c b/sysdeps/unix/sysv/linux/fexecve.c
index 7e028a52c1..0fbfac2964 100644
--- a/sysdeps/unix/sysv/linux/fexecve.c
+++ b/sysdeps/unix/sysv/linux/fexecve.c
@@ -25,10 +25,7 @@
 /* Execute the file FD refers to, overlaying the running program image.
    ARGV and ENVP are passed to the new program, as for `execve'.  */
 int
-fexecve (fd, argv, envp)
-     int fd;
-     char *const argv[];
-     char *const envp[];
+fexecve (int fd, char *const argv[], char *const envp[])
 {
   if (fd < 0 || argv == NULL || envp == NULL)
     {