Index: ossp-pkg/uuid/uuid.ac
RCS File: /v/ossp/cvs/ossp-pkg/uuid/Attic/uuid.ac,v
rcsdiff -q -kk '-r1.4' '-r1.5' -u '/v/ossp/cvs/ossp-pkg/uuid/Attic/uuid.ac,v' 2>/dev/null
--- uuid.ac	2004/01/10 21:47:45	1.4
+++ uuid.ac	2004/01/11 08:27:18	1.5
@@ -68,9 +68,19 @@
     AC_CHECK_LIB(inet6, getaddrinfo)
 
     dnl #   check for system headers
-    AC_CHECK_HEADERS(string.h sys/types.h sys/socket.h netdb.h netinet/in.h dnl
-                     ifaddrs.h net/if_dl.h net/if_arp.h net/if.h sys/ioctl.h dnl
-                     sys/sockio.h arpa/inet.h)
+    AC_CHECK_HEADERS(sys/types.h sys/param.h sys/time.h sys/socket.h sys/sockio.h sys/ioctl.h)
+    AC_CHECK_HEADERS(netdb.h ifaddrs.h net/if.h net/if_dl.h net/if_arp.h netinet/in.h arpa/inet.h,,,
+[[
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#if HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#if HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+]])
 
     dnl #   check for functions
     AC_CHECK_FUNCS(getifaddrs nanosleep)
Index: ossp-pkg/uuid/uuid_mac.c
RCS File: /v/ossp/cvs/ossp-pkg/uuid/Attic/uuid_mac.c,v
rcsdiff -q -kk '-r1.3' '-r1.4' -u '/v/ossp/cvs/ossp-pkg/uuid/Attic/uuid_mac.c,v' 2>/dev/null
--- uuid_mac.c	2004/01/10 19:17:39	1.3
+++ uuid_mac.c	2004/01/11 08:27:18	1.4
@@ -34,14 +34,18 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/param.h>
-#include <time.h>
-#include <sys/time.h>
 #include <fcntl.h>
 #include <time.h>
+
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
-
+#endif
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif