--- src/util.c.orig	Tue Mar  7 06:23:06 2000
+++ src/util.c	Thu Apr 20 03:00:00 2000
@@ -1,3 +1,4 @@
+#include "config.h"
 #include "gphoto.h"
 #include "util.h"
 #include <stdio.h>    
@@ -9,10 +10,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/dir.h>
+#ifdef HAVE_DIRENT_H
 #include <dirent.h>
-#ifdef __FreeBSD__
 #else
+#include <sys/dir.h>
+#endif
+#ifndef __FreeBSD__
 #include <sys/resource.h>
 #endif
 #ifdef linux