s3-build: only include memcache.h where needed.

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

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 132d37380f2d88b15deaedafdb04f15a261b5cdc..dd802605e68cb2e526af1fdfc97680d4f5c2b764 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,
@@ -625,8 +626,8 @@ extern void *cmdline_lp_ctx;
 #include "../lib/util/time.h"
 #include "../lib/util/asn1.h"
 
-#include "ads.h"
-#include "ads_dns.h"
+#include "krb5_env.h"
+#include "libads/ads_status.h"
 #include "interfaces.h"
 #include "trans2.h"
 #include "../libcli/util/error.h"
@@ -638,31 +639,24 @@ extern void *cmdline_lp_ctx;
 #include "messages.h"
 #include "locking.h"
 #include "smb_perfcount.h"
-#include "smb_signing.h"
 #include "smb.h"
 #include "nameserv.h"
-#include "secrets.h"
 #include "../lib/util/byteorder.h"
-#include "privileges.h"
 #include "rpc_misc.h"
 #include "rpc_dce.h"
 #include "mapping.h"
 #include "passdb.h"
-#include "rpc_secdes.h"
 #include "msdfs.h"
 
 struct ntlmssp_state;
 
 #include "auth.h"
 #include "ntdomain.h"
-#include "librpc/gen_ndr/ndr_nbt.h"
 #include "librpc/rpc/dcerpc.h"
-#include "nt_printing.h"
 #include "idmap.h"
 #include "client.h"
 
 #include "session.h"
-#include "popt.h"
 #include "mangle.h"
 #include "module.h"
 #include "nsswitch/winbind_client.h"
@@ -670,7 +664,6 @@ struct ntlmssp_state;
 #include "packet.h"
 #include "ctdbd_conn.h"
 #include "../lib/util/talloc_stack.h"
-#include "memcache.h"
 #include "serverid.h"
 #include "async_smb.h"
 #include "../lib/async_req/async_sock.h"
@@ -705,7 +698,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"
 
@@ -738,10 +730,6 @@ enum flush_reason_enum {
 #include "modules/vfs_irixacl.h"
 #endif
 
-#ifdef HAVE_LDAP
-#include "ads_protos.h"
-#endif
-
 /* We need this after proto.h to reference GetTimeOfDay(). */
 #include "smbprofile.h"