9 files changed, 26 insertions, 44 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h
index c511a5fb33..ce8f81c539 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -172,14 +172,6 @@ struct ipv4_addr {
 	uint32_t s_addr;
 };
 
-#ifndef UINT8_MAX
-#define UINT8_MAX 255
-#endif
-
-#ifndef UINT16_MAX
-#define UINT16_MAX 65535
-#endif
-
 #ifndef MIN
 #define MIN(a,b) ((a)<(b)?(a):(b))
 #endif
diff --git a/source4/include/system/filesys.h b/source4/include/system/filesys.h
index 1ddb6b687c..07465c1c56 100644
--- a/source4/include/system/filesys.h
+++ b/source4/include/system/filesys.h
@@ -104,6 +104,20 @@
 #include <dlfcn.h>
 #endif
 
+#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif
+
+
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+
+
 #ifndef RTLD_LAZY
 #define RTLD_LAZY 0
 #endif
@@ -161,3 +175,8 @@
 #ifndef HAVE_RENAME
 int rename(const char *zfrom, const char *zto);
 #endif
+
+#ifndef UINT16_MAX
+#define UINT16_MAX 65535
+#endif
+
diff --git a/source4/include/system/resource.h b/source4/include/system/resource.h
deleted file mode 100644
index e95448e5b7..0000000000
--- a/source4/include/system/resource.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   resource system include wrappers
-
-   Copyright (C) Andrew Tridgell 2004
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif
-
-
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
-#ifdef HAVE_LIMITS_H
-#include <limits.h>
-#endif
-
diff --git a/source4/lib/replace.c b/source4/lib/replace.c
index 60faa473b6..35e0277c59 100644
--- a/source4/lib/replace.c
+++ b/source4/lib/replace.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "system/wait.h"
 #include "system/time.h"
+#include "system/network.h"
 
  void replace_dummy(void);
  void replace_dummy(void) {}
@@ -328,7 +329,7 @@ duplicate a string
 #ifndef WITH_PTHREADS
 /* REWRITE: not thread safe */
 #ifdef REPLACE_INET_NTOA
-char *rep_inet_ntoa(struct ipv4_addr ip)
+ char *rep_inet_ntoa(struct in_addr ip)
 {
 	uint8_t *p = (uint8_t *)&ip.s_addr;
 	static char buf[18];
diff --git a/source4/ntvfs/ipc/vfs_ipc.c b/source4/ntvfs/ipc/vfs_ipc.c
index f7eac65712..6b6dc97003 100644
--- a/source4/ntvfs/ipc/vfs_ipc.c
+++ b/source4/ntvfs/ipc/vfs_ipc.c
@@ -26,6 +26,7 @@
 
 
 #include "includes.h"
+#include "system/filesys.h"
 
 /* this is the private structure used to keep the state of an open
    ipc$ connection. It needs to keep information about all open
diff --git a/source4/ntvfs/posix/pvfs_open.c b/source4/ntvfs/posix/pvfs_open.c
index bc56962912..89da0f4b34 100644
--- a/source4/ntvfs/posix/pvfs_open.c
+++ b/source4/ntvfs/posix/pvfs_open.c
@@ -23,6 +23,7 @@
 #include "include/includes.h"
 #include "vfs_posix.h"
 #include "system/time.h"
+#include "system/filesys.h"
 
 /*
   create file handles with convenient numbers for sniffers
diff --git a/source4/ntvfs/posix/pvfs_read.c b/source4/ntvfs/posix/pvfs_read.c
index 1f89f01a03..0082f74212 100644
--- a/source4/ntvfs/posix/pvfs_read.c
+++ b/source4/ntvfs/posix/pvfs_read.c
@@ -22,6 +22,7 @@
 
 #include "include/includes.h"
 #include "vfs_posix.h"
+#include "system/filesys.h"
 
 /*
   read from a file
diff --git a/source4/ntvfs/posix/pvfs_search.c b/source4/ntvfs/posix/pvfs_search.c
index 18e22c2e98..0eb1573006 100644
--- a/source4/ntvfs/posix/pvfs_search.c
+++ b/source4/ntvfs/posix/pvfs_search.c
@@ -23,6 +23,7 @@
 #include "include/includes.h"
 #include "vfs_posix.h"
 #include "system/time.h"
+#include "system/filesys.h"
 
 
 /* the state of a search started with pvfs_search_first() */
diff --git a/source4/smb_server/conn.c b/source4/smb_server/conn.c
index cdfd3a0bcd..b3970b252c 100644
--- a/source4/smb_server/conn.c
+++ b/source4/smb_server/conn.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 
 /****************************************************************************
 init the tcon structures