diff --git a/src/exec_intercept.c b/src/exec_intercept.c
index d09300efb..5dcf99718 100644
--- a/src/exec_intercept.c
+++ b/src/exec_intercept.c
@@ -25,6 +25,7 @@
 
 #include <sys/socket.h>
 #include <sys/uio.h>
+
 #if defined(HAVE_STDINT_H)
 # include <stdint.h>
 #elif defined(HAVE_INTTYPES_H)
diff --git a/src/exec_nopty.c b/src/exec_nopty.c
index 03bf854d0..a0853a910 100644
--- a/src/exec_nopty.c
+++ b/src/exec_nopty.c
@@ -25,6 +25,12 @@
 
 #include <sys/wait.h>
 #include <sys/socket.h>
+
+#if defined(HAVE_STDINT_H)
+# include <stdint.h>
+#elif defined(HAVE_INTTYPES_H)
+# include <inttypes.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -37,6 +43,7 @@
 #include "sudo_exec.h"
 #include "sudo_plugin.h"
 #include "sudo_plugin_int.h"
+#include "sudo_rand.h"
 
 /* Note that details and evbase must come first. */
 struct exec_closure_nopty {
diff --git a/src/exec_pty.c b/src/exec_pty.c
index b531be2ed..ed2171dee 100644
--- a/src/exec_pty.c
+++ b/src/exec_pty.c
@@ -28,6 +28,12 @@
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <sys/ioctl.h>
+
+#if defined(HAVE_STDINT_H)
+# include <stdint.h>
+#elif defined(HAVE_INTTYPES_H)
+# include <inttypes.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -41,6 +47,7 @@
 #include "sudo_exec.h"
 #include "sudo_plugin.h"
 #include "sudo_plugin_int.h"
+#include "sudo_rand.h"
 
 /* Evaluates to true if the event has /dev/tty as its fd. */
 #define USERTTY_EVENT(_ev)	(sudo_ev_get_fd((_ev)) == io_fds[SFD_USERTTY])
diff --git a/src/sudo_intercept_common.c b/src/sudo_intercept_common.c
index a5a9bc1d9..6b46d4d72 100644
--- a/src/sudo_intercept_common.c
+++ b/src/sudo_intercept_common.c
@@ -26,6 +26,11 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
+#if defined(HAVE_STDINT_H)
+# include <stdint.h>
+#elif defined(HAVE_INTTYPES_H)
+# include <inttypes.h>
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>