s3-build: avoid to globally include printing and spoolss headers.

[vlendec/samba-autobuild/.git] / source3 / include / includes.h

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 192b9a0bdb0b81e9562522650be2d30b3a313c03..2573585f6edfdd996ec7c68ecdcee567fc74ebbe 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -440,6 +440,14 @@ typedef long blksize_t;
 typedef long blkcnt_t;
 #endif
 
+#ifndef HAVE_STRUCT_TIMESPEC
+struct timespec {
+       time_t tv_sec;            /* Seconds.  */
+       long tv_nsec;           /* Nanoseconds.  */
+};
+#endif
+
+
 /*
  * Type for stat structure.
  */
@@ -552,13 +560,6 @@ typedef struct stat_ex SMB_STRUCT_STAT;
 #  endif
 #endif
 
-#ifndef HAVE_STRUCT_TIMESPEC
-struct timespec {
-       time_t tv_sec;            /* Seconds.  */
-       long tv_nsec;           /* Nanoseconds.  */
-};
-#endif
-
 enum timestamp_set_resolution {
        TIMESTAMP_SET_SECONDS = 0,
        TIMESTAMP_SET_MSEC,
@@ -601,7 +602,6 @@ typedef char fstring[FSTRING_LEN];
 
 /* Samba 3 doesn't use iconv_convenience: */
 extern void *cmdline_lp_ctx;
-struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 
 /* Lists, trees, caching, database... */
 #include "../lib/util/util.h"
@@ -626,15 +626,15 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "../lib/util/time.h"
 #include "../lib/util/asn1.h"
 
+#include "krb5_env.h"
+#include "libads/ads_status.h"
 #include "ads.h"
-#include "ads_dns.h"
 #include "interfaces.h"
 #include "trans2.h"
 #include "../libcli/util/error.h"
 #include "ntioctl.h"
 #include "../lib/util/charset/charset.h"
 #include "dynconfig.h"
-#include "util_getent.h"
 #include "debugparse.h"
 #include "privileges.h"
 #include "messages.h"
@@ -648,32 +648,15 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "privileges.h"
 #include "rpc_misc.h"
 #include "rpc_dce.h"
-#include "../librpc/gen_ndr/schannel.h"
 #include "mapping.h"
 #include "passdb.h"
-#include "rpc_secdes.h"
-#include "../libgpo/gpo.h"
 #include "msdfs.h"
-#include "rap.h"
-#include "../lib/crypto/md5.h"
-#include "../lib/crypto/md4.h"
-#include "../lib/crypto/arcfour.h"
-#include "../lib/crypto/crc32.h"
-#include "../lib/crypto/hmacmd5.h"
 
 struct ntlmssp_state;
 
 #include "auth.h"
 #include "ntdomain.h"
-#include "reg_objects.h"
-#include "reg_db.h"
-#include "librpc/gen_ndr/perfcount.h"
-#include "librpc/gen_ndr/notify.h"
-#include "librpc/gen_ndr/xattr.h"
-#include "librpc/gen_ndr/messaging.h"
-#include "librpc/gen_ndr/ndr_nbt.h"
 #include "librpc/rpc/dcerpc.h"
-#include "nt_printing.h"
 #include "idmap.h"
 #include "client.h"
 
@@ -691,24 +674,8 @@ struct ntlmssp_state;
 #include "async_smb.h"
 #include "../lib/async_req/async_sock.h"
 #include "talloc_dict.h"
-#include "services.h"
-#include "eventlog.h"
 #include "../lib/util/smb_threads.h"
 #include "../lib/util/smb_threads_internal.h"
-#include "tldap.h"
-#include "tldap_util.h"
-
-#include "lib/smbconf/smbconf.h"
-#include "lib/smbconf/smbconf_init.h"
-#include "lib/smbconf/smbconf_reg.h"
-#include "lib/smbconf/smbconf_txt.h"
-
-/* Defines for wisXXX functions. */
-#define UNI_UPPER    0x1
-#define UNI_LOWER    0x2
-#define UNI_DIGIT    0x4
-#define UNI_XDIGIT   0x8
-#define UNI_SPACE    0x10
 
 #include "nsswitch/winbind_nss.h"
 
@@ -737,7 +704,6 @@ enum flush_reason_enum {
     /* NUM_FLUSH_REASONS must remain the last value in the enumeration. */
     NUM_FLUSH_REASONS};
 
-#include "nss_info.h"
 #include "modules/nfs4_acls.h"
 #include "nsswitch/libwbclient/wbclient.h"
 
@@ -771,7 +737,7 @@ enum flush_reason_enum {
 #endif
 
 #ifdef HAVE_LDAP
-#include "ads_protos.h"
+#include "libads/ads_ldap_protos.h"
 #endif
 
 /* We need this after proto.h to reference GetTimeOfDay(). */
@@ -976,4 +942,6 @@ void in6_addr_to_sockaddr_storage(struct sockaddr_storage *ss,
 /* samba3 doesn't use uwrap yet */
 #define uwrap_enabled() 0
 
+#define BASE_RID (0x000003E8L)
+
 #endif /* _INCLUDES_H */