r13924: Split more prototypes out of include/proto.h + initial work on header

file dependencies
(This used to be commit 1228358767)

source4/auth/auth_developer.c

@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "auth/auth.h"
+#include "libcli/security/proto.h"
 
 /** 
  * Return an error based on username

source4/auth/auth_sam.c

@@ -24,6 +24,8 @@
 #include "system/time.h"
 #include "auth/auth.h"
 #include "dsdb/samdb/samdb.h"
+#include "db_wrap.h"
+#include "libcli/security/proto.h"
 #include "libcli/ldap/ldap.h"
 
 static const char *user_attrs[] = {

source4/auth/auth_sam_reply.c

@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "auth/auth.h"
+#include "libcli/security/proto.h"
 
 NTSTATUS auth_convert_server_info_sambaseinfo(TALLOC_CTX *mem_ctx, 
 					      struct auth_serversupplied_info *server_info, 

source4/auth/auth_util.c

@@ -24,6 +24,8 @@
 
 #include "includes.h"
 #include "auth/auth.h"
+#include "libcli/security/proto.h"
+#include "libcli/auth/proto.h"
 
 /* this default function can be used by mostly all backends
  * which don't want to set a challlenge

source4/auth/config.mk

@@ -7,9 +7,9 @@ include credentials/config.mk
 #######################
 # Start MODULE auth_sam
 [MODULE::auth_sam]
+PRIVATE_PROTO_HEADER = auth_sam.h
 INIT_FUNCTION = auth_sam_init
 SUBSYSTEM = AUTH
-NOPROTO = NO
 OBJ_FILES = \
 		auth_sam.o
 REQUIRED_SUBSYSTEMS = \

source4/auth/credentials/credentials.c

@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_samr.h" /* for struct samrPassword */
 #include "auth/gensec/gensec.h"
+#include "libcli/auth/proto.h"
 
 /**
  * Create a new credentials structure

source4/auth/credentials/credentials_files.c

@@ -27,6 +27,7 @@
 #include "librpc/gen_ndr/ndr_samr.h" /* for struct samrPassword */
 #include "passdb/secrets.h"
 #include "system/filesys.h"
+#include "db_wrap.h"
 
 /**
  * Read a file descriptor, and parse it for a password (eg from a file or stdin)

source4/auth/credentials/credentials_ntlm.c

@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_samr.h" /* for struct samrPassword */
 #include "lib/crypto/crypto.h"
