We no longer need to include headers we don't use for sudo*.h files.

Previously we needed to include headers required by the various
sudo*h files.  Now those files are more self-sufficient and we
should only include headers needed by code in the various .c files.

lib/iolog/host_port.c

@@ -18,17 +18,13 @@
 
 #include "config.h"
 
-#include <sys/types.h>
-
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>
 #else
 # include "compat/stdbool.h"
 #endif /* HAVE_STDBOOL_H */
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 
 #include "sudo_gettext.h"	/* must be included before sudo_compat.h */
 #include "sudo_compat.h"

lib/iolog/iolog_fileio.c

@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -42,8 +41,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
-#include <pwd.h>
-#include <grp.h>
 
 #include "sudo_gettext.h"	/* must be included before sudo_compat.h */
 #include "sudo_compat.h"

lib/iolog/iolog_json.c

@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STDBOOL_H
@@ -39,7 +38,6 @@
 #endif /* HAVE_STRINGS_H */
 #include <unistd.h>
 #include <ctype.h>
-#include <errno.h>
 #include <limits.h>
 #include <fcntl.h>
 #include <time.h>

lib/iolog/iolog_path.c

@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STDBOOL_H
@@ -37,8 +36,6 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#include <pwd.h>
-#include <grp.h>
 #include <limits.h>
 #include <time.h>
 #include <unistd.h>

lib/iolog/iolog_util.c

@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STDBOOL_H

lib/iolog/regress/host_port/host_port_test.c

@@ -18,7 +18,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STRING_H

lib/iolog/regress/iolog_json/check_iolog_json.c

@@ -18,7 +18,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STRING_H

lib/iolog/regress/iolog_path/check_iolog_path.c

@@ -18,7 +18,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STRING_H

lib/iolog/regress/iolog_util/check_iolog_util.c

@@ -18,7 +18,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STRING_H

lib/util/aix.c

@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <sys/resource.h>
 
 #include <stdio.h>

lib/util/arc4random.c

@@ -34,8 +34,6 @@
 
 #ifndef HAVE_ARC4RANDOM
 
-#include <sys/types.h>
-#include <sys/time.h>
 #ifdef HAVE_SYS_RANDOM_H
 # include <sys/random.h>
 #endif

lib/util/arc4random_buf.c

@@ -25,7 +25,6 @@
 
 #ifndef HAVE_ARC4RANDOM_BUF
 
-#include <sys/types.h>
 #include <stdlib.h>
 #if defined(HAVE_STDINT_H)
 # include <stdint.h>

lib/util/arc4random_uniform.c

@@ -27,7 +27,6 @@
 
 #ifndef HAVE_ARC4RANDOM_UNIFORM
 
-#include <sys/types.h>
 #include <stdlib.h>
 #if defined(HAVE_STDINT_H)
 # include <stdint.h>

lib/util/cfmakeraw.c

@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <termios.h>
 
 #include "sudo_compat.h"

lib/util/closefrom.c

@@ -26,12 +26,10 @@
 
 #ifndef HAVE_CLOSEFROM
 
-#include <sys/types.h>
+#include <errno.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <fcntl.h>
 #include <limits.h>
+#include <unistd.h>
 #ifdef HAVE_PSTAT_GETPROC
 # include <sys/pstat.h>
 #else

lib/util/digest.c

@@ -23,23 +23,13 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-
-#include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif /* HAVE_STRING_H */
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif /* HAVE_STRINGS_H */
 #if defined(HAVE_STDINT_H)
 # include <stdint.h>
 #elif defined(HAVE_INTTYPES_H)
 # include <inttypes.h>
 #endif
 #include <unistd.h>
-#include <fcntl.h>
 #include <errno.h>
 
 #include "sudo_compat.h"

lib/util/digest_gcrypt.c

@@ -23,9 +23,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-
-#include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
@@ -33,8 +30,6 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#include <unistd.h>
-#include <fcntl.h>
 #include <errno.h>
 
 #include <gcrypt.h>

lib/util/digest_openssl.c

@@ -23,18 +23,7 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-
-#include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif /* HAVE_STRING_H */
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif /* HAVE_STRINGS_H */
-#include <unistd.h>
-#include <fcntl.h>
 #include <errno.h>
 
 #include <openssl/sha.h>

lib/util/dup3.c

@@ -25,8 +25,6 @@
 
 #ifndef HAVE_DUP3
 
-#include <sys/types.h>
-
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>

lib/util/event_poll.c

@@ -23,25 +23,11 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <sys/resource.h>
-#include <stdio.h>
+
 #include <stdlib.h>
