# HG changeset patch
# User Paul Eggert <eggert@cs.ucla.edu>
# Date 1055915539 0
# Node ID c6450308f123808391f2880ee1506379077d6fb4
# Parent  ca90cd92b340ba0c7e17743aa5e1124ab5ca6ae2
Assume C89, so PARAMS isn't needed.

diff --git a/lib/ChangeLog b/lib/ChangeLog
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,18 @@
+2003-06-17  Paul Eggert  <eggert@twinsun.com>
+
+	Assume C89, so PARAMS isn't needed.
+	* backupfile.h (PARAMS): Remove.  All uses removed.
+	* closeout.h, dirname.h, filemode.h, fsusage.h, getdate.h, getline.h,
+	group-member.h, hard-locale.h, hash.h, linebuffer.h, long-options.h,
+	makepath.h, memcasecmp.h, memcoll.h, modechange.h, mountlist.h,
+	path-concat.h, physmem.h, posixtm.h, quote.h, readutmp.h, same.h,
+	save-cwd.h, savedir.h, stdio-safer.h, strtoimax.c, strverscmp.h,
+	unistd-safer.h, version-etc.h, xalloc.h, xreadlink.h, xstrtod.h,
+	xstrtol.h: Likewise.
+	* filemode.h, hard-locale.h, memcoll.h, modechange.h, physmem.h,
+	same.h, strverscmp.h: Do not include config.h; no longer needed.
+	Anyway, config.h should always be included before any other file.
+	
 2003-06-11  Simon Josefsson  <jas@extundo.com>
 
 	* sysexit_.h: New file.
diff --git a/lib/backupfile.c b/lib/backupfile.c
--- a/lib/backupfile.c
+++ b/lib/backupfile.c
@@ -111,8 +111,8 @@
    to numbered) backup file name. */
 const char *simple_backup_suffix = "~";
 
-static int max_backup_version PARAMS ((const char *, const char *));
-static int version_number PARAMS ((const char *, const char *, size_t));
+static int max_backup_version (const char *, const char *);
+static int version_number (const char *, const char *, size_t);
 
 /* Return the name of the new backup file for file FILE,
    allocated with malloc.  Return 0 if out of memory.
diff --git a/lib/backupfile.h b/lib/backupfile.h
--- a/lib/backupfile.h
+++ b/lib/backupfile.h
@@ -1,5 +1,7 @@
 /* backupfile.h -- declarations for making Emacs style backup file names
-   Copyright (C) 1990-1992, 1997-1999 Free Software Foundation, Inc.
+
+   Copyright (C) 1990, 1991, 1992, 1997, 1998, 1999, 2003 Free
+   Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -44,17 +46,9 @@
 
 extern char const *simple_backup_suffix;
 
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
-char *find_backup_file_name PARAMS ((char const *, enum backup_type));
-enum backup_type get_version PARAMS ((char const *context, char const *arg));
-enum backup_type xget_version PARAMS ((char const *context, char const *arg));
-void addext PARAMS ((char *, char const *, int));
+char *find_backup_file_name (char const *, enum backup_type);
+enum backup_type get_version (char const *context, char const *arg);
+enum backup_type xget_version (char const *context, char const *arg);
+void addext (char *, char const *, int);
 
 #endif /* ! BACKUPFILE_H_ */
diff --git a/lib/closeout.h b/lib/closeout.h
--- a/lib/closeout.h
+++ b/lib/closeout.h
@@ -1,17 +1,27 @@
+/* Close standard output.
+
+   Copyright (C) 1998, 2000, 2003 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
 #ifndef CLOSEOUT_H
 # define CLOSEOUT_H 1
 
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
-void close_stdout_set_status PARAMS ((int status));
-void close_stdout_set_file_name PARAMS ((const char *file));
-void close_stdout PARAMS ((void));
-void close_stdout_status PARAMS ((int status));
+void close_stdout_set_status (int status);
+void close_stdout_set_file_name (const char *file);
+void close_stdout (void);
+void close_stdout_status (int status);
 
 #endif
diff --git a/lib/dirname.h b/lib/dirname.h
--- a/lib/dirname.h
+++ b/lib/dirname.h
@@ -1,4 +1,6 @@
-/*  Copyright (C) 1998, 2001 Free Software Foundation, Inc.
+/*  Take file names apart into directory and base names.
+
+    Copyright (C) 1998, 2001, 2003 Free Software Foundation, Inc.
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,14 +21,6 @@
 
 # include <stddef.h>
 
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
 # ifndef DIRECTORY_SEPARATOR
 #  define DIRECTORY_SEPARATOR '/'
 # endif
@@ -39,11 +33,11 @@
 #  define FILESYSTEM_PREFIX_LEN(Filename) 0
 # endif
 
-char *base_name PARAMS ((char const *path));
-char *dir_name PARAMS ((char const *path));
-size_t base_len PARAMS ((char const *path));
-size_t dir_len PARAMS ((char const *path));
+char *base_name (char const *path);
+char *dir_name (char const *path);
+size_t base_len (char const *path);
+size_t dir_len (char const *path);
 
-int strip_trailing_slashes PARAMS ((char *path));
+int strip_trailing_slashes (char *path);
 
 #endif /* not DIRNAME_H_ */
