5 files changed, 49 insertions, 29 deletions
diff --git a/source4/include/db_wrap.h b/source4/include/db_wrap.h
index 50e3af68bd..6a12a1c9b2 100644
--- a/source4/include/db_wrap.h
+++ b/source4/include/db_wrap.h
@@ -20,7 +20,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-
 struct ldb_wrap {
 	struct ldb_context *ldb;
 
diff --git a/source4/include/includes.h b/source4/include/includes.h
index c4926ee7c5..a6a2354f67 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -73,26 +73,16 @@
 #endif
 
 #include <unistd.h>
-
 #include <sys/types.h>
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif
-
 #include <unistd.h>
 #include <stdio.h>
 #include <stddef.h>
+#include <stdlib.h>
 
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
 #endif
 
-#include <stdlib.h>
-
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
@@ -119,24 +109,12 @@
 
 #include <sys/stat.h>
 
-#ifdef HAVE_LIMITS_H
-#include <limits.h>
-#endif
-
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
 
-#ifdef HAVE_SYS_FILIO_H
-#include <sys/filio.h>
-#endif
-
 #include <signal.h>
 
-#ifdef HAVE_CTYPE_H
-#include <ctype.h>
-#endif
-
 #include <errno.h>
 
 #ifdef HAVE_SYS_MODE_H
@@ -152,8 +130,6 @@
 #include <varargs.h>
 #endif
 
-#include <sys/file.h>
-
 #ifdef HAVE_STROPTS_H
 #include <stropts.h>
 #endif
@@ -281,11 +257,11 @@ extern int errno;
 /* Lists, trees, caching, database... */
 #include "xfile.h"
 #include "dlinklist.h"
+#include "talloc.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/tdb/include/tdb.h"
 #include "lib/tdb/include/spinlock.h"
 #include "lib/tdb/include/tdbutil.h"
-#include "talloc.h"
 #include "db_wrap.h"
 #include "nt_status.h"
 #include "trans2.h"
diff --git a/source4/include/system/filesys.h b/source4/include/system/filesys.h
index d99f892995..d038d8c085 100644
--- a/source4/include/system/filesys.h
+++ b/source4/include/system/filesys.h
@@ -52,3 +52,9 @@
 #include <sys/statvfs.h>
 #endif
 
+#ifdef HAVE_SYS_FILIO_H
+#include <sys/filio.h>
+#endif
+
+#include <sys/file.h>
+
diff --git a/source4/include/system/iconv.h b/source4/include/system/iconv.h
index 76b767e2e8..c70fc6b242 100644
--- a/source4/include/system/iconv.h
+++ b/source4/include/system/iconv.h
@@ -29,3 +29,7 @@
 #endif
 #endif
 
+#ifdef HAVE_CTYPE_H
+#include <ctype.h>
+#endif
+
diff --git a/source4/include/system/resource.h b/source4/include/system/resource.h
new file mode 100644
index 0000000000..e95448e5b7
--- /dev/null
+++ b/source4/include/system/resource.h
@@ -0,0 +1,35 @@
+/* 
+   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
+