-#ifdef HAVE_STDBOOL_H
-# include <stdbool.h>
-#else
-# include "compat/stdbool.h"
-#endif /* HAVE_STDBOOL_H */
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif /* HAVE_STRING_H */
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif /* HAVE_STRINGS_H */
-#include <time.h>
-#include <unistd.h>
-#include <errno.h>
 #include <poll.h>
+#include <time.h>
 
 #include "sudo_compat.h"
 #include "sudo_util.h"

lib/util/event_select.c

@@ -31,13 +31,7 @@
 #ifdef HAVE_SYS_SELECT_H
 # include <sys/select.h>
 #endif /* HAVE_SYS_SELECT_H */
-#include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_STDBOOL_H
-# include <stdbool.h>
-#else
-# include "compat/stdbool.h"
-#endif /* HAVE_STDBOOL_H */
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
@@ -45,8 +39,6 @@
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
 #include <time.h>
-#include <unistd.h>
-#include <errno.h>
 
 #include "sudo_compat.h"
 #include "sudo_util.h"

lib/util/fatal.c

@@ -24,8 +24,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-
 #include <errno.h>
 #include <netdb.h>
 #include <stdio.h>

lib/util/fchmodat.c

@@ -25,8 +25,6 @@
 
 #include <sys/stat.h>
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>

lib/util/fnmatch.c

@@ -99,9 +99,6 @@
 
 #ifndef HAVE_FNMATCH
 
-#include <sys/types.h>
-
-#include <stdio.h>
 #include <ctype.h>
 #ifdef HAVE_STRING_H
 # include <string.h>

lib/util/fstatat.c

@@ -25,8 +25,6 @@
 
 #include <sys/stat.h>
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <fcntl.h>
 #include <unistd.h>
 

lib/util/getaddrinfo.c

@@ -37,7 +37,6 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STRING_H
 # include <string.h>

lib/util/getcwd.c

@@ -37,7 +37,6 @@
 #include <sys/stat.h>
 
 #include <errno.h>
-#include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
@@ -45,8 +44,8 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#include <unistd.h>
 #include <dirent.h>
+#include <limits.h>
 
 #include "sudo_compat.h"
 
@@ -133,7 +132,7 @@ sudo_getcwd(char *pt, size_t size)
 			 * path to the beginning of the buffer, but it's always
 			 * been that way and stuff would probably break.
 			 */
-			bcopy(bpt, pt, ept - bpt);
+			memcpy(pt, bpt, ept - bpt);
 			free(up);
 			return pt;
 		}
@@ -183,7 +182,7 @@ sudo_getcwd(char *pt, size_t size)
 					goto notfound;
 				if (ISDOT(dp))
 					continue;
-				bcopy(dp->d_name, bup, NAMLEN(dp) + 1);
+				memcpy(bup, dp->d_name, NAMLEN(dp) + 1);
 
 				/* Save the first error for later. */
 				if (lstat(up, &s)) {
@@ -216,13 +215,13 @@ sudo_getcwd(char *pt, size_t size)
 			pt = npt;
 			bpt = pt + off;
 			ept = pt + ptsize;
-			bcopy(bpt, ept - len, len);
+			memcpy(ept - len, bpt, len);
 			bpt = ept - len;
 		}
 		if (!first)
 			*--bpt = '/';
 		bpt -= NAMLEN(dp);
-		bcopy(dp->d_name, bpt, NAMLEN(dp));
+		memcpy(bpt, dp->d_name, NAMLEN(dp));
 		(void)closedir(dir);
 
 		/* Truncate any file name. */

lib/util/getdelim.c

@@ -25,8 +25,6 @@
 
 #ifndef HAVE_GETDELIM
 
-#include <sys/types.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STRING_H

lib/util/getgrouplist.c

@@ -24,8 +24,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-#include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STRING_H
 # include <string.h>

lib/util/gethostname.c

@@ -23,8 +23,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 

lib/util/getopt_long.c

@@ -59,8 +59,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-#include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STRING_H
 # include <string.h>

lib/util/gettime.c

@@ -23,13 +23,8 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <sys/time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <time.h>
-#include <errno.h>
 
 #if defined(__MACH__) && !defined(HAVE_CLOCK_GETTIME)
 # include <mach/mach.h>

lib/util/getusershell.c

@@ -23,13 +23,9 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
-#include <errno.h>
 
 #define DEFAULT_TEXT_DOMAIN     "sudo"
 #include "sudo_gettext.h"       /* must be included before sudo_compat.h */

lib/util/gidlist.c

@@ -23,9 +23,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-
-#include <stdio.h>
 #include <stdlib.h>
 #include <grp.h>
 