diff --git a/lib/filemode.h b/lib/filemode.h
--- a/lib/filemode.h
+++ b/lib/filemode.h
@@ -1,19 +1,25 @@
-#ifndef FILEMODE_H_
+/* Make a string describing file modes.
+
+   Copyright (C) 1998, 1999, 2003 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
-# if HAVE_CONFIG_H
-#  include <config.h>
-# endif
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifndef FILEMODE_H_
 
 # include <sys/types.h>
 
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
-void mode_string PARAMS ((mode_t mode, char *str));
+void mode_string (mode_t mode, char *str);
 
 #endif
diff --git a/lib/fsusage.h b/lib/fsusage.h
--- a/lib/fsusage.h
+++ b/lib/fsusage.h
@@ -1,5 +1,6 @@
 /* fsusage.h -- declarations for filesystem space usage info
-   Copyright (C) 1991, 1992, 1997 Free Software Foundation, Inc.
+
+   Copyright (C) 1991, 1992, 1997, 2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -31,15 +32,6 @@
   uintmax_t fsu_ffree;		/* Free file nodes. */
 };
 
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
-int get_fs_usage PARAMS ((const char *path, const char *disk,
-			  struct fs_usage *fsp));
+int get_fs_usage (const char *path, const char *disk, struct fs_usage *fsp);
 
 #endif
diff --git a/lib/getdate.h b/lib/getdate.h
--- a/lib/getdate.h
+++ b/lib/getdate.h
@@ -1,4 +1,6 @@
-/*  Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc.
+/* Parse a string into an internal time stamp.
+
+   Copyright (C) 1995, 1997, 1998, 2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,14 +20,6 @@
 # include <config.h>
 #endif
 
-#ifndef PARAMS
-# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
-
 #ifdef vms
 # include <types.h>
 # include <time.h>
@@ -43,4 +37,4 @@
 # endif
 #endif /* defined (vms) */
 
-time_t get_date PARAMS ((const char *p, const time_t *now));
+time_t get_date (const char *p, const time_t *now);
diff --git a/lib/getline.h b/lib/getline.h
--- a/lib/getline.h
+++ b/lib/getline.h
@@ -1,4 +1,7 @@
-/*  Copyright (C) 1995, 1997, 1999, 2000-2002 Free Software Foundation, Inc.
+/* Replacement for GNU C library function getline
+
+   Copyright (C) 1995, 1997, 1999, 2000, 2001, 2002, 2003 Free
+   Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -20,22 +23,12 @@
 # include <stddef.h>
 # include <stdio.h>
 
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
 /* glibc2 has these functions declared in <stdio.h>.  Avoid redeclarations.  */
 # if __GLIBC__ < 2
 
-int
-getline PARAMS ((char **_lineptr, size_t *_n, FILE *_stream));
+int getline (char **_lineptr, size_t *_n, FILE *_stream);
 
-int
-getdelim PARAMS ((char **_lineptr, size_t *_n, int _delimiter, FILE *_stream));
+int getdelim (char **_lineptr, size_t *_n, int _delimiter, FILE *_stream);
 
 # endif
 
diff --git a/lib/group-member.h b/lib/group-member.h
--- a/lib/group-member.h
+++ b/lib/group-member.h
@@ -1,15 +1,24 @@
+/* Determine whether group id is in calling user's group list.
+
+   Copyright (C) 1994, 1997, 2003 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
 #ifndef GROUP_MEMBER_H_
 # define GROUP_MEMBER_H_ 1
 
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
-int
-  group_member PARAMS ((gid_t));
+int group_member (gid_t);
 
 #endif /* GROUP_MEMBER_H_ */
