We require ANSI C so stop using the obsolete STDC_HEADERS.

2015-06-19 14:29:27 -06:00
parent 09b07fe21a
commit dc883f2454
140 changed files with 417 additions and 1354 deletions
--- a/112
+++ b/112
@@ -16345,118 +16345,6 @@ _ACEOF

 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $logfac" >&5
 $as_echo "$logfac" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
  as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
--- a/configure.ac
+++ b/configure.ac
@@ -2237,7 +2237,6 @@ AC_MSG_RESULT($logfac)
 dnl
 dnl Header file checks
 dnl
-AC_HEADER_STDC
 AC_HEADER_DIRENT
 AC_HEADER_TIME
 AC_HEADER_STDBOOL
--- a/include/sudo_compat.h
+++ b/include/sudo_compat.h
@@ -23,9 +23,7 @@
 #define SUDO_COMPAT_H

 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stddef.h>
-#endif
 #include <stdarg.h>

 /*
--- a/lib/util/aix.c
+++ b/lib/util/aix.c
@@ -20,14 +20,8 @@
 #include <sys/resource.h>

 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #include <errno.h>
 #include <usersec.h>
 #include <uinfo.h>
--- a/lib/util/closefrom.c
+++ b/lib/util/closefrom.c
@@ -22,14 +22,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #include <fcntl.h>
 #include <limits.h>
 #ifdef HAVE_PSTAT_GETPROC
--- a/lib/util/event.c
+++ b/lib/util/event.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>
 #else
--- a/lib/util/event_poll.c
+++ b/lib/util/event_poll.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>
 #else
--- a/lib/util/event_select.c
+++ b/lib/util/event_select.c
@@ -25,14 +25,8 @@
 # include <sys/select.h>
 #endif /* HAVE_SYS_SELECT_H */
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>
 #else
--- a/lib/util/getaddrinfo.c
+++ b/lib/util/getaddrinfo.c
@@ -38,14 +38,8 @@
 #include <sys/socket.h>

 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/lib/util/getcwd.c
+++ b/lib/util/getcwd.c
@@ -36,14 +36,8 @@

 #include <errno.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/lib/util/getgrouplist.c
+++ b/lib/util/getgrouplist.c
@@ -21,14 +21,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/lib/util/gethostname.c
+++ b/lib/util/gethostname.c
@@ -18,14 +18,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #include <unistd.h>

 #include "sudo_compat.h"
--- a/lib/util/getline.c
+++ b/lib/util/getline.c
@@ -21,14 +21,8 @@
 #include <sys/types.h>

 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/lib/util/getopt_long.c
+++ b/lib/util/getopt_long.c
@@ -54,14 +54,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/lib/util/gettime.c
+++ b/lib/util/gettime.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif /* HAVE_UNISTD_H */
--- a/lib/util/gidlist.c
+++ b/lib/util/gidlist.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>

 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #include <grp.h>

 #define DEFAULT_TEXT_DOMAIN	"sudo"
--- a/lib/util/glob.c
+++ b/lib/util/glob.c
@@ -58,14 +58,8 @@
 #include <sys/stat.h>

 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/lib/util/key_val.c
+++ b/lib/util/key_val.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>

 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/lib/util/lbuf.c
+++ b/lib/util/lbuf.c
@@ -20,14 +20,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/lib/util/locking.c
+++ b/lib/util/locking.c
@@ -25,14 +25,8 @@
 #ifdef HAVE_FLOCK
 # include <sys/file.h>
 #endif /* HAVE_FLOCK */
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/lib/util/mksiglist.c
+++ b/lib/util/mksiglist.c
@@ -20,14 +20,8 @@
 #include <sys/types.h>

 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #include <signal.h>

 #include "sudo_compat.h"
--- a/lib/util/mksigname.c
+++ b/lib/util/mksigname.c
@@ -20,14 +20,8 @@
 #include <sys/types.h>

 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #include <signal.h>

 #include "sudo_compat.h"
--- a/lib/util/parseln.c
+++ b/lib/util/parseln.c
@@ -18,14 +18,8 @@
 #include <config.h>

 #include <sys/types.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/lib/util/progname.c
+++ b/lib/util/progname.c
@@ -18,14 +18,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/lib/util/pw_dup.c
+++ b/lib/util/pw_dup.c
@@ -26,14 +26,8 @@
 #include <sys/types.h>

 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/lib/util/reallocarray.c
+++ b/lib/util/reallocarray.c
@@ -20,14 +20,8 @@
 #ifndef HAVE_REALLOCARRAY

 #include <sys/types.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #if defined(HAVE_STDINT_H)
 # include <stdint.h>
 #elif defined(HAVE_INTTYPES_H)
--- a/lib/util/regress/atofoo/atofoo_test.c
+++ b/lib/util/regress/atofoo/atofoo_test.c
@@ -18,14 +18,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>
 #else
--- a/lib/util/regress/parse_gids/parse_gids_test.c
+++ b/lib/util/regress/parse_gids/parse_gids_test.c
@@ -18,14 +18,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/lib/util/regress/progname/progname_test.c
+++ b/lib/util/regress/progname/progname_test.c
@@ -18,14 +18,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/lib/util/regress/strsplit/strsplit_test.c
+++ b/lib/util/regress/strsplit/strsplit_test.c
@@ -18,14 +18,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/lib/util/regress/sudo_conf/conf_test.c
+++ b/lib/util/regress/sudo_conf/conf_test.c
@@ -18,14 +18,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/lib/util/regress/sudo_parseln/parseln_test.c
+++ b/lib/util/regress/sudo_parseln/parseln_test.c
@@ -18,14 +18,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/lib/util/regress/tailq/hltq_test.c
+++ b/lib/util/regress/tailq/hltq_test.c
@@ -18,14 +18,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/lib/util/setgroups.c
+++ b/lib/util/setgroups.c
@@ -20,14 +20,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif /* HAVE_UNISTD_H */
--- a/lib/util/sha2.c
+++ b/lib/util/sha2.c
@@ -27,14 +27,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/lib/util/sig2str.c
+++ b/lib/util/sig2str.c
@@ -22,14 +22,8 @@

 #include <errno.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/lib/util/snprintf.c