lib/util/glob.c

@@ -56,7 +56,6 @@
 
 #ifndef HAVE_GLOB
 
-#include <sys/types.h>
 #include <sys/stat.h>
 
 #include <stdio.h>

lib/util/isblank.c

@@ -26,8 +26,6 @@
 
 #ifndef HAVE_ISBLANK
 
-#include <sys/types.h>
-
 #include "sudo_compat.h"
 
 #undef isblank

lib/util/json.c

@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STDBOOL_H
@@ -37,10 +36,6 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#include <unistd.h>
-#include <stdarg.h>
-#include <time.h>
-#include <ctype.h>
 
 #define DEFAULT_TEXT_DOMAIN	"sudo"
 #include "sudo_gettext.h"	/* must be included before sudo_compat.h */

lib/util/key_val.c

@@ -23,9 +23,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-
-#include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STRING_H
 # include <string.h>

lib/util/lbuf.c

@@ -23,8 +23,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-#include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
@@ -32,7 +30,6 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#include <unistd.h>
 #include <ctype.h>
 
 #include "sudo_compat.h"

lib/util/locking.c

@@ -28,7 +28,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <stdlib.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
@@ -41,7 +40,6 @@
 #else
 # include "compat/stdbool.h"
 #endif
-#include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>

lib/util/logfac.c

@@ -28,9 +28,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
 

lib/util/logpri.c

@@ -28,9 +28,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
 

lib/util/memset_s.c

@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <stddef.h>
 #include <errno.h>
 #include <limits.h>

lib/util/mkdir_parents.c

@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -41,8 +40,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <pwd.h>
-#include <grp.h>
 
 #define DEFAULT_TEXT_DOMAIN	"sudo"
 #include "sudo_gettext.h"	/* must be included before sudo_compat.h */

lib/util/mksiglist.c

@@ -24,9 +24,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-
-#include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
 

lib/util/mksigname.c

@@ -24,9 +24,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-
-#include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
 

lib/util/mktemp.c

@@ -26,8 +26,6 @@
 
 #if !defined(HAVE_MKSTEMPS) || !defined(HAVE_MKDTEMP)
 
-#include <sys/types.h>
-#include <sys/time.h>
 #include <sys/stat.h>
 
 #include <errno.h>
@@ -50,7 +48,6 @@
 #endif /* HAVE_STRINGS_H */
 #include <ctype.h>
 #include <unistd.h>
-#include <time.h>
 
 #include "sudo_compat.h"
 #include "sudo_rand.h"

lib/util/openat.c

@@ -23,8 +23,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <fcntl.h>
 #include <unistd.h>
 

lib/util/parseln.c

@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STRING_H
@@ -33,8 +32,6 @@
 # include <strings.h>
 #endif /* HAVE_STRING_H */
 #include <ctype.h>
-#include <unistd.h>
-#include <fcntl.h>
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>
 #else

lib/util/pipe2.c

@@ -25,8 +25,6 @@
 
 #ifndef HAVE_PIPE2
 
-#include <sys/types.h>
-
 #include <fcntl.h>
 #include <unistd.h>
 

lib/util/progname.c

@@ -23,8 +23,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-#include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STRING_H
 # include <string.h>

lib/util/pw_dup.c

@@ -30,9 +30,6 @@
 
 #ifndef HAVE_PW_DUP
 
-#include <sys/types.h>
-
-#include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STRING_H
 # include <string.h>

lib/util/reallocarray.c

@@ -26,7 +26,6 @@
 
 #ifndef HAVE_REALLOCARRAY
 
-#include <sys/types.h>
 #include <stdlib.h>
 #if defined(HAVE_STDINT_H)
 # include <stdint.h>

lib/util/regress/fnmatch/fnm_test.c

@@ -6,7 +6,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STRING_H

lib/util/regress/getgrouplist/getgrouplist_test.c

@@ -18,7 +18,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STRING_H

lib/util/regress/glob/globtest.c

@@ -6,7 +6,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STRING_H

lib/util/regress/mktemp/mktemp_test.c

@@ -10,14 +10,11 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 
 #include <errno.h>
 #include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

lib/util/regress/parse_gids/parse_gids_test.c

@@ -18,7 +18,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STRING_H
@@ -27,11 +26,6 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_STDBOOL_H
-# include <stdbool.h>
-#else
-# include "compat/stdbool.h"
-#endif
 
 #include "sudo_compat.h"
 #include "sudo_fatal.h"

lib/util/regress/progname/progname_test.c