diff --git a/lib/hard-locale.h b/lib/hard-locale.h
--- a/lib/hard-locale.h
+++ b/lib/hard-locale.h
@@ -1,18 +1,24 @@
+/* Determine whether a locale is hard.
+
+   Copyright (C) 1999, 2003 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
 #ifndef HARD_LOCALE_H_
 # define HARD_LOCALE_H_ 1
 
-# if HAVE_CONFIG_H
-#  include <config.h>
-# endif
-
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
-int hard_locale PARAMS ((int));
+int hard_locale (int);
 
 #endif /* HARD_LOCALE_H_ */
diff --git a/lib/hash.h b/lib/hash.h
--- a/lib/hash.h
+++ b/lib/hash.h
@@ -1,5 +1,5 @@
 /* hash - hashing table processing.
-   Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2001, 2003 Free Software Foundation, Inc.
    Written by Jim Meyering <meyering@ascend.com>, 1998.
 
    This program is free software; you can redistribute it and/or modify
@@ -26,18 +26,10 @@
 
 # include <stdio.h>
 
-# ifndef PARAMS
-#  if PROTOTYPES || __STDC__
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
-typedef unsigned (*Hash_hasher) PARAMS ((const void *, unsigned));
-typedef bool (*Hash_comparator) PARAMS ((const void *, const void *));
-typedef void (*Hash_data_freer) PARAMS ((void *));
-typedef bool (*Hash_processor) PARAMS ((void *, void *));
+typedef unsigned (*Hash_hasher) (const void *, unsigned);
+typedef bool (*Hash_comparator) (const void *, const void *);
+typedef void (*Hash_data_freer) (void *);
+typedef bool (*Hash_processor) (void *, void *);
 
 struct hash_entry
   {
@@ -64,32 +56,32 @@
 typedef struct hash_table Hash_table;
 
 /* Information and lookup.  */
-unsigned hash_get_n_buckets PARAMS ((const Hash_table *));
-unsigned hash_get_n_buckets_used PARAMS ((const Hash_table *));
-unsigned hash_get_n_entries PARAMS ((const Hash_table *));
-unsigned hash_get_max_bucket_length PARAMS ((const Hash_table *));
-bool hash_table_ok PARAMS ((const Hash_table *));
-void hash_print_statistics PARAMS ((const Hash_table *, FILE *));
-void *hash_lookup PARAMS ((const Hash_table *, const void *));
+unsigned hash_get_n_buckets (const Hash_table *);
+unsigned hash_get_n_buckets_used (const Hash_table *);
+unsigned hash_get_n_entries (const Hash_table *);
+unsigned hash_get_max_bucket_length (const Hash_table *);
+bool hash_table_ok (const Hash_table *);
+void hash_print_statistics (const Hash_table *, FILE *);
+void *hash_lookup (const Hash_table *, const void *);
 
 /* Walking.  */
-void *hash_get_first PARAMS ((const Hash_table *));
-void *hash_get_next PARAMS ((const Hash_table *, const void *));
-unsigned hash_get_entries PARAMS ((const Hash_table *, void **, unsigned));
-unsigned hash_do_for_each PARAMS ((const Hash_table *, Hash_processor, void *));
+void *hash_get_first (const Hash_table *);
+void *hash_get_next (const Hash_table *, const void *);
+unsigned hash_get_entries (const Hash_table *, void **, unsigned);
+unsigned hash_do_for_each (const Hash_table *, Hash_processor, void *);
 
 /* Allocation and clean-up.  */
-unsigned hash_string PARAMS ((const char *, unsigned));
-void hash_reset_tuning PARAMS ((Hash_tuning *));
-Hash_table *hash_initialize PARAMS ((unsigned, const Hash_tuning *,
-				     Hash_hasher, Hash_comparator,
-				     Hash_data_freer));
-void hash_clear PARAMS ((Hash_table *));
-void hash_free PARAMS ((Hash_table *));
+unsigned hash_string (const char *, unsigned);
+void hash_reset_tuning (Hash_tuning *);
+Hash_table *hash_initialize (unsigned, const Hash_tuning *,
+			     Hash_hasher, Hash_comparator,
+			     Hash_data_freer);
+void hash_clear (Hash_table *);
+void hash_free (Hash_table *);
 
 /* Insertion and deletion.  */
-bool hash_rehash PARAMS ((Hash_table *, unsigned));
-void *hash_insert PARAMS ((Hash_table *, const void *));
-void *hash_delete PARAMS ((Hash_table *, const void *));
+bool hash_rehash (Hash_table *, unsigned);
+void *hash_insert (Hash_table *, const void *);
+void *hash_delete (Hash_table *, const void *);
 
 #endif
