2 files changed, 21 insertions, 22 deletions
diff --git a/source4/include/system/filesys.h b/source4/include/system/filesys.h
index 589bf9b0d9..e81eec13e9 100644
--- a/source4/include/system/filesys.h
+++ b/source4/include/system/filesys.h
@@ -103,25 +103,11 @@
 #include <sys/xattr.h>
 #endif
 
-/* Load header file for dynamic linking stuff */
-#ifdef HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
 
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
 
-#ifdef HAVE_LIMITS_H
-#include <limits.h>
-#endif
-
-
-#ifndef RTLD_LAZY
-#define RTLD_LAZY 0
-#endif
-
-
 /* Some POSIX definitions for those without */
  
 #ifndef S_IFDIR
@@ -171,14 +157,6 @@
 #define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR)
 #endif
 
-#ifndef HAVE_RENAME
-int rename(const char *zfrom, const char *zto);
-#endif
-
-#ifndef HAVE_FTRUNCATE
-int ftruncate(int f,long l);
-#endif
-
 #ifndef MAXPATHLEN
 #define MAXPATHLEN 256
 #endif
diff --git a/source4/lib/replace/replace.h b/source4/lib/replace/replace.h
index 3ad348517d..572113af8c 100644
--- a/source4/lib/replace/replace.h
+++ b/source4/lib/replace/replace.h
@@ -80,6 +80,14 @@ unsigned long strtoul(const char *nptr, char **endptr, int base);
 int setenv(const char *name, const char *value, int overwrite); 
 #endif
 
+#ifndef HAVE_RENAME
+int rename(const char *zfrom, const char *zto);
+#endif
+
+#ifndef HAVE_FTRUNCATE
+int ftruncate(int f,long l);
+#endif
+
 #ifndef HAVE_VASPRINTF_DECL
 int vasprintf(char **ptr, const char *format, va_list ap);
 #endif
@@ -132,13 +140,26 @@ int asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3);
 typedef int (*comparison_fn_t)(const void *, const void *);
 #endif
 
+/* Load header file for dynamic linking stuff */
 #ifdef HAVE_DLFCN_H
 #include <dlfcn.h>
 #endif
 
+#ifndef RTLD_LAZY
+#define RTLD_LAZY 0
+#endif
+
 #ifndef HAVE_SECURE_MKSTEMP
 #define mkstemp(path) rep_mkstemp(path)
 int rep_mkstemp(char *temp);
 #endif
 
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+
+#ifndef HOST_NAME_MAX
+#define HOST_NAME_MAX 64
+#endif
+
 #endif