Simplify #include's using gnulib modules.

diff --git a/configure.in b/configure.in
index 0a2c672094e8226ebe89f9d5500dc2993d90dc95..66a4144704320d370e84e55dcb0038e50dd4ce02 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -191,8 +191,7 @@ AC_MSG_RESULT([***
 
 AC_HEADER_STDC
 AC_HEADER_TIME
-AC_CHECK_HEADERS(unistd.h strings.h stddef.h alloca.h)
-AC_CHECK_HEADERS(sys/stat.h sys/types.h sys/socket.h)
+AC_CHECK_HEADERS(strings.h alloca.h)
 AC_CHECK_HEADERS(errno.h sys/time.h time.h)
 AC_CHECK_HEADERS(math.h limits.h float.h stdarg.h ctype.h)
 dnl opencdk

diff --git a/lib/defines.h b/lib/defines.h
index 0126e81c8ad9e7982ffdcb340d64b215b371a88f..68e766158ca3dec929892d0313e01fc9b6b05d3b 100644 (file)
--- a/lib/defines.h
+++ b/lib/defines.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
  *
  * Author: Nikos Mavroyanopoulos
  *
@@ -42,21 +42,10 @@
 typedef int ssize_t;
 #endif
 
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <sys/types.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/socket.h>
 
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>
@@ -69,10 +58,6 @@ typedef int ssize_t;
 # endif
 #endif
 
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
-
 #include "memmem.h"
 
 #define SIZEOF_UNSIGNED_LONG_INT SIZEOF_UNSIGNED_LONG