diff --git a/lib/linebuffer.h b/lib/linebuffer.h
--- a/lib/linebuffer.h
+++ b/lib/linebuffer.h
@@ -31,25 +31,16 @@
   char *buffer;
 };
 
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
 /* Initialize linebuffer LINEBUFFER for use. */
-void initbuffer PARAMS ((struct linebuffer *linebuffer));
+void initbuffer (struct linebuffer *linebuffer);
 
 /* Read an arbitrarily long line of text from STREAM into LINEBUFFER.
    Keep the newline; append a newline if it's the last line of a file
    that ends in a non-newline character.  Do not null terminate.
    Return LINEBUFFER, except at end of file return 0.  */
-struct linebuffer *readlinebuffer PARAMS ((struct linebuffer *linebuffer,
-					   FILE *stream));
+struct linebuffer *readlinebuffer (struct linebuffer *linebuffer, FILE *stream);
 
 /* Free linebuffer LINEBUFFER and its data, all allocated with malloc. */
-void freebuffer PARAMS ((struct linebuffer *));
+void freebuffer (struct linebuffer *);
 
 #endif /* LINEBUFFER_H */
diff --git a/lib/long-options.h b/lib/long-options.h
--- a/lib/long-options.h
+++ b/lib/long-options.h
@@ -1,5 +1,5 @@
 /* long-options.h -- declaration for --help- and --version-handling function.
-   Copyright (C) 1993, 1994, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1998, 1999, 2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,19 +17,10 @@
 
 /* Written by Jim Meyering.  */
 
-#ifndef PARAMS
-# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
-
-void
-  parse_long_options PARAMS ((int _argc,
-			      char **_argv,
-			      const char *_command_name,
-			      const char *_package,
-			      const char *_version,
-			      const char *_authors,
-			      void (*_usage) (int)));
+void parse_long_options (int _argc,
+			 char **_argv,
+			 const char *_command_name,
+			 const char *_package,
+			 const char *_version,
+			 const char *_authors,
+			 void (*_usage) (int));
diff --git a/lib/makepath.c b/lib/makepath.c
--- a/lib/makepath.c
+++ b/lib/makepath.c
@@ -1,5 +1,7 @@
 /* makepath.c -- Ensure that a directory path exists.
-   Copyright (C) 1990, 1997-1999, 2000, 2002-2003 Free Software Foundation, Inc.
+
+   Copyright (C) 1990, 1997, 1998, 1999, 2000, 2002, 2003 Free
+   Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -86,7 +88,6 @@
 
 #define WX_USR (S_IWUSR | S_IXUSR)
 
-/* Include this before libintl.h so we get our definition of PARAMS. */
 #include "makepath.h"
 
 #include "gettext.h"
diff --git a/lib/makepath.h b/lib/makepath.h
--- a/lib/makepath.h
+++ b/lib/makepath.h
@@ -1,22 +1,33 @@
-#ifndef PARAMS
-# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
+/* makepath.c -- Ensure that a directory path exists.
+
+   Copyright (C) 1994, 1995, 1996, 1997, 2000, 2003 Free Software
+   Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-int
-make_path PARAMS ((const char *_argpath,
-		   int _mode,
-		   int _parent_mode,
-		   uid_t _owner,
-		   gid_t _group,
-		   int _preserve_existing,
-		   const char *_verbose_fmt_string));
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Written by David MacKenzie <djm@gnu.ai.mit.edu> and Jim Meyering.  */
 
-int
-make_dir PARAMS ((const char *dir,
-		  const char *dirpath,
-		  mode_t mode,
-		  int *created_dir_p));
+int make_path (const char *_argpath,
+	       int _mode,
+	       int _parent_mode,
+	       uid_t _owner,
+	       gid_t _group,
+	       int _preserve_existing,
+	       const char *_verbose_fmt_string);
+
+int make_dir (const char *dir,
+	      const char *dirpath,
+	      mode_t mode,
+	      int *created_dir_p);
diff --git a/lib/memcasecmp.h b/lib/memcasecmp.h
--- a/lib/memcasecmp.h
+++ b/lib/memcasecmp.h
@@ -1,12 +1,23 @@
+/* Case-insensitive buffer comparator.
+
+   Copyright (C) 1996, 1998, 2003 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Written by Jim Meyering.  */
+
 #include <stddef.h>
 
-#ifndef PARAMS
-# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
-
-int
-  memcasecmp PARAMS ((const void *vs1, const void *vs2, size_t n));
+int memcasecmp (const void *vs1, const void *vs2, size_t n);
diff --git a/lib/memcoll.h b/lib/memcoll.h
--- a/lib/memcoll.h
+++ b/lib/memcoll.h
@@ -1,20 +1,28 @@
+/* Locale-specific memory comparison.
+
+   Copyright (C) 1999, 2003 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Contributed by Paul Eggert <eggert@twinsun.com>.  */
+
 #ifndef MEMCOLL_H_
 # define MEMCOLL_H_ 1
 
