--- a/lib/group-member.c
+++ b/lib/group-member.c
@@ -19,18 +19,16 @@
 # include <config.h>
 #endif
 
+#include "group-member.h"
+
 #include <stdio.h>
 #include <sys/types.h>
-
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
 
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
 
-#include "group-member.h"
 #include "xalloc.h"
 
 struct group_info
@@ -127,7 +125,7 @@
 char *program_name;
 
 int
-main (int argc, char** argv)
+main (int argc, char **argv)
 {
   int i;
 

--- a/lib/idcache.c
+++ b/lib/idcache.c
@@ -21,16 +21,11 @@
 #endif
 
 #include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
 #include <pwd.h>
 #include <grp.h>
 
-#if STDC_HEADERS || HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif

--- a/lib/makepath.c
+++ b/lib/makepath.c
@@ -23,6 +23,8 @@
 # include <config.h>
 #endif
 
+#include "makepath.h"
+
 #include <alloca.h>
 
 #include <stdio.h>
@@ -44,9 +46,7 @@
 # define S_IRWXUGO (S_IRWXU | S_IRWXG | S_IRWXO)
 #endif
 
-#if STDC_HEADERS
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
 
 #include <errno.h>
 
@@ -54,14 +54,7 @@
 extern int errno;
 #endif
 
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
+#include <string.h>
 
 #ifndef S_ISUID
 # define S_ISUID 04000
@@ -88,8 +81,6 @@
 
 #define WX_USR (S_IWUSR | S_IXUSR)
 
-#include "makepath.h"
-
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

--- a/lib/malloc.c
+++ b/lib/malloc.c
@@ -22,14 +22,12 @@
 #endif
 #undef malloc
 
-#include <stddef.h>
-
-char *malloc ();
+#include <stdlib.h>
 
 /* Allocate an N-byte block of memory from the heap.
    If N is zero, allocate a 1-byte block.  */
 
-char *
+void *
 rpl_malloc (size_t n)
 {
   if (n == 0)

--- a/lib/realloc.c
+++ b/lib/realloc.c
@@ -22,19 +22,14 @@
 #endif
 #undef realloc
 
-#include <stddef.h>
-
-char *malloc ();
-char *realloc ();
+#include <stdlib.h>
 
 /* Change the size of an allocated block of memory P to N bytes,
    with error checking.  If N is zero, change it to 1.  If P is NULL,
    use malloc.  */
 
-char *
-rpl_realloc (p, n)
-     char *p;
-     size_t n;
+void *
+rpl_realloc (void *p, size_t n)
 {
   if (n == 0)
     n = 1;

--- a/m4/group-member.m4
+++ b/m4/group-member.m4
@@ -1,4 +1,4 @@
-#serial 4
+#serial 5
 
 dnl Written by Jim Meyering
 
@@ -18,7 +18,6 @@
 # Prerequisites of lib/group-member.c.
 AC_DEFUN([gl_PREREQ_GROUP_MEMBER],
 [
-  AC_REQUIRE([AC_HEADER_STDC])
   AC_CHECK_HEADERS_ONCE(unistd.h)
   AC_REQUIRE([AC_FUNC_GETGROUPS])
 ])

--- a/m4/idcache.m4
+++ b/m4/idcache.m4
@@ -1,5 +1,5 @@
-# idcache.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# idcache.m4 serial 2
+dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -9,6 +9,5 @@
 AC_DEFUN([gl_IDCACHE],
 [
   dnl Prerequisites of lib/idcache.c.
-  AC_REQUIRE([AC_HEADER_STDC])
-  AC_CHECK_HEADERS_ONCE(string.h unistd.h)
+  AC_CHECK_HEADERS_ONCE(unistd.h)
 ])

--- a/m4/makepath.m4
+++ b/m4/makepath.m4
@@ -1,5 +1,5 @@
-# makepath.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# makepath.m4 serial 2
+dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -10,8 +10,7 @@
 [
   dnl Prerequisites of lib/makepath.c.
   AC_REQUIRE([AC_FUNC_ALLOCA])
-  AC_REQUIRE([AC_HEADER_STDC])
-  AC_CHECK_HEADERS_ONCE(string.h unistd.h)
+  AC_CHECK_HEADERS_ONCE(unistd.h)
   AC_REQUIRE([AC_HEADER_STAT])
   AC_REQUIRE([jm_AFS])
 ])