diff --git a/bootstrap.conf b/bootstrap.conf
index aa1e8c3..2f104b3 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -55,9 +55,11 @@ progname
 propername
 regex
 sh-quote
+signal
 sigprocmask
 stat-macros
 stat-time
+stdint
 strcase
 strftime
 strptime
diff --git a/lib/cmpbuf.c b/lib/cmpbuf.c
index 7413210..96ef249 100644
--- a/lib/cmpbuf.c
+++ b/lib/cmpbuf.c
@@ -20,28 +20,14 @@
 
 #include <errno.h>
 #include <limits.h>
-
 #include <signal.h>
-#ifndef SA_RESTART
-# ifdef SA_INTERRUPT /* e.g. SunOS 4.1.x */
-#  define SA_RESTART SA_INTERRUPT
-# else
-#  define SA_RESTART 0
-# endif
-#endif
-
 #include <unistd.h>
+#include <stdint.h>
 #include <inttypes.h>
 #include <sys/types.h>
 #include "cmpbuf.h"
 #include "intprops.h"
 
-#ifndef PTRDIFF_MAX
-# define PTRDIFF_MAX TYPE_MAXIMUM (ptrdiff_t)
-#endif
-#ifndef SIZE_MAX
-# define SIZE_MAX TYPE_MAXIMUM (size_t)
-#endif
 #ifndef SSIZE_MAX
 # define SSIZE_MAX TYPE_MAXIMUM (ssize_t)
 #endif
diff --git a/src/system.h b/src/system.h
index 8942296..785a1e9 100644
--- a/src/system.h
+++ b/src/system.h
@@ -54,12 +54,6 @@
 #include <time.h>
 
 #include <sys/wait.h>
-#ifndef WEXITSTATUS
-# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
-#endif
-#ifndef WIFEXITED
-# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
-#endif
 
 #include <dirent.h>
 #ifndef _D_EXACT_NAMLEN
@@ -111,13 +105,6 @@ int strcasecmp (char const *, char const *);
 #include <errno.h>
 
 #include <signal.h>
-#ifndef SA_RESTART
-# ifdef SA_INTERRUPT /* e.g. SunOS 4.1.x */
-#  define SA_RESTART SA_INTERRUPT
-# else
-#  define SA_RESTART 0
-# endif
-#endif
 #if !defined SIGCHLD && defined SIGCLD
 # define SIGCHLD SIGCLD
 #endif