-# if HAVE_CONFIG_H
-#  include <config.h>
-# endif
-
 # include <stddef.h>
 
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
-int memcoll PARAMS ((char *, size_t, char *, size_t));
+int memcoll (char *, size_t, char *, size_t);
 
 #endif /* MEMCOLL_H_ */
diff --git a/lib/modechange.h b/lib/modechange.h
--- a/lib/modechange.h
+++ b/lib/modechange.h
@@ -1,5 +1,5 @@
 /* modechange.h -- definitions for file mode manipulation
-   Copyright (C) 1989, 1990, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1990, 1997, 2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,10 +20,6 @@
 #if ! defined MODECHANGE_H_
 # define MODECHANGE_H_
 
-# if HAVE_CONFIG_H
-#  include <config.h>
-# endif
-
 # include <sys/types.h>
 
 /* Affect the execute bits only if at least one execute bit is set already,
@@ -55,17 +51,9 @@
 # define MODE_MEMORY_EXHAUSTED (struct mode_change *) 1
 # define MODE_BAD_REFERENCE (struct mode_change *) 2
 
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
-struct mode_change *mode_compile PARAMS ((const char *, unsigned));
-struct mode_change *mode_create_from_ref PARAMS ((const char *));
-mode_t mode_adjust PARAMS ((mode_t, const struct mode_change *));
-void mode_free PARAMS ((struct mode_change *));
+struct mode_change *mode_compile (const char *, unsigned);
+struct mode_change *mode_create_from_ref (const char *);
+mode_t mode_adjust (mode_t, const struct mode_change *);
+void mode_free (struct mode_change *);
 
 #endif
diff --git a/lib/mountlist.h b/lib/mountlist.h
--- a/lib/mountlist.h
+++ b/lib/mountlist.h
@@ -1,5 +1,7 @@
 /* mountlist.h -- declarations for list of mounted filesystems
-   Copyright (C) 1991, 1992, 1998, 2000-2002 Free Software Foundation, Inc.
+
+   Copyright (C) 1991, 1992, 1998, 2000, 2001, 2002, 2003 Free
+   Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -27,15 +29,7 @@
   struct mount_entry *me_next;
 };
 
-#ifndef PARAMS
-# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
-
-struct mount_entry *read_filesystem_list PARAMS ((int need_fs_type));
+struct mount_entry *read_filesystem_list (int need_fs_type);
 
 #ifndef ME_DUMMY
 # define ME_DUMMY(Fs_name, Fs_type) \
diff --git a/lib/path-concat.h b/lib/path-concat.h
--- a/lib/path-concat.h
+++ b/lib/path-concat.h
@@ -1,15 +1,26 @@
+/* Concatenate two arbitrary pathnames.
+
+   Copyright (C) 1996, 1997, 2003 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Written by Jim Meyering.  */
+
 #if ! defined PATH_CONCAT_H_
 # define PATH_CONCAT_H_
 
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
-char *
-path_concat PARAMS ((const char *dir, const char *base, char **base_in_result));
+char *path_concat (const char *dir, const char *base, char **base_in_result);
 
 #endif
diff --git a/lib/physmem.h b/lib/physmem.h
--- a/lib/physmem.h
+++ b/lib/physmem.h
@@ -1,19 +1,27 @@
+/* Calculate the size of physical memory.
+
+   Copyright (C) 2000, 2003 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Written by Paul Eggert.  */
+
 #ifndef PHYSMEM_H_
 # define PHYSMEM_H_ 1
 
-# if HAVE_CONFIG_H
-#  include <config.h>
-# endif
-
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
-double physmem_total PARAMS ((void));
-double physmem_available PARAMS ((void));
+double physmem_total (void);
+double physmem_available (void);
 
 #endif /* PHYSMEM_H_ */
diff --git a/lib/posixtm.h b/lib/posixtm.h
--- a/lib/posixtm.h
+++ b/lib/posixtm.h
@@ -1,3 +1,24 @@
+/* Parse dates for touch and date.
+
+   Copyright (C) 1998, 2003 Free Software Foundation Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Yacc-based version written by Jim Kingdon and David MacKenzie.
+   Rewritten by Jim Meyering.  */
+
 #ifndef POSIXTM_H_
 # define POSIXTM_H_
 
