diff --git a/lib/cmpbuf.c b/lib/cmpbuf.c
index 02cccf3..7413210 100644
--- a/lib/cmpbuf.c
+++ b/lib/cmpbuf.c
@@ -30,14 +30,8 @@
 # endif
 #endif
 
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-
+#include <unistd.h>
+#include <inttypes.h>
 #include <sys/types.h>
 #include "cmpbuf.h"
 #include "intprops.h"
diff --git a/src/system.h b/src/system.h
index f242527..8942296 100644
--- a/src/system.h
+++ b/src/system.h
@@ -53,9 +53,7 @@
 #include <fcntl.h>
 #include <time.h>
 
-#if HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
+#include <sys/wait.h>
 #ifndef WEXITSTATUS
 # define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
 #endif