r3449: more include file reduction

the ldb part isn't ideal, I will have to think of a better solution

source/auth/pass_check.c

@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "system/passwd.h"
+#include "system/iconv.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH

source/client/clitar.c

@@ -38,6 +38,7 @@
 #include "includes.h"
 #include "clitar.h"
 #include "system/time.h"
+#include "system/iconv.h"
 
 /**
  Convert list of tokens to array; dependent on above routine.

source/include/db_wrap.h

@@ -20,7 +20,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-
 struct ldb_wrap {
 	struct ldb_context *ldb;
 

source/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>
-
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
 #include <stdlib.h>
 
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
 #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"

source/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>
+

source/include/system/iconv.h

@@ -29,3 +29,7 @@
 #endif
 #endif
 
+#ifdef HAVE_CTYPE_H
+#include <ctype.h>
+#endif
+

source/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
+

source/lib/genrand.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "system/iconv.h"
 
 static unsigned char hash[258];
 static uint32 counter;

source/lib/ldb/common/ldb_ldif.c

@@ -37,6 +37,7 @@
 */
 
 #include "includes.h"
+#include <ctype.h>
 
 
 /*

source/lib/ldb/common/ldb_parse.c

@@ -43,6 +43,7 @@
 
 #include "includes.h"
 #include "ldb/include/ldb_parse.h"
+#include <ctype.h>
 
 
 /*

source/lib/ldb/common/ldb_utf8.c

@@ -33,6 +33,7 @@
  */
 
 #include "includes.h"
+#include <ctype.h>
 
 /*
   TODO:

source/lib/ldb/include/includes.h

@@ -28,3 +28,11 @@
 #include "tdb.h"
 #include "proto.h"
 
+#ifdef HAVE_INTPTR_T
+#define discard_const(ptr) ((void *)((intptr_t)(ptr)))
+#else
+#define discard_const(ptr) ((void *)(ptr))
+#endif
+#define discard_const_p(type, ptr) ((type *)discard_const(ptr))
+
+

source/lib/socket/access.c

@@ -33,6 +33,7 @@
 
 #include "includes.h"
 #include "system/network.h"
+#include "system/iconv.h"
 
 #define	FAIL		(-1)
 #define ALLONES  ((uint32_t)0xFFFFFFFF)

source/lib/tdb/tools/tdbdump.c

@@ -37,6 +37,7 @@
 #else
 
 #include "includes.h"
+#include "system/iconv.h"
 
 #endif
 

source/lib/util.c

@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "system/network.h"
+#include "system/iconv.h"
 
 /**************************************************************************n
  Find a suitable temporary directory. The result should be copied immediately

source/lib/util_str.c

@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "system/iconv.h"
 
 /**
  * @file

source/lib/util_unistr.c

@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "system/iconv.h"
 
 /* these 2 tables define the unicode case handling.  They are loaded
    at startup either via mmap() or read() from the lib directory */

source/libcli/ldap/ldap.c

@@ -25,6 +25,7 @@
 
 #include "includes.h"
 #include "system/network.h"
+#include "system/iconv.h"
 
 /****************************************************************************
  *

source/libcli/ldap/ldap_ldif.c

@@ -24,6 +24,7 @@
 */
 
 #include "includes.h"
+#include "system/iconv.h"
 
 /****************************************************************************
  *

source/libcli/nmblib.c

@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "system/network.h"
 #include "system/time.h"
+#include "system/iconv.h"
 
 static const struct opcode_names {
 	const char *nmb_opcode_name;

source/ntvfs/posix/pvfs_shortname.c

@@ -22,6 +22,7 @@
 
 #include "include/includes.h"
 #include "vfs_posix.h"
+#include "system/iconv.h"
 
 /*
   this mangling scheme uses the following format

source/param/loadparm.c

@@ -54,6 +54,7 @@
 
 #include "includes.h"
 #include "system/time.h"
+#include "system/iconv.h"
 #include "librpc/gen_ndr/ndr_svcctl.h"
 
 BOOL in_client = False;		/* Not in the client by default */

source/param/params.c

@@ -80,6 +80,7 @@
  */
 
 #include "includes.h"
+#include "system/iconv.h"
 
 /* -------------------------------------------------------------------------- **
  * Constants...

source/torture/basic/utable.c

@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "system/iconv.h"
 
 BOOL torture_utable(void)
 {

source/utils/ndrdump.c

@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "system/iconv.h"
 
 static const struct dcerpc_interface_table *find_pipe(const char *pipe_name)
 {