@@ -7,15 +28,6 @@
 # define PDS_CENTURY 4
 # define PDS_SECONDS 8
 
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
-bool
-posixtime PARAMS ((time_t *p, const char *s, unsigned int syntax_bits));
+bool posixtime (time_t *p, const char *s, unsigned int syntax_bits);
 
 #endif
diff --git a/lib/quote.h b/lib/quote.h
--- a/lib/quote.h
+++ b/lib/quote.h
@@ -1,5 +1,7 @@
 /* quote.h - prototypes for quote.c
-   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+   Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software
+   Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,13 +18,5 @@
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 
-#ifndef PARAMS
-# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
-
-char const *quote_n PARAMS ((int n, char const *name));
-char const *quote PARAMS ((char const *name));
+char const *quote_n (int n, char const *name);
+char const *quote (char const *name);
diff --git a/lib/readutmp.h b/lib/readutmp.h
--- a/lib/readutmp.h
+++ b/lib/readutmp.h
@@ -1,5 +1,7 @@
 /* Declarations for GNU's read utmp module.
-   Copyright (C) 1992-2002 Free Software Foundation, Inc.
+
+   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+   2001, 2002, 2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,14 +22,6 @@
 #ifndef __READUTMP_H__
 # define __READUTMP_H__
 
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
 # include <sys/types.h>
 
 # ifdef HAVE_UTMPX_H
@@ -136,15 +130,7 @@
 #  define WTMP_FILE "/etc/wtmp"
 # endif
 
-# undef PARAMS
-# if defined (__STDC__) && __STDC__
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-
-extern char *extract_trimmed_name PARAMS ((const STRUCT_UTMP *ut));
-extern int read_utmp PARAMS ((const char *filename,
-			      int *n_entries, STRUCT_UTMP **utmp_buf));
+char *extract_trimmed_name (const STRUCT_UTMP *ut);
+int read_utmp (const char *filename, int *n_entries, STRUCT_UTMP **utmp_buf);
 
 #endif /* __READUTMP_H__ */
diff --git a/lib/same.h b/lib/same.h
--- a/lib/same.h
+++ b/lib/same.h
@@ -1,5 +1,7 @@
 /* Determine whether two file names refer to the same file.
-   Copyright (C) 1997-2000 Free Software Foundation, Inc.
+
+   Copyright (C) 1997, 1998, 1999, 2000, 2003 Free Software
+   Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,19 +20,6 @@
 #ifndef SAME_H_
 # define SAME_H_ 1
 
-# if HAVE_CONFIG_H
-#  include <config.h>
-# endif
-
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
-int
-same_name PARAMS ((const char *source, const char *dest));
+int same_name (const char *source, const char *dest);
 
 #endif /* SAME_H_ */
diff --git a/lib/save-cwd.c b/lib/save-cwd.c
--- a/lib/save-cwd.c
+++ b/lib/save-cwd.c
@@ -1,5 +1,5 @@
 /* save-cwd.c -- Save and restore current working directory.
-   Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997, 1998, 2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -49,7 +49,7 @@
 #include "save-cwd.h"
 #include "error.h"
 
-char *xgetcwd PARAMS ((void));
+char *xgetcwd (void);
 
 /* Record the location of the current working directory in CWD so that
    the program may change to other directories and later use restore_cwd
diff --git a/lib/save-cwd.h b/lib/save-cwd.h
--- a/lib/save-cwd.h
+++ b/lib/save-cwd.h
@@ -1,3 +1,23 @@
+/* Save and restore current working directory.
+
+   Copyright (C) 1995, 1997, 1998, 2003 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Written by Jim Meyering <meyering@na-net.ornl.gov>.  */
+
 #ifndef SAVE_CWD_H
 # define SAVE_CWD_H 1
 
@@ -7,17 +27,9 @@
     char *name;
   };
 
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
-int save_cwd PARAMS ((struct saved_cwd *cwd));
-int restore_cwd PARAMS ((const struct saved_cwd *cwd, const char *dest,
-			 const char *from));
-void free_cwd PARAMS ((struct saved_cwd *cwd));
+int save_cwd (struct saved_cwd *cwd);
+int restore_cwd (const struct saved_cwd *cwd, const char *dest,
+		 const char *from);
+void free_cwd (struct saved_cwd *cwd);
 
 #endif /* SAVE_CWD_H */
