5 files changed, 50 insertions, 55 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h
index f45665ad05..c511a5fb33 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -349,14 +349,6 @@ typedef int (*comparison_fn_t)(const void *, const void *);
 #define INADDR_NONE 0xffffffff
 #endif
 
-#ifndef HAVE_CRYPT
-#define crypt ufc_crypt
-#endif
-
-#ifndef O_ACCMODE
-#define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR)
-#endif
-
 #if defined(HAVE_CRYPT16) && defined(HAVE_GETAUTHUID)
 #define ULTRIX_AUTH 1
 #endif
@@ -369,14 +361,6 @@ char *strdup(const char *s);
 void *memmove(void *dest,const void *src,int size);
 #endif
 
-#ifndef HAVE_INITGROUPS
-int initgroups(char *name,gid_t id);
-#endif
-
-#ifndef HAVE_RENAME
-int rename(const char *zfrom, const char *zto);
-#endif
-
 #ifndef HAVE_MKTIME
 time_t mktime(struct tm *t);
 #endif
@@ -417,47 +401,8 @@ int vasprintf(char **ptr, const char *format, va_list ap);
 #define bzero(a,b) memset((a),'\0',(b))
 #endif
 
-#ifdef REPLACE_GETPASS
-#define getpass(prompt) getsmbpass((prompt))
-#endif
-
-/*
- * Some older systems seem not to have MAXHOSTNAMELEN
- * defined.
- */
-#ifndef MAXHOSTNAMELEN
-#define MAXHOSTNAMELEN 254
-#endif
-
-/* yuck, I'd like a better way of doing this */
-#define DIRP_SIZE (256 + 32)
-
-/*
- * glibc on linux doesn't seem to have MSG_WAITALL
- * defined. I think the kernel has it though..
- */
-
-#ifndef MSG_WAITALL
-#define MSG_WAITALL 0
-#endif
-
-/* Load header file for dynamic linking stuff */
-#ifdef HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
 extern int DEBUGLEVEL;
 
-#ifndef RTLD_LAZY
-#define RTLD_LAZY 0
-#endif
-
-/* needed for some systems without iconv. Doesn't really matter
-   what error code we use */
-#ifndef EILSEQ
-#define EILSEQ EIO
-#endif
-
 /* add varargs prototypes with printf checking */
 #ifndef HAVE_SNPRINTF_DECL
 int snprintf(char *,size_t ,const char *, ...) PRINTF_ATTRIBUTE(3,4);
diff --git a/source4/include/system/filesys.h b/source4/include/system/filesys.h
index dc13e148e5..1ddb6b687c 100644
--- a/source4/include/system/filesys.h
+++ b/source4/include/system/filesys.h
@@ -99,6 +99,15 @@
 #include <sys/xattr.h>
 #endif
 
+/* Load header file for dynamic linking stuff */
+#ifdef HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#ifndef RTLD_LAZY
+#define RTLD_LAZY 0
+#endif
+
 
 /* Some POSIX definitions for those without */
  
@@ -145,3 +154,10 @@
 #define S_IXOTH 00001           /* execute permission: other */
 #endif
 
+#ifndef O_ACCMODE
+#define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR)
+#endif
+
+#ifndef HAVE_RENAME
+int rename(const char *zfrom, const char *zto);
+#endif
diff --git a/source4/include/system/iconv.h b/source4/include/system/iconv.h
index c70fc6b242..bace51c029 100644
--- a/source4/include/system/iconv.h
+++ b/source4/include/system/iconv.h
@@ -33,3 +33,9 @@
 #include <ctype.h>
 #endif
 
+/* needed for some systems without iconv. Doesn't really matter
+   what error code we use */
+#ifndef EILSEQ
+#define EILSEQ EIO
+#endif
+
diff --git a/source4/include/system/network.h b/source4/include/system/network.h
index 8b9fe0bcc5..d380245865 100644
--- a/source4/include/system/network.h
+++ b/source4/include/system/network.h
@@ -62,3 +62,19 @@
 #define inet_ntoa rep_inet_ntoa
 #endif
 
+/*
+ * glibc on linux doesn't seem to have MSG_WAITALL
+ * defined. I think the kernel has it though..
+ */
+#ifndef MSG_WAITALL
+#define MSG_WAITALL 0
+#endif
+
+/*
+ * Some older systems seem not to have MAXHOSTNAMELEN
+ * defined.
+ */
+#ifndef MAXHOSTNAMELEN
+#define MAXHOSTNAMELEN 254
+#endif
+
diff --git a/source4/include/system/passwd.h b/source4/include/system/passwd.h
index ba7fc93d37..215f53d138 100644
--- a/source4/include/system/passwd.h
+++ b/source4/include/system/passwd.h
@@ -52,3 +52,15 @@
 #include <compat.h>
 #endif
 
+#ifdef REPLACE_GETPASS
+#define getpass(prompt) getsmbpass((prompt))
+#endif
+
+#ifndef HAVE_INITGROUPS
+int initgroups(char *name,gid_t id);
+#endif
+
+#ifndef HAVE_CRYPT
+#define crypt ufc_crypt
+#endif
+