From 7ea9bf381b354cbf5e05ab89e0ee2009162bc09a Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Fri, 30 Apr 2010 18:56:03 +0200
Subject: [PATCH] maint: remove now-useless #if HAVE_HEADER_H guards

* src/system.h: Include <sys/wait.h> unconditionally,
now that gnulib guarantees its presence.
* lib/cmpbuf.c: Likewise for <unistd.h> and <inttypes.h>.
---
 lib/cmpbuf.c | 10 ++--------
 src/system.h |  4 +---
 2 files changed, 3 insertions(+), 11 deletions(-)

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