diff --git a/lib/savedir.h b/lib/savedir.h
--- a/lib/savedir.h
+++ b/lib/savedir.h
@@ -1,14 +1,26 @@
+/* Save the list of files in a directory in a string.
+
+   Copyright 1997, 1999, 2001, 2003 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
+
 #if !defined SAVEDIR_H_
 # define SAVEDIR_H_
 
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
-char *savedir PARAMS ((const char *dir));
+char *savedir (const char *dir);
 
 #endif
diff --git a/lib/stdio-safer.h b/lib/stdio-safer.h
--- a/lib/stdio-safer.h
+++ b/lib/stdio-safer.h
@@ -1,11 +1,23 @@
+/* Invoke stdio functions, but avoid some glitches.
+
+   Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Written by Paul Eggert.  */
+
 #include <stdio.h>
 
-#ifndef PARAMS
-# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
-
-FILE *fopen_safer PARAMS ((char const *, char const *));
+FILE *fopen_safer (char const *, char const *);
diff --git a/lib/strtoimax.c b/lib/strtoimax.c
--- a/lib/strtoimax.c
+++ b/lib/strtoimax.c
@@ -1,5 +1,5 @@
 /* Convert string representation of a number into an intmax_t value.
-   Copyright 1999, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -33,14 +33,6 @@
 # include <stdlib.h>
 #endif
 
-#ifndef PARAMS
-# if defined PROTOTYPES || defined __STDC__
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
-
 /* Verify a requirement at compile-time (unlike assert, which is runtime).  */
 #define verify(name, assertion) struct name { char a[(assertion) ? 1 : -1]; }
 
@@ -49,13 +41,13 @@
 "this configure-time declaration test was not run"
 # endif
 # if !HAVE_DECL_STRTOUL
-unsigned long strtoul PARAMS ((char const *, char **, int));
+unsigned long strtoul (char const *, char **, int);
 # endif
 # ifndef HAVE_DECL_STRTOULL
 "this configure-time declaration test was not run"
 # endif
 # if !HAVE_DECL_STRTOULL && HAVE_UNSIGNED_LONG_LONG
-unsigned long long strtoull PARAMS ((char const *, char **, int));
+unsigned long long strtoull (char const *, char **, int);
 # endif
 
 #else
@@ -64,13 +56,13 @@
 "this configure-time declaration test was not run"
 # endif
 # if !HAVE_DECL_STRTOL
-long strtol PARAMS ((char const *, char **, int));
+long strtol (char const *, char **, int);
 # endif
 # ifndef HAVE_DECL_STRTOLL
 "this configure-time declaration test was not run"
 # endif
 # if !HAVE_DECL_STRTOLL && HAVE_UNSIGNED_LONG_LONG
-long long strtoll PARAMS ((char const *, char **, int));
+long long strtoll (char const *, char **, int);
 # endif
 #endif
 
diff --git a/lib/strverscmp.h b/lib/strverscmp.h
--- a/lib/strverscmp.h
+++ b/lib/strverscmp.h
@@ -1,20 +1,24 @@
-/* strverscmp.h -- compare strings holding indices/version numbers */
+/* Compare strings while treating digits characters numerically.
+
+   Copyright (C) 1997, 2003 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #ifndef STRVERSCMP_H_
 # define STRVERSCMP_H_
 
-# if HAVE_CONFIG_H
-#  include <config.h>
-# endif
-
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
-int strverscmp PARAMS ((const char*, const char*));
+int strverscmp (const char *, const char *);
 
 #endif /* not STRVERSCMP_H_ */
diff --git a/lib/unistd-safer.h b/lib/unistd-safer.h
--- a/lib/unistd-safer.h
+++ b/lib/unistd-safer.h
@@ -1,9 +1,21 @@
-#ifndef PARAMS
-# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
+/* Invoke unistd functions, but avoid some glitches.
+
+   Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
-int dup_safer PARAMS ((int));
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Written by Paul Eggert.  */
+
+int dup_safer (int);
diff --git a/lib/version-etc.h b/lib/version-etc.h
--- a/lib/version-etc.h
+++ b/lib/version-etc.h
@@ -22,19 +22,10 @@
 
 # include <stdio.h>
 
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
 extern char *version_etc_copyright;
 
-void
-version_etc PARAMS ((FILE *stream,
-		     const char *command_name, const char *package,
-		     const char *version, const char *authors));
+void version_etc (FILE *stream,
+		  const char *command_name, const char *package,
+		  const char *version, const char *authors);
 
 #endif /* VERSION_ETC_H */