@@ -18,7 +18,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STRING_H
@@ -27,11 +26,6 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_STDBOOL_H
-# include <stdbool.h>
-#else
-# include "compat/stdbool.h"
-#endif
 
 #include "sudo_compat.h"
 #include "sudo_util.h"

lib/util/regress/strsig/strsig_test.c

@@ -18,16 +18,10 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <string.h>
-#ifdef HAVE_STDBOOL_H
-# include <stdbool.h>
-#else
-# include "compat/stdbool.h"
-#endif
 
 #include "sudo_compat.h"
 #include "sudo_util.h"

lib/util/regress/strsplit/strsplit_test.c

@@ -18,7 +18,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STRING_H
@@ -27,11 +26,6 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_STDBOOL_H
-# include <stdbool.h>
-#else
-# include "compat/stdbool.h"
-#endif
 
 #include "sudo_compat.h"
 #include "sudo_fatal.h"

lib/util/regress/strtofoo/strtobool_test.c

@@ -18,7 +18,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STDBOOL_H

lib/util/regress/strtofoo/strtoid_test.c

@@ -18,7 +18,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>

lib/util/regress/strtofoo/strtomode_test.c

@@ -18,7 +18,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 

lib/util/regress/strtofoo/strtonum_test.c

@@ -18,7 +18,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>

lib/util/regress/sudo_conf/conf_test.c

@@ -18,7 +18,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STRING_H
@@ -27,11 +26,6 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_STDBOOL_H
-# include <stdbool.h>
-#else
-# include "compat/stdbool.h"
-#endif
 
 #include "sudo_compat.h"
 #include "sudo_conf.h"

lib/util/regress/sudo_parseln/parseln_test.c

@@ -18,7 +18,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STRING_H
@@ -27,11 +26,6 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_STDBOOL_H
-# include <stdbool.h>
-#else
-# include "compat/stdbool.h"
-#endif
 
 #include "sudo_compat.h"
 #include "sudo_util.h"

lib/util/regress/tailq/hltq_test.c

@@ -18,7 +18,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
@@ -28,11 +27,6 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_STDBOOL_H
-# include <stdbool.h>
-#else
-# include "compat/stdbool.h"
-#endif
 
 #include "sudo_compat.h"
 #include "sudo_fatal.h"

lib/util/regress/vsyslog/vsyslog_test.c

@@ -18,7 +18,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -28,11 +27,6 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_STDBOOL_H
-# include <stdbool.h>
-#else
-# include "compat/stdbool.h"
-#endif
 #include <errno.h>
 
 #include "sudo_compat.h"

lib/util/roundup.c

@@ -18,8 +18,6 @@
 
 #include "config.h"
 
-#include <sys/types.h>
-
 #include "sudo_compat.h"
 #include "sudo_debug.h"
 #include "sudo_util.h"

lib/util/secure_path.c

@@ -23,17 +23,13 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <stdio.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#include <unistd.h>
-#include <errno.h>
 
 #include "sudo_compat.h"
 #include "sudo_util.h"

lib/util/setgroups.c

@@ -24,8 +24,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
 #include <grp.h>

lib/util/sha2.c

@@ -32,9 +32,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

lib/util/sig2str.c

@@ -25,11 +25,7 @@
 
 #ifndef HAVE_SIG2STR
 
-#include <sys/types.h>
-
 #include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

lib/util/snprintf.c

@@ -47,7 +47,6 @@
     !defined(HAVE_VASPRINTF) || !defined(HAVE_ASPRINTF) || \
     defined(PREFER_PORTABLE_SNPRINTF)
 
-#include <sys/types.h>
 #include <sys/mman.h>
 
 #include <errno.h>

lib/util/str2sig.c

@@ -25,11 +25,7 @@
 
 #ifndef HAVE_STR2SIG
 
-#include <sys/types.h>
-
 #include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

lib/util/strlcat.c

@@ -28,7 +28,6 @@
 
 #ifndef HAVE_STRLCAT
 
-#include <sys/types.h>
 #include <string.h>
 
 #include "sudo_compat.h"

lib/util/strlcpy.c

@@ -28,7 +28,7 @@
 
 #ifndef HAVE_STRLCPY
 
-#include <sys/types.h>
+#include <string.h>
 
 #include "sudo_compat.h"
 

lib/util/strndup.c

@@ -27,8 +27,6 @@
 
 #ifndef HAVE_STRNDUP
 
-#include <sys/types.h>
-
 #include <stdlib.h>
 #ifdef HAVE_STRING_H
 # include <string.h>

lib/util/strsignal.c

@@ -25,9 +25,6 @@
 
 #ifndef HAVE_STRSIGNAL
 