+++ b/lib/util/snprintf.c
@@ -54,14 +54,8 @@
 #endif
 #include <limits.h>
 #include <stdarg.h>
-#ifdef STDC_HEADERS
 #include <stddef.h>
 #include <stdlib.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #if defined(HAVE_STDINT_H)
 # include <stdint.h>
 #elif defined(HAVE_INTTYPES_H)
--- a/lib/util/strndup.c
+++ b/lib/util/strndup.c
@@ -22,14 +22,8 @@

 #include <sys/types.h>

-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/lib/util/strsplit.c
+++ b/lib/util/strsplit.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>

 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #include <errno.h>
 #include <grp.h>

--- a/lib/util/strtobool.c
+++ b/lib/util/strtobool.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>

 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/lib/util/strtoid.c
+++ b/lib/util/strtoid.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>

 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #if defined(HAVE_STDINT_H)
 # include <stdint.h>
 #elif defined(HAVE_INTTYPES_H)
--- a/lib/util/strtomode.c
+++ b/lib/util/strtomode.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>

 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #include <errno.h>

 #define DEFAULT_TEXT_DOMAIN	"sudo"
--- a/lib/util/strtonum.c
+++ b/lib/util/strtonum.c
@@ -22,14 +22,8 @@
 #include <errno.h>
 #include <limits.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/lib/util/sudo_conf.c
+++ b/lib/util/sudo_conf.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>
 #else
--- a/lib/util/sudo_debug.c
+++ b/lib/util/sudo_debug.c
@@ -20,14 +20,8 @@
 #include <sys/stat.h>
 #include <sys/uio.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/lib/util/sudo_dso.c
+++ b/lib/util/sudo_dso.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>

 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/lib/util/term.c
+++ b/lib/util/term.c
@@ -18,14 +18,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/lib/util/ttysize.c
+++ b/lib/util/ttysize.c
@@ -21,14 +21,8 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif /* HAVE_UNISTD_H */
--- a/plugins/group_file/getgrent.c
+++ b/plugins/group_file/getgrent.c
@@ -22,14 +22,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/group_file/group_file.c
+++ b/plugins/group_file/group_file.c
@@ -20,14 +20,8 @@
 #include <sys/stat.h>

 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>
 #else
--- a/plugins/sample/sample_plugin.c
+++ b/plugins/sample/sample_plugin.c
@@ -21,14 +21,8 @@
 #include <sys/wait.h>

 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>
 #else
--- a/plugins/sudoers/alias.c
+++ b/plugins/sudoers/alias.c
@@ -21,14 +21,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/audit.c
+++ b/plugins/sudoers/audit.c
@@ -18,14 +18,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */

 #include "sudoers.h"

--- a/plugins/sudoers/auth/afs.c
+++ b/plugins/sudoers/auth/afs.c
@@ -25,14 +25,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/auth/aix_auth.c
+++ b/plugins/sudoers/auth/aix_auth.c
@@ -24,14 +24,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/auth/bsdauth.c
+++ b/plugins/sudoers/auth/bsdauth.c
@@ -25,14 +25,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/auth/dce.c
+++ b/plugins/sudoers/auth/dce.c
@@ -39,14 +39,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/auth/fwtk.c
+++ b/plugins/sudoers/auth/fwtk.c
@@ -25,14 +25,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/auth/kerb5.c
+++ b/plugins/sudoers/auth/kerb5.c
@@ -28,14 +28,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/auth/pam.c
+++ b/plugins/sudoers/auth/pam.c
@@ -24,14 +24,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/auth/passwd.c
+++ b/plugins/sudoers/auth/passwd.c
@@ -22,14 +22,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/auth/rfc1938.c
+++ b/plugins/sudoers/auth/rfc1938.c
@@ -25,14 +25,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/auth/secureware.c
+++ b/plugins/sudoers/auth/secureware.c
@@ -24,14 +24,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/auth/securid5.c
+++ b/plugins/sudoers/auth/securid5.c
@@ -29,14 +29,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/auth/sia.c
+++ b/plugins/sudoers/auth/sia.c
@@ -27,14 +27,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/auth/sudo_auth.c
+++ b/plugins/sudoers/auth/sudo_auth.c
@@ -22,14 +22,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/base64.c
+++ b/plugins/sudoers/base64.c
@@ -20,14 +20,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/boottime.c
+++ b/plugins/sudoers/boottime.c
@@ -20,14 +20,8 @@
 #include <sys/time.h>

 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>
 #else
--- a/plugins/sudoers/check.c
+++ b/plugins/sudoers/check.c
@@ -24,14 +24,8 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/defaults.c
+++ b/plugins/sudoers/defaults.c
@@ -23,14 +23,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/editor.c
+++ b/plugins/sudoers/editor.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/env.c
+++ b/plugins/sudoers/env.c
@@ -24,14 +24,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/find_path.c
+++ b/plugins/sudoers/find_path.c
@@ -24,14 +24,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/getdate.c
+++ b/plugins/sudoers/getdate.c
@@ -29,14 +29,8 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
@@ -117,7 +111,7 @@ static int	yyerror(const char *s);
 static int	yylex(void);
       int	yyparse(void);

