--- apr-1.2.2/misc/unix/rand.c.orig Wed Nov 2 20:17:10 2005 +++ apr-1.2.2/misc/unix/rand.c Wed Nov 2 20:17:43 2005 @@ -35,11 +35,10 @@ #if APR_HAVE_SYS_UN_H #include #endif -#ifdef HAVE_UUID_UUID_H -#include -#endif #ifdef HAVE_UUID_H #include +#elif defined(HAVE_UUID_UUID_H) +#include #endif #ifndef SHUT_RDWR