- Added (untested) Entropy Gathering Daemon (EGD) support
 - Merged several minor fixed:
   - ssh-agent commandline parsing
   - RPM spec file now installs ssh setuid root
   - Makefile creates libdir
   - Merged beginnings of Solaris compability from Marc G. Fournier
     <marc.fournier@acadiau.ca>
diff --git a/includes.h b/includes.h
index a1a6da6..198e729 100644
--- a/includes.h
+++ b/includes.h
@@ -37,7 +37,6 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 
-#include <endian.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
@@ -52,13 +51,18 @@
 #include <grp.h>
 #include <unistd.h>
 #include <time.h>
-#include <paths.h>
 #include <dirent.h>
 
-#include "version.h"
-
 #include "config.h"
 
+#ifdef HAVE_PATHS_H
+# include <paths.h>
+#endif 
+#ifdef HAVE_ENDIAN_H
+# include <endian.h>
+#endif
+
+#include "version.h"
 #include "helper.h"
 #include "mktemp.h"
 #include "strlcpy.h"