+#include "libcli/auth/proto.h"
 
 void cli_credentials_get_ntlm_username_domain(struct cli_credentials *cred, TALLOC_CTX *mem_ctx, 
 					      const char **username, 

source4/auth/gensec/gensec_gssapi.c

@@ -27,6 +27,7 @@
 #include "auth/kerberos/kerberos.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
 #include "auth/auth.h"
+#include "auth/auth_sam.h"
 
 enum gensec_gssapi_sasl_state 
 {

source4/auth/gensec/gensec_krb5.c

@@ -29,6 +29,7 @@
 #include "auth/kerberos/kerberos.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
 #include "auth/auth.h"
+#include "auth/auth_sam.h"
 #include "system/network.h"
 #include "lib/socket/socket.h"
 

source4/auth/gensec/schannel_state.c

@@ -25,8 +25,9 @@
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
 #include "dsdb/samdb/samdb.h"
+#include "db_wrap.h"
 
-/*
+/**
   connect to the schannel ldb
 */
 struct ldb_context *schannel_db_connect(TALLOC_CTX *mem_ctx)

source4/auth/ntlm_check.c

@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "lib/crypto/crypto.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
+#include "libcli/auth/proto.h"
 
 /****************************************************************************
  Core of smb password checking routine.

source4/auth/ntlmssp/config.mk

@@ -4,6 +4,7 @@
 SUBSYSTEM = GENSEC
 NOPROTO = NO
 INIT_FUNCTION = gensec_ntlmssp_init
+PRIVATE_PROTO_HEADER = proto.h
 OBJ_FILES = ntlmssp.o \
 		ntlmssp_sign.o \
 		ntlmssp_client.o \

source4/auth/ntlmssp/ntlmssp.h

@@ -185,4 +185,4 @@ struct gensec_ntlmssp_state
 	struct auth_serversupplied_info *server_info;
 };
 
-
+#include "auth/ntlmssp/proto.h"

source4/auth/ntlmssp/ntlmssp_client.c

@@ -26,6 +26,7 @@
 #include "auth/auth.h"
 #include "auth/ntlmssp/ntlmssp.h"
 #include "lib/crypto/crypto.h"
+#include "libcli/auth/proto.h"
 
 /*********************************************************************
  Client side NTLMSSP

source4/auth/ntlmssp/ntlmssp_server.c

@@ -28,6 +28,7 @@
 #include "lib/crypto/crypto.h"
 #include "pstring.h"
 #include "system/filesys.h"
+#include "libcli/auth/proto.h"
 
 /** 
  * Set a username on an NTLMSSP context - ensures it is talloc()ed 

source4/build/smb_build/TODO

@@ -1,3 +1,7 @@
+- for each subsystem:
+ - include line in Makefile
+ - rule in Makefile
+ - 
 - sonames
 - get rid of include/structs.h
 - add register function to smbtorture

source4/build/smb_build/main.pl

@@ -77,6 +77,7 @@ foreach my $key (values %$OUTPUT) {
 	$mkenv->Header($key) if defined($key->{PUBLIC_HEADERS});
 	$mkenv->ProtoHeader($key) if defined($key->{PRIVATE_PROTO_HEADER});
 
+#	$mkenv->DependencyInfo($key) if $config::config{developer} eq "yes";
 }
 
 $mkenv->write("Makefile");

source4/build/smb_build/makefile.pm

@@ -239,6 +239,18 @@ sub _prepare_list($$$)
 	$self->output("$ctx->{TYPE}\_$ctx->{NAME}_$var =$tmplist\n");
 }
 
+sub DependencyInfo($$)
+{
+	my ($self,$ctx) = @_;
+
+	$self->output("bin/deps/$ctx->{TYPE}_$ctx->{NAME}: \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST:.o=.c)");
+	$self->output("\n");
+	$self->output("\t\@echo \"Generating dependency info for $ctx->{NAME}\"\n");
+	$self->output("\t\@./script/cdeps.pl \$^ > \$@\n");
+	$self->output("\n");
+	$self->output("-include bin/deps/$ctx->{TYPE}_$ctx->{NAME}\n\n");
+}
+
 sub SharedLibrary($$)
 {
 	my ($self,$ctx) = @_;

source4/cldap_server/cldap_server.c

@@ -26,6 +26,8 @@
 #include "lib/messaging/irpc.h"
 #include "smbd/service_task.h"
 #include "cldap_server/cldap_server.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 /*
   handle incoming cldap requests
@@ -95,7 +97,7 @@ static NTSTATUS cldapd_add_socket(struct cldapd_server *cldapd, const char *addr
 /*
   setup our listening sockets on the configured network interfaces
 */
-NTSTATUS cldapd_startup_interfaces(struct cldapd_server *cldapd)
+static NTSTATUS cldapd_startup_interfaces(struct cldapd_server *cldapd)
 {
 	int num_interfaces = iface_count();
 	TALLOC_CTX *tmp_ctx = talloc_new(cldapd);

source4/cldap_server/netlogon.c

@@ -28,6 +28,9 @@
 #include "cldap_server/cldap_server.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
+#include "db_wrap.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 /*
   fill in the cldap netlogon union for a given version

source4/client/client.c

@@ -34,6 +34,8 @@
 #include "system/readline.h"
 #include "auth/gensec/gensec.h"
 #include "system/time.h" /* needed by some systems for asctime() */
+#include "libcli/resolve/resolve.h"
+#include "libcli/security/proto.h"
 
 static int io_bufsize = 64512;
 

source4/dsdb/samdb/cracknames.c

@@ -30,7 +30,9 @@
 #include "auth/kerberos/kerberos.h"
 #include "dsdb/samdb/samdb.h"
 #include "libcli/ldap/ldap.h"
+#include "libcli/security/proto.h"
 #include "auth/auth.h"
+#include "db_wrap.h"
 
 static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
 				   struct smb_krb5_context *smb_krb5_context,

source4/dsdb/samdb/ldb_modules/kludge_acl.c

@@ -35,6 +35,7 @@
 #include "ldb/include/ldb_errors.h"
 #include "ldb/include/ldb_private.h"
 #include "auth/auth.h"
+#include "libcli/security/proto.h"
 
 /* Kludge ACL rules:
  *

source4/dsdb/samdb/ldb_modules/password_hash.c

@@ -36,6 +36,7 @@
 #include "ldb/include/ldb_private.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_samr.h"
+#include "libcli/auth/proto.h"
 #include "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"
 #include "system/time.h"

source4/dsdb/samdb/ldb_modules/samldb.c

@@ -38,6 +38,8 @@
 #include "lib/ldb/include/ldb_errors.h"
 #include "lib/ldb/include/ldb_private.h"
 #include "dsdb/samdb/samdb.h"
+#include "libcli/security/proto.h"
+#include "db_wrap.h"
 
 
 /* if value is not null also check for attribute to have exactly that value */

source4/dsdb/samdb/samdb.c

@@ -25,6 +25,7 @@
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
+#include "libcli/security/proto.h"
 #include "system/time.h"
 #include "system/filesys.h"
 #include "db_wrap.h"

source4/dsdb/samdb/samdb_privilege.c

@@ -24,6 +24,8 @@
 #include "libcli/ldap/ldap.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
+#include "libcli/security/proto.h"
+#include "db_wrap.h"
 
 /*
   add privilege bits for one sid to a security_token

source4/heimdal_build/glue.c

@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "system/network.h"
 #include "system/kerberos.h"
+#include "netif/netif.h"
 
 /*
   get the list of IP addresses for configured interfaces

source4/include/includes.h

@@ -105,7 +105,7 @@ enum brl_type {
 #include "lib/replace/replace.h"
 
 /* Lists, trees, caching, database... */
-#include "nt_status.h"
+#include "libcli/util/nt_status.h"
 #include "talloc/talloc.h"
 #include "core.h"
 #include "charset/charset.h"

source4/kdc/hdb-ldb.c

@@ -41,6 +41,8 @@
 #include "system/iconv.h"
 #include "librpc/gen_ndr/netlogon.h"
 #include "auth/auth.h"
+#include "auth/auth_sam.h"
+#include "db_wrap.h"
 #include "dsdb/samdb/samdb.h"
 
 enum hdb_ldb_ent_type 

source4/kdc/kdc.c

@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "smbd/service_task.h"
 #include "smbd/service_stream.h"
+#include "smbd/process_model.h"
 #include "lib/events/events.h"
 #include "lib/socket/socket.h"
 #include "kdc/kdc.h"
@@ -32,8 +33,8 @@
 #include "dlinklist.h"
 #include "lib/messaging/irpc.h"
 #include "lib/stream/packet.h"
-
 #include "librpc/gen_ndr/samr.h"
+#include "netif/netif.h"
 
 /* hold all the info needed to send a reply */
 struct kdc_reply {

source4/kdc/pac-glue.c

@@ -28,6 +28,7 @@
 #include "heimdal/lib/krb5/krb5_locl.h"
 #include "librpc/gen_ndr/krb5pac.h"
 #include "auth/auth.h"
+#include "auth/auth_sam.h"
 
 /* Given the right private pointer from hdb_ldb, get a PAC from the attached ldb messages */
 static krb5_error_code samba_get_pac(krb5_context context, 

source4/ldap_server/config.mk

@@ -3,6 +3,7 @@
 #######################
 # Start SUBSYSTEM LDAP
 [SUBSYSTEM::LDAP]
+PRIVATE_PROTO_HEADER = proto.h
 OBJ_FILES = \
 		ldap_server.o \
 		ldap_backend.o \

source4/ldap_server/ldap_server.c

@@ -36,6 +36,8 @@
 #include "lib/stream/packet.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 /*
   close the socket and shutdown a server_context

source4/ldap_server/ldap_server.h

@@ -60,3 +60,5 @@ struct ldapsrv_service;
 struct ldapsrv_service {
 	struct tls_params *tls_params;
 };
+
+#include "ldap_server/proto.h"

source4/lib/basic.mk

@@ -22,6 +22,7 @@ include tdr/config.mk
 ##############################
 # Start SUBSYSTEM LIBNETIF
 [SUBSYSTEM::LIBNETIF]
+PRIVATE_PROTO_HEADER = netif/proto.h
 OBJ_FILES = \
 		netif/interface.o \
 		netif/netif.o
@@ -55,6 +56,7 @@ OBJ_FILES = \
 		gencache/gencache.o \
 
 [SUBSYSTEM::DB_WRAP]
+PRIVATE_PROTO_HEADER = db_wrap_proto.h
 OBJ_FILES = db_wrap.o \
 		gendb.o
 REQUIRED_SUBSYSTEMS = LIBLDB LIBTDB LDBSAMBA

source4/lib/db_wrap.h

@@ -28,3 +28,4 @@ struct tdb_wrap {
 	struct tdb_wrap *next, *prev;
 };
 
+#include "db_wrap_proto.h"

source4/lib/ldb/samba/ldif_handlers.c

@@ -28,6 +28,7 @@
 #include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "dsdb/samdb/samdb.h"
+#include "libcli/security/proto.h"
 
 /*
   convert a ldif formatted objectSid to a NDR formatted blob

source4/lib/ldb/tools/cmdline.c

@@ -29,6 +29,7 @@
 #ifdef _SAMBA_BUILD_
 #include "lib/cmdline/popt_common.h"
 #include "auth/auth.h"
+#include "db_wrap.h"
 #endif
 
 /*

source4/lib/netif/interface.c

@@ -25,7 +25,7 @@
 #include "lib/netif/netif.h"
 #include "dlinklist.h"
 
-/* used for network interfaces */
+/** used for network interfaces */
 struct interface {
 	struct interface *next, *prev;
 	struct ipv4_addr ip;
@@ -105,7 +105,7 @@ static void add_interface(struct in_addr ip, struct in_addr nmask)
 
 
 
-/****************************************************************************
+/**
 interpret a single element from a interfaces= config line 
 
 This handles the following different forms:
@@ -115,7 +115,7 @@ This handles the following different forms:
 3) IP/masklen
 4) ip/mask
 5) bcast/mask
-****************************************************************************/
+**/
 static void interpret_interface(const char *token, 
 				struct iface_struct *probed_ifaces, 
 				int total_probed)
@@ -184,9 +184,9 @@ static void interpret_interface(const char *token,
 }
 
 
-/****************************************************************************
+/**
 load the list of network interfaces
-****************************************************************************/
+**/
 static void load_interfaces(void)
 {
 	const char **ptr;
@@ -230,19 +230,19 @@ static void load_interfaces(void)
 }
 
 
-/*
+/**
   unload the interfaces list, so it can be reloaded when needed
 */
-_PUBLIC_ void unload_interfaces(void)
+void unload_interfaces(void)
 {
 	talloc_free(local_interfaces);
 	local_interfaces = NULL;
 }
 
-/****************************************************************************
+/**
   how many interfaces do we have
-  **************************************************************************/
-_PUBLIC_ int iface_count(void)
+  **/
+int iface_count(void)
 {
 	int ret = 0;
 	struct interface *i;
@@ -254,10 +254,10 @@ _PUBLIC_ int iface_count(void)
 	return ret;
 }
 
-/****************************************************************************
+/**
   return IP of the Nth interface
-  **************************************************************************/
-_PUBLIC_ const char *iface_n_ip(int n)
+  **/
+const char *iface_n_ip(int n)
 {
 	struct interface *i;
   
@@ -272,10 +272,10 @@ _PUBLIC_ const char *iface_n_ip(int n)
 	return NULL;
 }
 
-/****************************************************************************
+/**
   return bcast of the Nth interface
-  **************************************************************************/
-_PUBLIC_ const char *iface_n_bcast(int n)
+  **/
+const char *iface_n_bcast(int n)
 {
 	struct interface *i;
   
@@ -290,10 +290,10 @@ _PUBLIC_ const char *iface_n_bcast(int n)
 	return NULL;
 }
 
-/****************************************************************************
+/**
   return netmask of the Nth interface
-  **************************************************************************/
-_PUBLIC_ const char *iface_n_netmask(int n)
+  **/
+const char *iface_n_netmask(int n)
 {
 	struct interface *i;
   
@@ -308,11 +308,11 @@ _PUBLIC_ const char *iface_n_netmask(int n)
 	return NULL;
 }
 
-/*
+/**
   return the local IP address that best matches a destination IP, or
   our first interface if none match
 */
-_PUBLIC_ const char *iface_best_ip(const char *dest)
+const char *iface_best_ip(const char *dest)
 {
 	struct interface *iface;
 	struct in_addr ip;
@@ -327,10 +327,10 @@ _PUBLIC_ const char *iface_best_ip(const char *dest)
 	return iface_n_ip(0);
 }
 
-/*
+/**
   return True if an IP is one one of our local networks
 */
-_PUBLIC_ BOOL iface_is_local(const char *dest)
+BOOL iface_is_local(const char *dest)
 {
 	struct in_addr ip;
 
@@ -343,10 +343,10 @@ _PUBLIC_ BOOL iface_is_local(const char *dest)
 	return False;
 }
 
-/*
+/**
   return True if a IP matches a IP/netmask pair
 */
-_PUBLIC_ BOOL iface_same_net(const char *ip1, const char *ip2, const char *netmask)
+BOOL iface_same_net(const char *ip1, const char *ip2, const char *netmask)
 {
 	return same_net(interpret_addr2(ip1),
 			interpret_addr2(ip2),

source4/lib/netif/netif.c

@@ -77,6 +77,7 @@
 #endif
 
 #include <net/if.h>
+#define BOOL int
 #include "netif.h"
 
 #if HAVE_IFACE_IFCONF

source4/lib/netif/netif.h

@@ -28,3 +28,4 @@ struct iface_struct {
 
 #define MAX_INTERFACES 128
 
+#include "netif/proto.h"

source4/lib/samba3/group.c

@@ -24,6 +24,7 @@
 #include "lib/samba3/samba3.h"
 #include "lib/tdb/include/tdbutil.h"
 #include "system/filesys.h"
+#include "libcli/security/proto.h"
 
 #define DATABASE_VERSION_V1 1 /* native byte format. */
 #define DATABASE_VERSION_V2 2 /* le format. */

source4/lib/samba3/idmap.c

@@ -27,6 +27,7 @@
 #include "lib/tdb/include/tdbutil.h"
 #include "lib/samba3/samba3.h"
 #include "system/filesys.h"
+#include "libcli/security/proto.h"
 
 /* High water mark keys */
 #define HWM_GROUP  "GROUP HWM"

source4/lib/socket/connect.c

@@ -26,6 +26,7 @@
 #include "lib/socket/socket.h"
 #include "lib/events/events.h"
 #include "libcli/composite/composite.h"
+#include "libcli/resolve/resolve.h"
 
 
 struct connect_state {

source4/lib/socket/connect_multi.c

@@ -26,6 +26,7 @@
 #include "lib/socket/socket.h"
 #include "lib/events/events.h"
 #include "libcli/composite/composite.h"
+#include "libcli/resolve/resolve.h"
 
 #define MULTI_PORT_DELAY 2000 /* microseconds */
 

source4/libcli/auth/config.mk

@@ -1,6 +1,7 @@
 #################################
 # Start SUBSYSTEM LIBCLI_AUTH
 [SUBSYSTEM::LIBCLI_AUTH]
+PRIVATE_PROTO_HEADER = proto.h
 OBJ_FILES = credentials.o \
 		session.o \
 		smbencrypt.o 

source4/libcli/auth/smbencrypt.c

@@ -27,6 +27,7 @@
 #include "smb.h"
 #include "auth/ntlmssp/ntlmssp.h"
 #include "lib/crypto/crypto.h"
+#include "libcli/auth/proto.h"
 #include "pstring.h"
 
 /*

source4/libcli/cldap/cldap.c

@@ -38,6 +38,7 @@
 #include "libcli/ldap/ldap.h"
 #include "libcli/cldap/cldap.h"
 #include "lib/socket/socket.h"
+#include "libcli/security/proto.h"
 
 /*
   destroy a pending request

source4/libcli/cliconnect.c

@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "libcli/libcli.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/auth/proto.h"
 #include "libcli/smb_composite/smb_composite.h"
 
 /*

source4/libcli/composite/composite.h

@@ -60,3 +60,5 @@ struct composite_context {
 
 	BOOL used_wait;
 };
+
+#include "libcli/composite/proto.h"

source4/libcli/config.mk

@@ -16,11 +16,13 @@ OBJ_FILES = util/clilsa.o
 REQUIRED_SUBSYSTEMS = RPC_NDR_LSA
 
 [SUBSYSTEM::LIBCLI_COMPOSITE]
+PRIVATE_PROTO_HEADER = composite/proto.h
 OBJ_FILES = \
 	composite/composite.o
 REQUIRED_SUBSYSTEMS = LIBEVENTS
 
 [SUBSYSTEM::LIBCLI_SMB_COMPOSITE]
+PRIVATE_PROTO_HEADER = smb_composite/proto.h
 OBJ_FILES = \
 	smb_composite/loadfile.o \
 	smb_composite/savefile.o \
@@ -80,6 +82,7 @@ OBJ_FILES = \
 REQUIRED_SUBSYSTEMS = NDR_WINSREPL SOCKET LIBEVENTS
 
 [SUBSYSTEM::LIBCLI_RESOLVE]
+PRIVATE_PROTO_HEADER = resolve/resolve.h
 OBJ_FILES = \
 	resolve/resolve.o \
 	resolve/nbtlist.o \

source4/libcli/dgram/browse.c

@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "libcli/dgram/libdgram.h"
 #include "lib/socket/socket.h"
+#include "libcli/resolve/resolve.h"
 
 NTSTATUS dgram_mailslot_browse_send(struct nbt_dgram_socket *dgmsock,
 				    struct nbt_name *dest_name,

source4/libcli/dgram/netlogon.c

@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "libcli/dgram/libdgram.h"
 #include "lib/socket/socket.h"
+#include "libcli/resolve/resolve.h"
 
 /* 
    send a netlogon mailslot request 

source4/libcli/dgram/ntlogon.c

@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "libcli/dgram/libdgram.h"
 #include "lib/socket/socket.h"
+#include "libcli/resolve/resolve.h"
 
 /* 
    send a ntlogon mailslot request 

source4/libcli/finddcs.c

@@ -27,6 +27,7 @@
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "libcli/composite/composite.h"
 #include "libcli/libcli.h"
+#include "libcli/resolve/resolve.h"
 
 struct finddcs_state {
 	struct composite_context *ctx;

source4/libcli/raw/clisocket.c

@@ -26,6 +26,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
 #include "lib/socket/socket.h"
+#include "libcli/resolve/resolve.h"
 
 struct sock_connect_state {
 	struct composite_context *ctx;

source4/libcli/resolve/bcast.c

@@ -21,6 +21,9 @@
 */
 
 #include "includes.h"
+#include "libcli/resolve/resolve.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 /*
   broadcast name resolution method - async send

source4/libcli/resolve/nbtlist.c

@@ -26,6 +26,8 @@
 
 #include "includes.h"
 #include "libcli/composite/composite.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 struct nbtlist_state {
 	struct nbt_name name;

source4/libcli/resolve/resolve.c

@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "lib/events/events.h"
 #include "libcli/composite/composite.h"
+#include "libcli/resolve/resolve.h"
 
 struct resolve_state {
 	struct nbt_name name;

source4/libcli/resolve/wins.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "libcli/resolve/resolve.h"
 
 /*
   wins name resolution method - async send

source4/libcli/security/access_check.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "libcli/security/proto.h"
 
 
 /*

source4/libcli/security/config.mk

@@ -1,6 +1,7 @@
 #################################
 # Start SUBSYSTEM LIB_SECURITY
 [SUBSYSTEM::LIB_SECURITY]
+PRIVATE_PROTO_HEADER = proto.h
 OBJ_FILES = security_token.o \
 		security_descriptor.o \
 		dom_sid.o \

source4/libcli/security/sddl.c

@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "system/iconv.h"
+#include "libcli/security/proto.h"
 
 struct flag_map {
 	const char *name;

source4/libcli/security/security_descriptor.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "libcli/security/proto.h"
 
 /*
   return a blank security descriptor (no owners, dacl or sacl)

source4/libcli/security/security_token.c

@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "dsdb/samdb/samdb.h"
+#include "libcli/security/proto.h"
 
 /*
   return a blank security token

source4/libcli/smb2/connect.c

@@ -25,6 +25,7 @@
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
 #include "libcli/composite/composite.h"
+#include "libcli/resolve/resolve.h"
 
 struct smb2_connect_state {
 	struct cli_credentials *credentials;

source4/libcli/smb_composite/appendacl.c

@@ -1,6 +1,7 @@
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
+#include "libcli/security/proto.h"
 #include "libcli/smb_composite/smb_composite.h"
 
 /* the stages of this call */

source4/libcli/smb_composite/connect.c

@@ -26,6 +26,7 @@
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
 #include "lib/events/events.h"
+#include "libcli/resolve/resolve.h"
 
 /* the stages of this call */
 enum connect_stage {CONNECT_RESOLVE, 

source4/libcli/smb_composite/sesssetup.c

@@ -25,6 +25,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
+#include "libcli/auth/proto.h"
 #include "auth/auth.h"
 #include "version.h"
 

source4/libcli/smb_composite/smb_composite.h

@@ -170,3 +170,5 @@ struct smb_composite_connectmulti {
 		struct smbcli_socket *socket;
 	} out;
 };
+
+#include "libcli/smb_composite/proto.h"

source4/libcli/util/clilsa.c

@@ -29,6 +29,7 @@
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
+#include "libcli/security/proto.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 
 struct smblsa_state {

source4/libcli/wrepl/winsrepl.c

@@ -27,6 +27,8 @@
 #include "libcli/wrepl/winsrepl.h"
 #include "lib/stream/packet.h"
 #include "libcli/composite/composite.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 static struct wrepl_request *wrepl_request_finished(struct wrepl_request *req, NTSTATUS status);
 

source4/libnet/libnet_join.c

@@ -27,6 +27,8 @@
 #include "lib/ldb/include/ldb_errors.h"
 #include "passdb/secrets.h"
 #include "dsdb/samdb/samdb.h"
+#include "db_wrap.h"
+#include "libcli/security/proto.h"
 
 /*
  * complete a domain join, when joining to a AD domain:

source4/libnet/libnet_lookup.c

@@ -28,6 +28,7 @@
 #include "libcli/composite/composite.h"
 #include "lib/messaging/messaging.h"
 #include "lib/messaging/irpc.h"
+#include "libcli/resolve/resolve.h"
 
 struct lookup_state {
 	struct composite_context *resolve_ctx;

source4/libnet/libnet_passwd.c

@@ -23,6 +23,7 @@
 #include "smb.h"
 #include "libnet/libnet.h"
 #include "lib/crypto/crypto.h"
+#include "libcli/auth/proto.h"
 
 /*
  * do a password change using DCERPC/SAMR calls

source4/libnet/libnet_samsync_ldb.c

@@ -29,6 +29,8 @@
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
 #include "librpc/gen_ndr/ndr_misc.h"
+#include "db_wrap.h"
+#include "libcli/security/proto.h"
 
 struct samsync_ldb_secret {
 	struct samsync_ldb_secret *prev, *next;

source4/libnet/libnet_vampire.c

@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "libnet/libnet.h"
 #include "auth/gensec/schannel_proto.h"
+#include "libcli/auth/proto.h"
 
 
 /**

source4/libnet/userinfo.c

@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "libcli/composite/composite.h"
+#include "libcli/security/proto.h"
 #include "libnet/composite.h"
 #include "libnet/userinfo.h"
 

source4/librpc/rpc/dcerpc.h

@@ -24,8 +24,6 @@
 #ifndef __DCERPC_H__
 #define __DCERPC_H__
 
-#include <nt_status.h>
-
 enum dcerpc_transport_t {
 	NCACN_NP, NCACN_IP_TCP, NCACN_IP_UDP, NCACN_VNS_IPC, NCACN_VNS_SPP, 
 	NCACN_AT_DSP, NCADG_AT_DDP, NCALRPC, NCACN_UNIX_STREAM, NCADG_UNIX_DGRAM,

source4/librpc/rpc/dcerpc_schannel.c

@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "auth/auth.h"
+#include "libcli/auth/proto.h"
 
 /*
   get a schannel key using a netlogon challenge on a secondary pipe

source4/main.mk

@@ -248,7 +248,7 @@ include/includes.h: \
 		libcli/nbt/libnbt.h \
 		lib/util/util_proto.h \
 		lib/charset/charset.h \
-		param/param.h
+		param/param.h \
 
 clean_pch: 
 	-rm -f include/includes.h.gch

source4/nbt_server/config.mk

@@ -40,6 +40,7 @@ REQUIRED_SUBSYSTEMS = \
 #######################
 # Start SUBSYSTEM NBTD_DGRAM
 [SUBSYSTEM::NBTD_DGRAM]
+PRIVATE_PROTO_HEADER = dgram/proto.h
 OBJ_FILES = \
 		dgram/request.o \
 		dgram/netlogon.o \

source4/nbt_server/dgram/netlogon.c

@@ -26,6 +26,7 @@
 #include "lib/ldb/include/ldb.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
+#include "db_wrap.h"
 
 /*
   reply to a GETDC request

source4/nbt_server/dgram/request.c

@@ -24,6 +24,8 @@
 #include "nbt_server/nbt_server.h"
 #include "smbd/service_task.h"
 #include "lib/socket/socket.h"
+#include "libcli/resolve/resolve.h"
+#include "nbt_server/dgram/proto.h"
 
 /*
   a list of mailslots that we have static handlers for

source4/nbt_server/interfaces.c

@@ -26,6 +26,9 @@
 #include "smbd/service_task.h"
 #include "lib/socket/socket.h"
 #include "nbt_server/wins/winsserver.h"
+#include "nbt_server/dgram/proto.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 
 /*

source4/nbt_server/irpc.c

@@ -26,6 +26,7 @@
 #include "nbt_server/nbt_server.h"
 #include "nbt_server/wins/winsserver.h"
 #include "lib/socket/socket.h"
+#include "libcli/resolve/resolve.h"
 
 /*
   serve out the nbt statistics

source4/nbt_server/nbt_server.c

@@ -24,6 +24,8 @@
 #include "smbd/service_task.h"
 #include "nbt_server/nbt_server.h"
 #include "nbt_server/wins/winsserver.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 /*
   startup the nbtd task

source4/nbt_server/wins/wins_dns_proxy.c

@@ -27,6 +27,7 @@
 #include "system/time.h"
 #include "libcli/composite/composite.h"
 #include "smbd/service_task.h"
+#include "libcli/resolve/resolve.h"
 
 struct wins_dns_proxy_state {
 	struct nbt_name_socket *nbtsock;

source4/nbt_server/wins/wins_ldb.c

@@ -34,6 +34,8 @@
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
 #include "lib/ldb/include/ldb_private.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 /* add_record: do things with the sambaPassword attribute */
 static int wins_ldb_verify(struct ldb_module *module, struct ldb_request *req, const struct ldb_message *msg)

source4/nbt_server/wins/winsdb.c

@@ -27,6 +27,9 @@
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
 #include "system/time.h"
+#include "db_wrap.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 uint64_t winsdb_get_maxVersion(struct winsdb_handle *h)
 {

source4/ntptr/simple_ldb/ntptr_simple_ldb.c

@@ -34,6 +34,8 @@
 #include "lib/ldb/include/ldb.h"
 #include "auth/auth.h"
 #include "dsdb/samdb/samdb.h"
+#include "db_wrap.h"
+#include "rpc_server/common/common.h"
 
 /*
   connect to the SPOOLSS database

source4/ntvfs/common/sidmap.c

@@ -26,6 +26,8 @@
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
 #include "libcli/ldap/ldap.h"
+#include "db_wrap.h"
+#include "libcli/security/proto.h"
 
 /*
   these are used for the fallback local uid/gid to sid mapping

source4/ntvfs/ipc/rap_server.c

@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "libcli/rap/rap.h"
 #include "librpc/gen_ndr/ndr_srvsvc.h"
+#include "rpc_server/common/common.h"
 
 /* At this moment these are just dummy functions, but you might get the
  * idea. */

source4/ntvfs/posix/pvfs_acl.c

@@ -24,6 +24,7 @@
 #include "auth/auth.h"
 #include "vfs_posix.h"
 #include "librpc/gen_ndr/ndr_xattr.h"
+#include "libcli/security/proto.h"
 
 
 /*

source4/ntvfs/posix/vfs_posix.c

@@ -29,6 +29,8 @@
 #include "librpc/gen_ndr/ndr_security.h"
 #include "smbd/service_stream.h"
 #include "lib/tdb/include/tdb.h"
+#include "db_wrap.h"
+#include "libcli/security/proto.h"
 
 
 /*

source4/rpc_server/common/common.h

@@ -65,3 +65,5 @@
 
 #define DCESRV_PULL_HANDLE(h, inhandle, t) DCESRV_PULL_HANDLE_RETVAL(h, inhandle, t, NT_STATUS_INVALID_HANDLE)
 #define DCESRV_PULL_HANDLE_WERR(h, inhandle, t) DCESRV_PULL_HANDLE_RETVAL(h, inhandle, t, WERR_BADFID)
+
+#include "rpc_server/common/proto.h"

source4/rpc_server/config.mk

@@ -3,6 +3,7 @@
 ################################################
 # Start SUBSYSTEM DCERPC_COMMON
 [SUBSYSTEM::DCERPC_COMMON]
+PRIVATE_PROTO_HEADER = common/proto.h
 OBJ_FILES = \
 		common/server_info.o \
 		common/share_info.o