-#line 110 "getdate.y"
+#line 104 "getdate.y"
 #ifndef YYSTYPE_DEFINED
 #define YYSTYPE_DEFINED
 typedef union {
@@ -125,7 +119,7 @@ typedef union {
    enum _MERIDIAN	Meridian;
 } YYSTYPE;
 #endif /* YYSTYPE_DEFINED */
-#line 128 "getdate.c"
+#line 122 "getdate.c"
 #define tAGO 257
 #define tDAY 258
 #define tDAYZONE 259
@@ -393,7 +387,7 @@ short *yyss;
 short *yysslim;
 YYSTYPE *yyvs;
 unsigned int yystacksize;
-#line 329 "getdate.y"
+#line 323 "getdate.y"

 /* Month and day table. */
 static TABLE const MonthDayTable[] = {
@@ -1015,7 +1009,7 @@ main(int argc, char *argv[])
    /* NOTREACHED */
 }
 #endif	/* TEST */
-#line 966 "getdate.c"
+#line 960 "getdate.c"
 /* allocate initial stack or double stack size, up to YYMAXDEPTH */
 #if defined(__cplusplus) || defined(__STDC__)
 static int yygrowstack(void)
@@ -1224,37 +1218,37 @@ yyreduce:
    switch (yyn)
    {
 case 3:
-#line 128 "getdate.y"
+#line 122 "getdate.y"
 {
 	    yyHaveTime++;
 	}
 break;
 case 4:
-#line 131 "getdate.y"
+#line 125 "getdate.y"
 {
 	    yyHaveZone++;
 	}
 break;
 case 5:
-#line 134 "getdate.y"
+#line 128 "getdate.y"
 {
 	    yyHaveDate++;
 	}
 break;
 case 6:
-#line 137 "getdate.y"
+#line 131 "getdate.y"
 {
 	    yyHaveDay++;
 	}
 break;
 case 7:
-#line 140 "getdate.y"
+#line 134 "getdate.y"
 {
 	    yyHaveRel++;
 	}
 break;
 case 9:
-#line 146 "getdate.y"
+#line 140 "getdate.y"
 {
 	    yyHour = yyvsp[-1].Number;
 	    yyMinutes = 0;
@@ -1263,7 +1257,7 @@ case 9:
 	}
 break;
 case 10:
-#line 152 "getdate.y"
+#line 146 "getdate.y"
 {
 	    yyHour = yyvsp[-3].Number;
 	    yyMinutes = yyvsp[-1].Number;
@@ -1272,7 +1266,7 @@ case 10:
 	}
 break;
 case 11:
-#line 158 "getdate.y"
+#line 152 "getdate.y"
 {
 	    yyHour = yyvsp[-3].Number;
 	    yyMinutes = yyvsp[-1].Number;
@@ -1282,7 +1276,7 @@ case 11:
 	}
 break;
 case 12:
-#line 165 "getdate.y"
+#line 159 "getdate.y"
 {
 	    yyHour = yyvsp[-5].Number;
 	    yyMinutes = yyvsp[-3].Number;
@@ -1291,7 +1285,7 @@ case 12:
 	}
 break;
 case 13:
-#line 171 "getdate.y"
+#line 165 "getdate.y"
 {
 	    yyHour = yyvsp[-5].Number;
 	    yyMinutes = yyvsp[-3].Number;
@@ -1302,56 +1296,56 @@ case 13:
 	}
 break;
 case 14:
-#line 181 "getdate.y"
+#line 175 "getdate.y"
 {
 	    yyTimezone = yyvsp[0].Number;
 	    yyDSTmode = DSToff;
 	}
 break;
 case 15:
-#line 185 "getdate.y"
+#line 179 "getdate.y"
 {
 	    yyTimezone = yyvsp[0].Number;
 	    yyDSTmode = DSTon;
 	}
 break;
 case 16:
-#line 190 "getdate.y"
+#line 184 "getdate.y"
 {
 	    yyTimezone = yyvsp[-1].Number;
 	    yyDSTmode = DSTon;
 	}
 break;
 case 17:
-#line 196 "getdate.y"
+#line 190 "getdate.y"
 {
 	    yyDayOrdinal = 1;
 	    yyDayNumber = yyvsp[0].Number;
 	}
 break;
 case 18:
-#line 200 "getdate.y"
+#line 194 "getdate.y"
 {
 	    yyDayOrdinal = 1;
 	    yyDayNumber = yyvsp[-1].Number;
 	}
 break;
 case 19:
-#line 204 "getdate.y"
+#line 198 "getdate.y"
 {
 	    yyDayOrdinal = yyvsp[-1].Number;
 	    yyDayNumber = yyvsp[0].Number;
 	}
 break;
 case 20:
-#line 210 "getdate.y"
+#line 204 "getdate.y"
 {
 	    yyMonth = yyvsp[-2].Number;
 	    yyDay = yyvsp[0].Number;
 	}
 break;
 case 21:
-#line 214 "getdate.y"
+#line 208 "getdate.y"
 {
 	    if (yyvsp[-4].Number >= 100) {
 		yyYear = yyvsp[-4].Number;
@@ -1365,7 +1359,7 @@ case 21:
 	}
 break;
 case 22:
-#line 225 "getdate.y"
+#line 219 "getdate.y"
 {
 	    /* ISO 8601 format.  yyyy-mm-dd.  */
 	    yyYear = yyvsp[-2].Number;
@@ -1374,7 +1368,7 @@ case 22:
 	}
 break;
 case 23:
-#line 231 "getdate.y"
+#line 225 "getdate.y"
 {
 	    /* e.g. 17-JUN-1992.  */
 	    yyDay = yyvsp[-2].Number;
@@ -1383,14 +1377,14 @@ case 23:
 	}
 break;
 case 24:
-#line 237 "getdate.y"
+#line 231 "getdate.y"
 {
 	    yyMonth = yyvsp[-1].Number;
 	    yyDay = yyvsp[0].Number;
 	}
 break;
 case 25:
-#line 241 "getdate.y"
+#line 235 "getdate.y"
 {
 	    yyMonth = yyvsp[-3].Number;
 	    yyDay = yyvsp[-2].Number;
@@ -1398,14 +1392,14 @@ case 25:
 	}
 break;
 case 26:
-#line 246 "getdate.y"
+#line 240 "getdate.y"
 {
 	    yyMonth = yyvsp[0].Number;
 	    yyDay = yyvsp[-1].Number;
 	}
 break;
 case 27:
-#line 250 "getdate.y"
+#line 244 "getdate.y"
 {
 	    yyMonth = yyvsp[-1].Number;
 	    yyDay = yyvsp[-2].Number;
@@ -1413,68 +1407,68 @@ case 27:
 	}
 break;
 case 28:
-#line 257 "getdate.y"
+#line 251 "getdate.y"
 {
 	    yyRelSeconds = -yyRelSeconds;
 	    yyRelMonth = -yyRelMonth;
 	}
 break;
 case 30:
-#line 264 "getdate.y"
+#line 258 "getdate.y"
 {
 	    yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number * 60L;
 	}
 break;
 case 31:
-#line 267 "getdate.y"
+#line 261 "getdate.y"
 {
 	    yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number * 60L;
 	}
 break;
 case 32:
-#line 270 "getdate.y"
+#line 264 "getdate.y"
 {
 	    yyRelSeconds += yyvsp[0].Number * 60L;
 	}
 break;
 case 33:
-#line 273 "getdate.y"
+#line 267 "getdate.y"
 {
 	    yyRelSeconds += yyvsp[-1].Number;
 	}
 break;
 case 34:
-#line 276 "getdate.y"
+#line 270 "getdate.y"
 {
 	    yyRelSeconds += yyvsp[-1].Number;
 	}
 break;
 case 35:
-#line 279 "getdate.y"
+#line 273 "getdate.y"
 {
 	    yyRelSeconds++;
 	}
 break;
 case 36:
-#line 282 "getdate.y"
+#line 276 "getdate.y"
 {
 	    yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number;
 	}
 break;
 case 37:
-#line 285 "getdate.y"
+#line 279 "getdate.y"
 {
 	    yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number;
 	}
 break;
 case 38:
-#line 288 "getdate.y"
+#line 282 "getdate.y"
 {
 	    yyRelMonth += yyvsp[0].Number;
 	}
 break;
 case 39:
-#line 293 "getdate.y"
+#line 287 "getdate.y"
 {
 	    if (yyHaveTime && yyHaveDate && !yyHaveRel)
 		yyYear = yyvsp[0].Number;
@@ -1502,18 +1496,18 @@ case 39:
 	}
 break;
 case 40:
-#line 320 "getdate.y"
+#line 314 "getdate.y"
 {
 	    yyval.Meridian = MER24;
 	}
 break;
 case 41:
-#line 323 "getdate.y"
+#line 317 "getdate.y"
 {
 	    yyval.Meridian = yyvsp[0].Meridian;
 	}
 break;
-#line 1464 "getdate.c"
+#line 1458 "getdate.c"
    }
    yyssp -= yym;
    yystate = *yyssp;
--- a/plugins/sudoers/getdate.y
+++ b/plugins/sudoers/getdate.y
@@ -17,14 +17,8 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/getspwuid.c
+++ b/plugins/sudoers/getspwuid.c
@@ -24,14 +24,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/gram.c
+++ b/plugins/sudoers/gram.c
@@ -64,14 +64,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
@@ -114,7 +108,7 @@ static bool add_userspec(struct member *, struct privilege *);
 static struct defaults *new_default(char *, char *, int);
 static struct member *new_member(char *, int);
 static struct sudo_digest *new_digest(int, const char *);
-#line 81 "gram.y"
+#line 75 "gram.y"
 #ifndef YYSTYPE_DEFINED
 #define YYSTYPE_DEFINED
 typedef union {
@@ -132,7 +126,7 @@ typedef union {
    int tok;
 } YYSTYPE;
 #endif /* YYSTYPE_DEFINED */
-#line 135 "gram.c"
+#line 129 "gram.c"
 #define COMMAND 257
 #define ALIAS 258
 #define DEFVAR 259
@@ -709,7 +703,7 @@ short *yyss;
 short *yysslim;
 YYSTYPE *yyvs;
 unsigned int yystacksize;
-#line 858 "gram.y"
+#line 852 "gram.y"
 void
 sudoerserror(const char *s)
 {
@@ -991,7 +985,7 @@ init_parser(const char *path, bool quiet)

    debug_return_bool(rval);
 }
-#line 942 "gram.c"
+#line 936 "gram.c"
 /* allocate initial stack or double stack size, up to YYMAXDEPTH */
 #if defined(__cplusplus) || defined(__STDC__)
 static int yygrowstack(void)
@@ -1200,23 +1194,23 @@ yyreduce:
    switch (yyn)
    {
 case 1:
-#line 173 "gram.y"
+#line 167 "gram.y"
 { ; }
 break;
 case 5:
-#line 181 "gram.y"
+#line 175 "gram.y"
 {
 			    ;
 			}
 break;
 case 6:
-#line 184 "gram.y"
+#line 178 "gram.y"
 {
 			    yyerrok;
 			}
 break;
 case 7:
-#line 187 "gram.y"
+#line 181 "gram.y"
 {
 			    if (!add_userspec(yyvsp[-1].member, yyvsp[0].privilege)) {
 				sudoerserror(N_("unable to allocate memory"));
@@ -1225,31 +1219,31 @@ case 7:
 			}
 break;
 case 8:
-#line 193 "gram.y"
+#line 187 "gram.y"
 {
 			    ;
 			}
 break;
 case 9:
-#line 196 "gram.y"
+#line 190 "gram.y"
 {
 			    ;
 			}
 break;
 case 10:
-#line 199 "gram.y"
+#line 193 "gram.y"
 {
 			    ;
 			}
 break;
 case 11:
-#line 202 "gram.y"
+#line 196 "gram.y"
 {
 			    ;
 			}
 break;
 case 12:
-#line 205 "gram.y"
+#line 199 "gram.y"
 {
 			    if (!add_defaults(DEFAULTS, NULL, yyvsp[0].defaults)) {
 				sudoerserror(N_("unable to allocate memory"));
@@ -1258,7 +1252,7 @@ case 12:
 			}
 break;
 case 13:
-#line 211 "gram.y"
+#line 205 "gram.y"
 {
 			    if (!add_defaults(DEFAULTS_USER, yyvsp[-1].member, yyvsp[0].defaults)) {
 				sudoerserror(N_("unable to allocate memory"));
@@ -1267,7 +1261,7 @@ case 13:
 			}
 break;
 case 14:
-#line 217 "gram.y"
+#line 211 "gram.y"
 {
 			    if (!add_defaults(DEFAULTS_RUNAS, yyvsp[-1].member, yyvsp[0].defaults)) {
 				sudoerserror(N_("unable to allocate memory"));
@@ -1276,7 +1270,7 @@ case 14:
 			}
 break;
 case 15:
-#line 223 "gram.y"
+#line 217 "gram.y"
 {
 			    if (!add_defaults(DEFAULTS_HOST, yyvsp[-1].member, yyvsp[0].defaults)) {
 				sudoerserror(N_("unable to allocate memory"));
@@ -1285,7 +1279,7 @@ case 15:
 			}
 break;
 case 16:
-#line 229 "gram.y"
+#line 223 "gram.y"
 {
 			    if (!add_defaults(DEFAULTS_CMND, yyvsp[-1].member, yyvsp[0].defaults)) {
 				sudoerserror(N_("unable to allocate memory"));
@@ -1294,14 +1288,14 @@ case 16:
 			}
 break;
 case 18:
-#line 238 "gram.y"
+#line 232 "gram.y"
 {
 			    HLTQ_CONCAT(yyvsp[-2].defaults, yyvsp[0].defaults, entries);
 			    yyval.defaults = yyvsp[-2].defaults;
 			}
 break;
 case 19:
-#line 244 "gram.y"
+#line 238 "gram.y"
 {
 			    yyval.defaults = new_default(yyvsp[0].string, NULL, true);
 			    if (yyval.defaults == NULL) {
@@ -1311,7 +1305,7 @@ case 19:
 			}
 break;
 case 20:
-#line 251 "gram.y"
+#line 245 "gram.y"
 {
 			    yyval.defaults = new_default(yyvsp[0].string, NULL, false);
 			    if (yyval.defaults == NULL) {
@@ -1321,7 +1315,7 @@ case 20:
 			}
 break;
 case 21:
-#line 258 "gram.y"
+#line 252 "gram.y"
 {
 			    yyval.defaults = new_default(yyvsp[-2].string, yyvsp[0].string, true);
 			    if (yyval.defaults == NULL) {
@@ -1331,7 +1325,7 @@ case 21:
 			}
 break;
 case 22:
-#line 265 "gram.y"
+#line 259 "gram.y"
 {
 			    yyval.defaults = new_default(yyvsp[-2].string, yyvsp[0].string, '+');
 			    if (yyval.defaults == NULL) {
@@ -1341,7 +1335,7 @@ case 22:
 			}
 break;
 case 23:
-#line 272 "gram.y"
+#line 266 "gram.y"
 {
 			    yyval.defaults = new_default(yyvsp[-2].string, yyvsp[0].string, '-');
 			    if (yyval.defaults == NULL) {
@@ -1351,14 +1345,14 @@ case 23:
 			}
 break;
 case 25:
-#line 282 "gram.y"
+#line 276 "gram.y"
 {
 			    HLTQ_CONCAT(yyvsp[-2].privilege, yyvsp[0].privilege, entries);
 			    yyval.privilege = yyvsp[-2].privilege;
 			}
 break;
 case 26:
-#line 288 "gram.y"
+#line 282 "gram.y"
 {
 			    struct privilege *p = calloc(1, sizeof(*p));
 			    if (p == NULL) {
@@ -1372,21 +1366,21 @@ case 26:
 			}
 break;
 case 27:
-#line 301 "gram.y"
+#line 295 "gram.y"
 {
 			    yyval.member = yyvsp[0].member;
 			    yyval.member->negated = false;
 			}
 break;
 case 28:
-#line 305 "gram.y"
+#line 299 "gram.y"
 {
 			    yyval.member = yyvsp[0].member;
 			    yyval.member->negated = true;
 			}
 break;
 case 29:
-#line 311 "gram.y"
+#line 305 "gram.y"
 {
 			    yyval.member = new_member(yyvsp[0].string, ALIAS);
 			    if (yyval.member == NULL) {
@@ -1396,7 +1390,7 @@ case 29:
 			}
 break;
 case 30:
-#line 318 "gram.y"
+#line 312 "gram.y"
 {
 			    yyval.member = new_member(NULL, ALL);
 			    if (yyval.member == NULL) {
@@ -1406,7 +1400,7 @@ case 30:
 			}
 break;
 case 31:
-#line 325 "gram.y"
+#line 319 "gram.y"
 {
 			    yyval.member = new_member(yyvsp[0].string, NETGROUP);
 			    if (yyval.member == NULL) {
@@ -1416,7 +1410,7 @@ case 31:
 			}
 break;
 case 32:
-#line 332 "gram.y"
+#line 326 "gram.y"
 {
 			    yyval.member = new_member(yyvsp[0].string, NTWKADDR);
 			    if (yyval.member == NULL) {
@@ -1426,7 +1420,7 @@ case 32:
 			}
 break;
 case 33:
-#line 339 "gram.y"
+#line 333 "gram.y"
 {
 			    yyval.member = new_member(yyvsp[0].string, WORD);
 			    if (yyval.member == NULL) {
@@ -1436,7 +1430,7 @@ case 33:
 			}
 break;
 case 35:
-#line 349 "gram.y"
+#line 343 "gram.y"
 {
 			    struct cmndspec *prev;
 			    prev = HLTQ_LAST(yyvsp[-2].cmndspec, cmndspec, entries);
@@ -1480,7 +1474,7 @@ case 35:
 			}
 break;
 case 36:
-#line 392 "gram.y"
+#line 386 "gram.y"
 {
 			    struct cmndspec *cs = calloc(1, sizeof(*cs));
 			    if (cs == NULL) {
@@ -1529,7 +1523,7 @@ case 36:
 			}
 break;
 case 37:
-#line 440 "gram.y"
+#line 434 "gram.y"
 {
 			    yyval.digest = new_digest(SUDO_DIGEST_SHA224, yyvsp[0].string);
 			    if (yyval.digest == NULL) {
@@ -1539,7 +1533,7 @@ case 37:
 			}
 break;
 case 38:
-#line 447 "gram.y"
+#line 441 "gram.y"
 {
 			    yyval.digest = new_digest(SUDO_DIGEST_SHA256, yyvsp[0].string);
 			    if (yyval.digest == NULL) {
@@ -1549,7 +1543,7 @@ case 38:
 			}
 break;
 case 39:
-#line 454 "gram.y"
+#line 448 "gram.y"
 {
 			    yyval.digest = new_digest(SUDO_DIGEST_SHA384, yyvsp[0].string);
 			    if (yyval.digest == NULL) {
@@ -1559,7 +1553,7 @@ case 39:
 			}
 break;
 case 40:
-#line 461 "gram.y"
+#line 455 "gram.y"
 {
 			    yyval.digest = new_digest(SUDO_DIGEST_SHA512, yyvsp[0].string);
 			    if (yyval.digest == NULL) {
@@ -1569,13 +1563,13 @@ case 40:
 			}
 break;
 case 41:
-#line 470 "gram.y"
+#line 464 "gram.y"
 {
 			    yyval.member = yyvsp[0].member;
 			}
 break;
 case 42:
-#line 473 "gram.y"
+#line 467 "gram.y"
 {
 			    if (yyvsp[0].member->type != COMMAND) {
 				sudoerserror(N_("a digest requires a path name"));
@@ -1587,127 +1581,127 @@ case 42:
 			}
 break;
 case 43:
-#line 484 "gram.y"
+#line 478 "gram.y"
 {
 			    yyval.member = yyvsp[0].member;
 			    yyval.member->negated = false;
 			}
 break;
 case 44:
-#line 488 "gram.y"
+#line 482 "gram.y"
 {
 			    yyval.member = yyvsp[0].member;
 			    yyval.member->negated = true;
 			}
 break;
 case 45:
-#line 494 "gram.y"
+#line 488 "gram.y"
 {
 			    yyval.string = yyvsp[0].string;
 			}
 break;
 case 46:
-#line 499 "gram.y"
+#line 493 "gram.y"
 {
 			    yyval.string = yyvsp[0].string;
 			}
 break;
 case 47:
-#line 504 "gram.y"
+#line 498 "gram.y"
 {
 			    yyval.seinfo.role = NULL;
 			    yyval.seinfo.type = NULL;
 			}
 break;
 case 48:
-#line 508 "gram.y"
+#line 502 "gram.y"
 {
 			    yyval.seinfo.role = yyvsp[0].string;
 			    yyval.seinfo.type = NULL;
 			}
 break;
 case 49:
-#line 512 "gram.y"
+#line 506 "gram.y"
 {
 			    yyval.seinfo.type = yyvsp[0].string;
 			    yyval.seinfo.role = NULL;
 			}
 break;
 case 50:
-#line 516 "gram.y"
+#line 510 "gram.y"
 {
 			    yyval.seinfo.role = yyvsp[-1].string;
 			    yyval.seinfo.type = yyvsp[0].string;
 			}
 break;
 case 51:
-#line 520 "gram.y"
+#line 514 "gram.y"
 {
 			    yyval.seinfo.type = yyvsp[-1].string;
 			    yyval.seinfo.role = yyvsp[0].string;
 			}
 break;
 case 52:
-#line 526 "gram.y"
+#line 520 "gram.y"
 {
 			    yyval.string = yyvsp[0].string;
 			}
 break;
 case 53:
-#line 530 "gram.y"
+#line 524 "gram.y"
 {
 			    yyval.string = yyvsp[0].string;
 			}
 break;
 case 54:
-#line 535 "gram.y"
+#line 529 "gram.y"
 {
 			    yyval.privinfo.privs = NULL;
 			    yyval.privinfo.limitprivs = NULL;
 			}
 break;
 case 55:
-#line 539 "gram.y"
+#line 533 "gram.y"
 {
 			    yyval.privinfo.privs = yyvsp[0].string;
 			    yyval.privinfo.limitprivs = NULL;
 			}
 break;
 case 56:
-#line 543 "gram.y"
+#line 537 "gram.y"
 {
 			    yyval.privinfo.privs = NULL;
 			    yyval.privinfo.limitprivs = yyvsp[0].string;
 			}
 break;
 case 57:
-#line 547 "gram.y"
+#line 541 "gram.y"
 {
 			    yyval.privinfo.privs = yyvsp[-1].string;
 			    yyval.privinfo.limitprivs = yyvsp[0].string;
 			}
 break;
 case 58:
-#line 551 "gram.y"
+#line 545 "gram.y"
 {
 			    yyval.privinfo.limitprivs = yyvsp[-1].string;
 			    yyval.privinfo.privs = yyvsp[0].string;
 			}
 break;
 case 59:
-#line 557 "gram.y"
+#line 551 "gram.y"
 {
 			    yyval.runas = NULL;
 			}
 break;
 case 60:
-#line 560 "gram.y"
+#line 554 "gram.y"
 {
 			    yyval.runas = yyvsp[-1].runas;
 			}
 break;
 case 61:
-#line 565 "gram.y"
+#line 559 "gram.y"
 {
 			    yyval.runas = calloc(1, sizeof(struct runascontainer));
 			    if (yyval.runas != NULL) {
@@ -1725,7 +1719,7 @@ case 61:
 			}
 break;
 case 62:
-#line 580 "gram.y"
+#line 574 "gram.y"
 {
 			    yyval.runas = calloc(1, sizeof(struct runascontainer));
 			    if (yyval.runas == NULL) {
@@ -1737,7 +1731,7 @@ case 62:
 			}
 break;
 case 63:
-#line 589 "gram.y"
+#line 583 "gram.y"
 {
 			    yyval.runas = calloc(1, sizeof(struct runascontainer));
 			    if (yyval.runas == NULL) {
@@ -1749,7 +1743,7 @@ case 63:
 			}
 break;
 case 64:
-#line 598 "gram.y"
+#line 592 "gram.y"
 {
 			    yyval.runas = calloc(1, sizeof(struct runascontainer));
 			    if (yyval.runas == NULL) {
@@ -1761,7 +1755,7 @@ case 64:
 			}
 break;
 case 65:
-#line 607 "gram.y"
+#line 601 "gram.y"
 {
 			    yyval.runas = calloc(1, sizeof(struct runascontainer));
 			    if (yyval.runas != NULL) {
@@ -1779,86 +1773,86 @@ case 65:
 			}
 break;
 case 66:
-#line 624 "gram.y"
+#line 618 "gram.y"
 {
 			    yyval.tag.log_input = yyval.tag.log_output = yyval.tag.noexec =
 				yyval.tag.nopasswd = yyval.tag.send_mail = yyval.tag.setenv = UNSPEC;
 			}
 break;
 case 67:
-#line 628 "gram.y"
+#line 622 "gram.y"
 {
 			    yyval.tag.nopasswd = true;
 			}
 break;
 case 68:
-#line 631 "gram.y"
+#line 625 "gram.y"
 {
 			    yyval.tag.nopasswd = false;
 			}
 break;
 case 69:
-#line 634 "gram.y"
+#line 628 "gram.y"
 {
 			    yyval.tag.noexec = true;
 			}
 break;
 case 70:
-#line 637 "gram.y"
+#line 631 "gram.y"
 {
 			    yyval.tag.noexec = false;
 			}
 break;
 case 71:
-#line 640 "gram.y"
+#line 634 "gram.y"
 {
 			    yyval.tag.setenv = true;
 			}
 break;
 case 72:
-#line 643 "gram.y"
+#line 637 "gram.y"
 {
 			    yyval.tag.setenv = false;
 			}
 break;
 case 73:
-#line 646 "gram.y"
+#line 640 "gram.y"
 {
 			    yyval.tag.log_input = true;
 			}
 break;
 case 74:
-#line 649 "gram.y"
+#line 643 "gram.y"
 {
 			    yyval.tag.log_input = false;
 			}
 break;
 case 75:
-#line 652 "gram.y"
+#line 646 "gram.y"
 {
 			    yyval.tag.log_output = true;
 			}
 break;
 case 76:
-#line 655 "gram.y"
+#line 649 "gram.y"
 {
 			    yyval.tag.log_output = false;
 			}
 break;
 case 77:
-#line 658 "gram.y"
+#line 652 "gram.y"
 {
 			    yyval.tag.send_mail = true;
 			}
 break;
 case 78:
-#line 661 "gram.y"
+#line 655 "gram.y"
 {
 			    yyval.tag.send_mail = false;
 			}
 break;
 case 79:
-#line 666 "gram.y"
+#line 660 "gram.y"
 {
 			    yyval.member = new_member(NULL, ALL);
 			    if (yyval.member == NULL) {
@@ -1868,7 +1862,7 @@ case 79:
 			}
 break;
 case 80:
-#line 673 "gram.y"
+#line 667 "gram.y"
 {
 			    yyval.member = new_member(yyvsp[0].string, ALIAS);
 			    if (yyval.member == NULL) {
@@ -1878,7 +1872,7 @@ case 80:
 			}
 break;
 case 81:
-#line 680 "gram.y"
+#line 674 "gram.y"
 {
 			    struct sudo_command *c = calloc(1, sizeof(*c));
 			    if (c == NULL) {
@@ -1896,7 +1890,7 @@ case 81:
 			}
 break;
 case 84:
-#line 701 "gram.y"
+#line 695 "gram.y"
 {
 			    const char *s;
 			    if ((s = alias_add(yyvsp[-2].string, HOSTALIAS, yyvsp[0].member)) != NULL) {
@@ -1906,14 +1900,14 @@ case 84:
 			}
 break;
 case 86:
-#line 711 "gram.y"
+#line 705 "gram.y"
 {
 			    HLTQ_CONCAT(yyvsp[-2].member, yyvsp[0].member, entries);
 			    yyval.member = yyvsp[-2].member;
 			}
 break;
 case 89:
-#line 721 "gram.y"
+#line 715 "gram.y"
 {
 			    const char *s;
 			    if ((s = alias_add(yyvsp[-2].string, CMNDALIAS, yyvsp[0].member)) != NULL) {
@@ -1923,14 +1917,14 @@ case 89:
 			}
 break;
 case 91:
-#line 731 "gram.y"
+#line 725 "gram.y"
 {
 			    HLTQ_CONCAT(yyvsp[-2].member, yyvsp[0].member, entries);
 			    yyval.member = yyvsp[-2].member;
 			}
 break;
 case 94:
-#line 741 "gram.y"
+#line 735 "gram.y"
 {
 			    const char *s;
 			    if ((s = alias_add(yyvsp[-2].string, RUNASALIAS, yyvsp[0].member)) != NULL) {
@@ -1940,7 +1934,7 @@ case 94:
 			}
 break;
 case 97:
-#line 754 "gram.y"
+#line 748 "gram.y"
 {
 			    const char *s;
 			    if ((s = alias_add(yyvsp[-2].string, USERALIAS, yyvsp[0].member)) != NULL) {
@@ -1950,28 +1944,28 @@ case 97:
 			}
 break;
 case 99:
-#line 764 "gram.y"
+#line 758 "gram.y"
 {
 			    HLTQ_CONCAT(yyvsp[-2].member, yyvsp[0].member, entries);
 			    yyval.member = yyvsp[-2].member;
 			}
 break;
 case 100:
-#line 770 "gram.y"
+#line 764 "gram.y"
 {
 			    yyval.member = yyvsp[0].member;
 			    yyval.member->negated = false;
 			}
 break;
 case 101:
-#line 774 "gram.y"
+#line 768 "gram.y"
 {
 			    yyval.member = yyvsp[0].member;
 			    yyval.member->negated = true;
 			}
 break;
 case 102:
-#line 780 "gram.y"
+#line 774 "gram.y"
 {
 			    yyval.member = new_member(yyvsp[0].string, ALIAS);
 			    if (yyval.member == NULL) {
@@ -1981,7 +1975,7 @@ case 102:
 			}
 break;
 case 103:
-#line 787 "gram.y"
+#line 781 "gram.y"
 {
 			    yyval.member = new_member(NULL, ALL);
 			    if (yyval.member == NULL) {
@@ -1991,7 +1985,7 @@ case 103:
 			}
 break;
 case 104:
-#line 794 "gram.y"
+#line 788 "gram.y"
 {
 			    yyval.member = new_member(yyvsp[0].string, NETGROUP);
 			    if (yyval.member == NULL) {
@@ -2001,7 +1995,7 @@ case 104:
 			}
 break;
 case 105:
-#line 801 "gram.y"
+#line 795 "gram.y"
 {
 			    yyval.member = new_member(yyvsp[0].string, USERGROUP);
 			    if (yyval.member == NULL) {
@@ -2011,7 +2005,7 @@ case 105:
 			}
 break;
 case 106:
-#line 808 "gram.y"
+#line 802 "gram.y"
 {
 			    yyval.member = new_member(yyvsp[0].string, WORD);
 			    if (yyval.member == NULL) {
@@ -2021,28 +2015,28 @@ case 106:
 			}
 break;
 case 108:
-#line 818 "gram.y"
+#line 812 "gram.y"
 {
 			    HLTQ_CONCAT(yyvsp[-2].member, yyvsp[0].member, entries);
 			    yyval.member = yyvsp[-2].member;
 			}
 break;
 case 109:
-#line 824 "gram.y"
+#line 818 "gram.y"
 {
 			    yyval.member = yyvsp[0].member;
 			    yyval.member->negated = false;
 			}
 break;
 case 110:
-#line 828 "gram.y"
+#line 822 "gram.y"
 {
 			    yyval.member = yyvsp[0].member;
 			    yyval.member->negated = true;
 			}
 break;
 case 111:
-#line 834 "gram.y"
+#line 828 "gram.y"
 {
 			    yyval.member = new_member(yyvsp[0].string, ALIAS);
 			    if (yyval.member == NULL) {
@@ -2052,7 +2046,7 @@ case 111:
 			}
 break;
 case 112:
-#line 841 "gram.y"
+#line 835 "gram.y"
 {
 			    yyval.member = new_member(NULL, ALL);
 			    if (yyval.member == NULL) {
@@ -2062,7 +2056,7 @@ case 112:
 			}
 break;
 case 113:
-#line 848 "gram.y"
+#line 842 "gram.y"
 {
 			    yyval.member = new_member(yyvsp[0].string, WORD);
 			    if (yyval.member == NULL) {
@@ -2071,7 +2065,7 @@ case 113:
 			    }
 			}
 break;
-#line 2022 "gram.c"
+#line 2016 "gram.c"
    }
    yyssp -= yym;
    yystate = *yyssp;
--- a/plugins/sudoers/gram.y
+++ b/plugins/sudoers/gram.y
@@ -26,14 +26,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/group_plugin.c
+++ b/plugins/sudoers/group_plugin.c
@@ -20,14 +20,8 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/interfaces.c
+++ b/plugins/sudoers/interfaces.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/iolog.c
+++ b/plugins/sudoers/iolog.c
@@ -20,14 +20,8 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/iolog_path.c
+++ b/plugins/sudoers/iolog_path.c
@@ -18,14 +18,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/ldap.c
+++ b/plugins/sudoers/ldap.c
@@ -22,14 +22,8 @@
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/linux_audit.c
+++ b/plugins/sudoers/linux_audit.c
@@ -20,14 +20,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #include <errno.h>
 #include <fcntl.h>
 #include <string.h>
--- a/plugins/sudoers/locale.c
+++ b/plugins/sudoers/locale.c
@@ -18,14 +18,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/logging.c
+++ b/plugins/sudoers/logging.c
@@ -29,14 +29,8 @@
 #include <sys/ioctl.h>
 #include <sys/wait.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/logwrap.c
+++ b/plugins/sudoers/logwrap.c
@@ -18,14 +18,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/match.c
+++ b/plugins/sudoers/match.c
@@ -29,14 +29,8 @@
 # include <sys/systeminfo.h>
 #endif
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/match_addr.c
+++ b/plugins/sudoers/match_addr.c
@@ -26,14 +26,8 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/parse.c
+++ b/plugins/sudoers/parse.c
@@ -20,14 +20,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/policy.c
+++ b/plugins/sudoers/policy.c
@@ -20,14 +20,8 @@
 #include <sys/stat.h>
 #include <netinet/in.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/prompt.c
+++ b/plugins/sudoers/prompt.c
@@ -23,14 +23,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/pwutil.c
+++ b/plugins/sudoers/pwutil.c
@@ -23,14 +23,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/pwutil_impl.c
+++ b/plugins/sudoers/pwutil_impl.c
@@ -23,14 +23,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/redblack.c
+++ b/plugins/sudoers/redblack.c
@@ -45,14 +45,8 @@
 #include <sys/types.h>

 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */

 #include "sudoers.h"
 #include "redblack.h"
--- a/plugins/sudoers/regress/check_symbols/check_symbols.c
+++ b/plugins/sudoers/regress/check_symbols/check_symbols.c
@@ -18,14 +18,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/regress/iolog_path/check_iolog_path.c
+++ b/plugins/sudoers/regress/iolog_path/check_iolog_path.c
@@ -18,14 +18,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/regress/logging/check_wrap.c
+++ b/plugins/sudoers/regress/logging/check_wrap.c
@@ -18,14 +18,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/plugins/sudoers/regress/parser/check_addr.c
+++ b/plugins/sudoers/regress/parser/check_addr.c
@@ -19,14 +19,8 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #include <stdarg.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
--- a/plugins/sudoers/regress/parser/check_base64.c
+++ b/plugins/sudoers/regress/parser/check_base64.c
@@ -18,14 +18,8 @@

 #include <sys/types.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
--- a/Show More
+++ b/Show More