diff --git a/lib/xalloc.h b/lib/xalloc.h
--- a/lib/xalloc.h
+++ b/lib/xalloc.h
@@ -1,5 +1,7 @@
 /* xalloc.h -- malloc with out-of-memory checking
-   Copyright (C) 1990-1998, 1999, 2000 Free Software Foundation, Inc.
+
+   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+   1999, 2000, 2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,14 +22,6 @@
 
 # include <stddef.h>
 
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
 # ifndef __attribute__
 #  if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__
 #   define __attribute__(x)
@@ -45,7 +39,7 @@
 
 /* If this pointer is non-zero, run the specified function upon each
    allocation failure.  It is initialized to zero. */
-extern void (*xalloc_fail_func) PARAMS ((void));
+extern void (*xalloc_fail_func) (void);
 
 /* If XALLOC_FAIL_FUNC is undefined or a function that returns, this
    message is output.  It is translated via gettext.
@@ -56,12 +50,12 @@
    in charge of honoring the three previous items.  This is the
    function to call when one wants the program to die because of a
    memory allocation failure.  */
-extern void xalloc_die PARAMS ((void)) ATTRIBUTE_NORETURN;
+extern void xalloc_die (void) ATTRIBUTE_NORETURN;
 
-void *xmalloc PARAMS ((size_t n));
-void *xcalloc PARAMS ((size_t n, size_t s));
-void *xrealloc PARAMS ((void *p, size_t n));
-char *xstrdup PARAMS ((const char *str));
+void *xmalloc (size_t n);
+void *xcalloc (size_t n, size_t s);
+void *xrealloc (void *p, size_t n);
+char *xstrdup (const char *str);
 
 # define XMALLOC(Type, N_items) ((Type *) xmalloc (sizeof (Type) * (N_items)))
 # define XCALLOC(Type, N_items) ((Type *) xcalloc (sizeof (Type), (N_items)))
diff --git a/lib/xmalloc.c b/lib/xmalloc.c
--- a/lib/xmalloc.c
+++ b/lib/xmalloc.c
@@ -1,5 +1,7 @@
 /* xmalloc.c -- malloc with out of memory checking
-   Copyright (C) 1990-1999, 2000, 2002 Free Software Foundation, Inc.
+
+   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+   1999, 2000, 2002, 2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -56,7 +58,7 @@
 int xalloc_exit_failure = EXIT_FAILURE;
 
 /* If non NULL, call this function when memory is exhausted. */
-void (*xalloc_fail_func) PARAMS ((void)) = 0;
+void (*xalloc_fail_func) (void) = 0;
 
 /* If XALLOC_FAIL_FUNC is NULL, or does return, display this message
    before exiting when memory is exhausted.  Goes through gettext. */
diff --git a/lib/xreadlink.h b/lib/xreadlink.h
--- a/lib/xreadlink.h
+++ b/lib/xreadlink.h
@@ -1,9 +1,22 @@
-#ifndef PARAMS
-# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
+/* readlink wrapper to return the link name in malloc'd storage
+
+   Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
-char *xreadlink PARAMS ((char const *));
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Written by Jim Meyering <jim@meyering.net>  */
+
+char *xreadlink (char const *);
diff --git a/lib/xstrtod.h b/lib/xstrtod.h
--- a/lib/xstrtod.h
+++ b/lib/xstrtod.h
@@ -1,15 +1,26 @@
+/* Error-checking interface to strtod.
+
+   Copyright (C) 1996, 1998, 2003 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Written by Jim Meyering.  */
+
 #ifndef XSTRTOD_H
 # define XSTRTOD_H 1
 
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
-int
-  xstrtod PARAMS ((const char *str, const char **ptr, double *result));
+int xstrtod (const char *str, const char **ptr, double *result);
 
 #endif /* not XSTRTOD_H */
diff --git a/lib/xstrtol.h b/lib/xstrtol.h
--- a/lib/xstrtol.h
+++ b/lib/xstrtol.h
@@ -1,5 +1,7 @@
 /* A more useful interface to strtol.
-   Copyright 1995, 1996, 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
+
+   Copyright (C) 1995, 1996, 1998, 1999, 2001, 2002, 2003 Free
+   Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -27,14 +29,6 @@
 #  endif
 # endif
 
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
 # ifndef _STRTOL_ERROR
 enum strtol_error
   {
@@ -44,9 +38,7 @@
 # endif
 
 # define _DECLARE_XSTRTOL(name, type) \
-  strtol_error \
-    name PARAMS ((const char *s, char **ptr, int base, \
-		  type *val, const char *valid_suffixes));
+  strtol_error name (const char *, char **, int, type *, const char *);
 _DECLARE_XSTRTOL (xstrtol, long int)
 _DECLARE_XSTRTOL (xstrtoul, unsigned long int)
 _DECLARE_XSTRTOL (xstrtoimax, intmax_t)