-#include <sys/types.h>
-
-#include <stdio.h>
 #include <signal.h>
 
 #define DEFAULT_TEXT_DOMAIN	"sudo"

lib/util/strsplit.c

@@ -23,13 +23,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <grp.h>
-
 #include "sudo_compat.h"
 #include "sudo_debug.h"
 #include "sudo_util.h"

lib/util/strtobool.c

@@ -23,10 +23,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-
-#include <stdio.h>
-#include <stdlib.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif /* HAVE_STRING_H */

lib/util/strtoid.c

@@ -23,15 +23,8 @@
 
 #include <config.h>
 
-#include <sys/types.h>
+#include <sys/types.h>			/* for id_t */
 
-#include <stdio.h>
-#include <stdlib.h>
-#if defined(HAVE_STDINT_H)
-# include <stdint.h>
-#elif defined(HAVE_INTTYPES_H)
-# include <inttypes.h>
-#endif
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>
 #else

lib/util/strtomode.c

@@ -23,10 +23,8 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <sys/stat.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 

lib/util/strtonum.c

@@ -23,19 +23,8 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-
 #include <ctype.h>
 #include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif /* HAVE_STRING_H */
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif /* HAVE_STRINGS_H */
 
 #define DEFAULT_TEXT_DOMAIN	"sudo"
 #include "sudo_gettext.h"	/* must be included before sudo_compat.h */

lib/util/sudo_conf.c

@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #include <stdlib.h>

lib/util/sudo_debug.c

@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/uio.h>
 #include <stdio.h>

lib/util/sudo_dso.c

@@ -23,8 +23,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STRING_H

lib/util/term.c

@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <sys/ioctl.h>
 #include <stdio.h>
 #include <stdlib.h>

lib/util/ttysize.c

@@ -23,9 +23,7 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <sys/ioctl.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <termios.h>		/* for struct winsize on HP-UX */

lib/util/unlinkat.c

@@ -23,8 +23,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <fcntl.h>
 #include <unistd.h>
 

lib/util/utimens.c

@@ -25,10 +25,8 @@
 
 #if !defined(HAVE_FUTIMENS) || !defined(HAVE_UTIMENSAT)
 
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <stdio.h>
 #include <errno.h>
 #include <time.h>
 #if !defined(HAVE_UTIMES) || defined(HAVE_FUTIME)

lib/util/uuid.c

@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <stdlib.h>
 #if defined(HAVE_STDINT_H)
 # include <stdint.h>

plugins/audit_json/audit_json.c

@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 
@@ -42,8 +41,6 @@
 #endif /* HAVE_STRINGS_H */
 #include <signal.h>
 #include <unistd.h>
-#include <ctype.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <time.h>

plugins/group_file/getgrent.c

@@ -27,7 +27,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STRING_H
@@ -38,7 +37,6 @@
 #endif /* HAVE_STRINGS_H */
 #include <fcntl.h>
 #include <limits.h>
-#include <pwd.h>
 #include <grp.h>
 
 #include "sudo_compat.h"

plugins/group_file/group_file.c

@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <sys/stat.h>
 
 #include <stdio.h>
@@ -40,12 +39,9 @@
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
 #include <unistd.h>
-#include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <limits.h>
 #include <grp.h>
-#include <pwd.h>
 
 #include "sudo_plugin.h"
 #include "sudo_compat.h"

plugins/group_file/plugin_test.c

@@ -21,8 +21,6 @@
  * PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
  */
 
-#include <sys/types.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -32,7 +30,6 @@
 #include <dlfcn.h>
 #include <errno.h>
 #include <limits.h>
-#include <pwd.h>
 
 #include "sudo_plugin.h"
 

plugins/python/regress/testhelpers.h

@@ -19,8 +19,6 @@
 #ifndef PYTHON_TESTHELPERS
 #define PYTHON_TESTHELPERS
 
-#include <sys/wait.h>
-
 #include "iohelpers.h"
 
 #include "../pyhelpers.h"

plugins/python/sudo_python_debug.h

@@ -19,7 +19,6 @@
 #ifndef SUDO_PYTHON_DEBUG_H
 #define SUDO_PYTHON_DEBUG_H
 
-#include <sys/types.h>
 #include "sudo_debug.h"
 
 /*

plugins/sample/sample_plugin.c

@@ -23,10 +23,10 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STDBOOL_H
@@ -41,12 +41,10 @@
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
 #include <unistd.h>
-#include <ctype.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <grp.h>
 #include <pwd.h>
-#include <stdarg.h>
 
 #include <pathnames.h>
 #include "sudo_compat.h"