r12542: Move some more prototypes out to seperate headers

(This used to be commit 0aca5fd513)

source4/auth/auth.h

@@ -180,5 +180,6 @@ struct auth_critical_sizes {
 			   const struct auth_usersupplied_info *user_info_in,
 			   const struct auth_usersupplied_info **user_info_encrypted);
 
+#include "auth/auth_proto.h"
 
 #endif /* _SMBAUTH_H_ */

source4/auth/auth_sam.c

@@ -25,6 +25,8 @@
 #include "system/time.h"
 #include "auth/auth.h"
 #include "lib/ldb/include/ldb.h"
+#include "dsdb/samdb/samdb.h"
+#include "libcli/ldap/ldap.h"
 
 static const char *user_attrs[] = {
 	/* requried for the krb5 kdc*/

source4/auth/config.mk

@@ -67,6 +67,7 @@ OBJ_FILES = pam_errors.o
 #######################
 # Start SUBSYSTEM AUTH
 [SUBSYSTEM::AUTH]
+PRIVATE_PROTO_HEADER = auth_proto.h
 OBJ_FILES = \
 		auth.o \
 		auth_util.o \

source4/auth/credentials/config.mk

@@ -1,6 +1,7 @@
 #################################
 # Start SUBSYSTEM GENSEC
 [SUBSYSTEM::CREDENTIALS]
+PRIVATE_PROTO_HEADER = credentials_proto.h
 OBJ_FILES = credentials.o \
 		credentials_files.o \
 		credentials_krb5.o \

source4/auth/credentials/credentials.h

@@ -97,3 +97,5 @@ struct cli_credentials {
 	/* A list of valid GENSEC mechanisms for use on this account */
 	const struct gensec_security_ops **gensec_list;
 };
+
+#include "auth/credentials/credentials_proto.h"

source4/auth/credentials/credentials_gensec.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "auth/gensec/gensec.h"
 
 const struct gensec_security_ops **cli_credentials_gensec_list(struct cli_credentials *creds) 
 {

source4/auth/gensec/config.mk

@@ -6,6 +6,7 @@ MINOR_VERSION = 0
 DESCRIPTION = Generic Security Library
 RELEASE_VERSION = 1
 PUBLIC_HEADERS = gensec.h
+PRIVATE_PROTO_HEADER = gensec_proto.h
 INIT_FUNCTION = gensec_init
 OBJ_FILES = gensec.o
 REQUIRED_SUBSYSTEMS = \

source4/auth/gensec/gensec.h

@@ -123,4 +123,4 @@ struct gensec_critical_sizes {
 	int sizeof_gensec_security;
 };
 
-
+#include "gensec_proto.h"

source4/auth/gensec/schannel_state.c

@@ -26,6 +26,7 @@
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
 #include "db_wrap.h"
+#include "dsdb/samdb/samdb.h"
 
 /*
   connect to the schannel ldb

source4/build/smb_build/config_mk.pm

@@ -45,6 +45,7 @@ my $section_types = {
 		"NOPROTO"		=> "bool",
 
 		"MANPAGE"		=> "string",
+		"PRIVATE_PROTO_HEADER" => "string"
 		},
 	"BINARY" => {
 		"OBJ_FILES"		=> "list",
@@ -56,6 +57,7 @@ my $section_types = {
 
 		"MANPAGE"		=> "string",
 		"INSTALLDIR"		=> "string",
+		"PRIVATE_PROTO_HEADER" => "string"
 		},
 	"LIBRARY" => {
 		"MAJOR_VERSION"		=> "string",

source4/cldap_server/netlogon.c

@@ -26,6 +26,8 @@
 #include "lib/socket/socket.h"
 #include "smbd/service_task.h"
 #include "cldap_server/cldap_server.h"
+#include "dsdb/samdb/samdb.h"
+#include "auth/auth.h"
 
 /*
   fill in the cldap netlogon union for a given version

source4/client/client.c

@@ -28,6 +28,7 @@
 #include "librpc/gen_ndr/ndr_srvsvc.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/nbt/libnbt.h"
 #include "system/time.h"
 #include "system/dir.h"
 #include "system/filesys.h"

source4/dsdb/config.mk

@@ -5,6 +5,7 @@ include samdb/ldb_modules/config.mk
 ################################################
 # Start SUBSYSTEM SAMDB
 [SUBSYSTEM::SAMDB]
+PRIVATE_PROTO_HEADER = samdb/samdb.h
 OBJ_FILES = \
 		samdb/samdb.o \
 		samdb/samdb_privilege.o \

source4/dsdb/samdb/cracknames.c

@@ -31,6 +31,9 @@
 #include "lib/ldb/include/ldb_errors.h"
 #include "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"
+#include "dsdb/samdb/samdb.h"
+#include "libcli/ldap/ldap.h"
+#include "auth/auth.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/samldb.c

@@ -38,6 +38,7 @@
 #include "lib/ldb/include/ldb_private.h"
 #include "system/time.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "dsdb/samdb/samdb.h"
 
 #define SAM_ACCOUNT_NAME_BASE "$000000-000000000000"
 

source4/dsdb/samdb/samdb.c

@@ -28,6 +28,7 @@
 #include "system/time.h"
 #include "system/filesys.h"
 #include "db_wrap.h"
+#include "dsdb/samdb/samdb.h"
 
 /*
   connect to the SAM database

source4/dsdb/samdb/samdb_privilege.c

@@ -23,6 +23,9 @@
 #include "includes.h"
 #include "librpc/gen_ndr/security.h"
 #include "lib/ldb/include/ldb.h"
+#include "libcli/ldap/ldap.h"
+#include "dsdb/samdb/samdb.h"
+#include "auth/auth.h"
 
 /*
   add privilege bits for one sid to a security_token

source4/gtk/tools/gepdump.c

@@ -25,6 +25,7 @@
 #include "gtk/common/select.h"
 #include "gtk/common/gtk-smb.h"
 #include "lib/cmdline/popt_common.h"
+#include "auth/gensec/gensec.h"
 #include "smb_build.h"
 
 /* 

source4/include/includes.h

@@ -85,6 +85,7 @@ struct ipv4_addr {
 };
 
 
+#define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
 #include "lib/replace/replace.h"
 
 /* Lists, trees, caching, database... */
@@ -102,7 +103,6 @@ struct ipv4_addr {
 #include "smb.h"
 #include "byteorder.h"
 #include "librpc/ndr/libndr.h"
-#include "librpc/gen_ndr/misc.h"
 #include "librpc/gen_ndr/dcerpc.h"
 #include "librpc/ndr/ndr_orpc.h"
 #include "librpc/gen_ndr/orpc.h"
@@ -110,9 +110,9 @@ struct ipv4_addr {
 #include "smb_interfaces.h"
 #include "cli_context.h"
 #include "auth/credentials/credentials.h"
+#include "libcli/nbt/libnbt.h"
 
 /***** automatically generated prototypes *****/
-#define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
 #include "include/proto.h"
 #include "basic.h"
 #undef _PRINTF_ATTRIBUTE

source4/include/structs.h

@@ -340,6 +340,7 @@ struct packet_context;
 
 struct smbcli_socket;
 struct smbcli_request;
+struct smbcli_tree;
 
 struct _krb5_krb_auth_data;
 

source4/kdc/hdb-ldb.c

@@ -41,6 +41,7 @@
 #include "system/iconv.h"
 #include "librpc/gen_ndr/netlogon.h"
 #include "auth/auth.h"
+#include "dsdb/samdb/samdb.h"
 
 enum hdb_ldb_ent_type 
 { HDB_LDB_ENT_TYPE_CLIENT, HDB_LDB_ENT_TYPE_SERVER, 

source4/kdc/kpasswdd.c

@@ -31,6 +31,7 @@
 #include "lib/ldb/include/ldb.h"
 #include "heimdal/lib/krb5/krb5-private.h"
 #include "auth/auth.h"
+#include "dsdb/samdb/samdb.h"
 
 /* hold information about one kdc socket */
 struct kpasswd_socket {

source4/ldap_server/ldap_bind.c

@@ -23,6 +23,7 @@
 #include "auth/auth.h"
 #include "libcli/ldap/ldap.h"
 #include "smbd/service_stream.h"
+#include "dsdb/samdb/samdb.h"
 
 static NTSTATUS ldapsrv_BindSimple(struct ldapsrv_call *call)
 {

source4/ldap_server/ldap_simple_ldb.c

@@ -25,6 +25,7 @@
 #include "lib/ldb/include/ldb_errors.h"
 #include "auth/auth.h"
 #include "db_wrap.h"
+#include "dsdb/samdb/samdb.h"
 
 #define VALID_DN_SYNTAX(dn,i) do {\
 	if (!(dn)) {\

source4/lib/basic.mk

@@ -57,6 +57,7 @@ OBJ_FILES = \
 ################################################
 
 [SUBSYSTEM::GENCACHE]
+PRIVATE_PROTO_HEADER = gencache.h
 OBJ_FILES = \
 		gencache.o \
 

source4/lib/ldb/samba/ldif_handlers.c

@@ -27,6 +27,7 @@
 #include "ldb/include/ldb_private.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/gen_ndr/ndr_misc.h"
+#include "dsdb/samdb/samdb.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 "smb_build.h"
+#include "auth/auth.h"
 #endif
 
 /*

source4/libcli/clitrans2.c

@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "libcli/raw/libcliraw.h"
 
 /****************************************************************************
 send a qpathinfo call

source4/libcli/config.mk

@@ -35,6 +35,7 @@ MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
 DESCRIPTION = NetBios over TCP/IP client library
+PRIVATE_PROTO_HEADER = nbt/nbt_proto.h
 OBJ_FILES = \
 	nbt/nbtname.o \
 	nbt/nbtsocket.o \
@@ -66,6 +67,7 @@ NOPROTO=YES
 REQUIRED_SUBSYSTEMS = LIBCLI_LDAP
 
 [LIBRARY::LIBCLI_WREPL]
+PRIVATE_PROTO_HEADER = wrepl/winsrepl_proto.h
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
@@ -103,6 +105,7 @@ OBJ_FILES = clireadwrite.o \
 		clideltree.o
 
 [SUBSYSTEM::LIBCLI_RAW]
+PRIVATE_PROTO_HEADER = raw/raw_proto.h
 REQUIRED_SUBSYSTEMS = LIBCLI_RAW_KRB5
 OBJ_FILES = raw/rawfile.o \
 		raw/smb_signing.o \

source4/libcli/ldap/config.mk

@@ -1,6 +1,7 @@
 #################################
 # Start SUBSYSTEM LIBCLI_LDAP
 [SUBSYSTEM::LIBCLI_LDAP]
+PRIVATE_PROTO_HEADER = ldap_proto.h
 OBJ_FILES = ldap.o \
 		ldap_client.o \
 		ldap_bind.o \

source4/libcli/ldap/ldap.h

@@ -254,4 +254,6 @@ struct ldap_message {
 	struct ldap_Control    *controls;
 };
 
+#include "libcli/ldap/ldap_proto.h"
+
 #endif

source4/libcli/ldap/ldap_client.c

@@ -33,6 +33,7 @@
 #include "libcli/ldap/ldap_client.h"
 #include "libcli/composite/composite.h"
 #include "lib/stream/packet.h"
+#include "auth/gensec/gensec.h"
 
 
 /*

source4/libcli/nbt/libnbt.h

@@ -20,6 +20,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifndef __LIBNBT_H__
+#define __LIBNBT_H__
+
 #include "librpc/gen_ndr/ndr_nbt.h"
 
 /*
@@ -267,3 +270,7 @@ struct nbt_name_release {
 		uint8_t rcode;
 	} out;
 };
+
+#include "libcli/nbt/nbt_proto.h"
+
+#endif /* __LIBNBT_H__ */

source4/libcli/raw/clitransport.c

@@ -26,6 +26,7 @@
 #include "dlinklist.h"
 #include "lib/events/events.h"
 #include "lib/stream/packet.h"
+#include "libcli/nbt/libnbt.h"
 
 
 /*

source4/libcli/raw/libcliraw.h

@@ -269,3 +269,5 @@ struct smbcli_request {
       req->status = NT_STATUS_INVALID_PARAMETER; \
       goto failed; \
 }
+
+#include "libcli/raw/raw_proto.h"

source4/libcli/raw/rawacl.c

@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "libcli/raw/libcliraw.h"
 
 /****************************************************************************
 fetch file ACL (async send)

source4/libcli/resolve/host.c

@@ -35,6 +35,7 @@
 #include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
+#include "libcli/nbt/libnbt.h"
 
 struct host_state {
 	struct nbt_name name;

source4/libcli/resolve/resolve.c

@@ -24,6 +24,7 @@
 #include "lib/events/events.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
+#include "libcli/nbt/libnbt.h"
 
 struct resolve_state {
 	struct nbt_name name;

source4/libcli/security/security_token.c

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

source4/libcli/smb2/config.mk

@@ -1,4 +1,5 @@
 [SUBSYSTEM::LIBCLI_SMB2]
+PRIVATE_PROTO_HEADER = smb2_proto.h
 OBJ_FILES = \
 	transport.o \
 	request.o \

source4/libcli/smb2/smb2.h

@@ -197,3 +197,5 @@ struct smb2_request {
 		return NT_STATUS_INVALID_PARAMETER; \
 	} \
 } while (0)
+
+#include "libcli/smb2/smb2_proto.h"

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/nbt/libnbt.h"
 
 /* the stages of this call */
 enum connect_stage {CONNECT_RESOLVE, 

source4/libcli/wrepl/winsrepl.h

@@ -154,3 +154,5 @@ struct wrepl_pull_names {
 		} *names;
 	} out;
 };
+
+#include "libcli/wrepl/winsrepl_proto.h"

source4/libnet/config.mk

@@ -5,6 +5,7 @@ MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
 DESCRIPTION = User-friendly access to Samba interfaces
+PRIVATE_PROTO_HEADER = libnet_proto.h
 PUBLIC_HEADERS = libnet.h libnet_join.h libnet_lookup.h libnet_passwd.h \
 				 libnet_rpc.h libnet_share.h libnet_time.h libnet_user.h \
 				 libnet_vampire.h userinfo.h userman.h

source4/libnet/libnet.h

@@ -47,3 +47,4 @@ struct libnet_context {
 #include "libnet/libnet_user.h"
 #include "libnet/libnet_share.h"
 #include "libnet/libnet_lookup.h"
+#include "libnet/libnet_proto.h"

source4/libnet/libnet_join.c

@@ -30,6 +30,7 @@
 #include "libcli/cldap/cldap.h"
 #include "include/secrets.h"
 #include "librpc/gen_ndr/drsuapi.h"
+#include "dsdb/samdb/samdb.h"
 
 /*
  * find out Site specific stuff:

source4/libnet/libnet_samsync_ldb.c

@@ -28,7 +28,10 @@
 #include "librpc/gen_ndr/ndr_netlogon.h"
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "dlinklist.h"
+#include "libcli/ldap/ldap.h"
 #include "lib/ldb/include/ldb.h"
+#include "dsdb/samdb/samdb.h"
+#include "auth/auth.h"
 
 struct samsync_ldb_secret {
 	struct samsync_ldb_secret *prev, *next;

source4/librpc/config.mk

@@ -6,6 +6,7 @@ MINOR_VERSION = 0
 RELEASE_VERSION = 1
 DESCRIPTION = Network Data Representation Core Library
 PUBLIC_HEADERS = ndr/libndr.h
+PRIVATE_PROTO_HEADER = ndr/libndr_proto.h
 OBJ_FILES = \
 		ndr/ndr.o \
 		ndr/ndr_basic.o \

source4/librpc/ndr/libndr.h

@@ -280,3 +280,6 @@ typedef void (*ndr_print_function_t)(struct ndr_print *, const char *, int, cons
 
 extern const struct dcerpc_syntax_id ndr_transfer_syntax;
 extern const struct dcerpc_syntax_id ndr64_transfer_syntax;
+
+#include "librpc/gen_ndr/misc.h"
+#include "librpc/ndr/libndr_proto.h"

source4/librpc/rpc/config.mk

@@ -1,6 +1,7 @@
 ################################################
 # Start SUBSYSTEM RPC_RAW
 [SUBSYSTEM::RPC_RAW]
+PRIVATE_PROTO_HEADER = dcerpc_proto.h
 OBJ_FILES = \
 		dcerpc.o \
 		dcerpc_auth.o \

source4/librpc/rpc/dcerpc.c

@@ -28,6 +28,7 @@
 #include "librpc/gen_ndr/ndr_dcerpc.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "libcli/composite/composite.h"
+#include "auth/gensec/gensec.h"
 
 static void dcerpc_ship_next_request(struct dcerpc_connection *c);
 

source4/librpc/rpc/dcerpc.h

@@ -239,3 +239,5 @@ struct rpc_request {
 		void *private;
 	} async;
 };
+
+#include "librpc/rpc/dcerpc_proto.h"

source4/librpc/rpc/dcerpc_auth.c

@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "libcli/composite/composite.h"
+#include "auth/gensec/gensec.h"
 
 /*
   do a non-athenticated dcerpc bind

source4/librpc/rpc/dcerpc_connect.c

@@ -32,6 +32,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
+#include "libcli/smb2/smb2.h"
 
 
 struct dcerpc_pipe_connect;

source4/main.mk

@@ -210,7 +210,8 @@ pch: include/config.h \
 	idl \
 	include/includes.h.gch
 
-include/includes.h: lib/basic.h
+libcli/nbt/libnbt.h: libcli/nbt/nbt_proto.h
+include/includes.h: lib/basic.h libcli/nbt/libnbt.h
 
 clean_pch: 
 	-rm -f include/includes.h.gch

source4/nbt_server/dgram/netlogon.c

@@ -26,6 +26,8 @@
 #include "smbd/service_task.h"
 #include "lib/socket/socket.h"
 #include "lib/ldb/include/ldb.h"
+#include "dsdb/samdb/samdb.h"
+#include "auth/auth.h"
 
 /*
   reply to a GETDC request

source4/nbt_server/wins/winsdb.c

@@ -28,6 +28,7 @@
 #include "lib/ldb/include/ldb_errors.h"
 #include "db_wrap.h"
 #include "system/time.h"
+#include "auth/auth.h"
 
 /*
   return the new maxVersion and save it

source4/ntptr/config.mk

@@ -15,6 +15,7 @@ REQUIRED_SUBSYSTEMS = \
 ################################################
 # Start SUBSYSTEM NTPTR
 [SUBSYSTEM::NTPTR]
+PRIVATE_PROTO_HEADER = ntptr_proto.h
 OBJ_FILES = \
 		ntptr_base.o \
 		ntptr_interface.o

source4/ntptr/ntptr.h

@@ -186,3 +186,4 @@ struct ntptr_critical_sizes {
 	int sizeof_ntptr_context;
 	int sizeof_ntptr_ops;
 };
+#include "ntptr/ntptr_proto.h"

source4/ntptr/simple_ldb/ntptr_simple_ldb.c

@@ -33,6 +33,8 @@
 #include "librpc/gen_ndr/ndr_spoolss.h"
 #include "lib/ldb/include/ldb.h"
 #include "db_wrap.h"
+#include "auth/auth.h"
+#include "dsdb/samdb/samdb.h"
 
 /*
   connect to the SPOOLSS database

source4/ntvfs/common/sidmap.c

@@ -25,6 +25,9 @@
 #include "system/passwd.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "ads.h"
+#include "dsdb/samdb/samdb.h"
+#include "auth/auth.h"
+#include "libcli/ldap/ldap.h"
 
 /*
   these are used for the fallback local uid/gid to sid mapping

source4/ntvfs/ipc/vfs_ipc.c

@@ -30,6 +30,7 @@
 #include "dlinklist.h"
 #include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
+#include "rpc_server/dcerpc_server.h"
 
 #define IPC_BASE_FNUM 0x400
 

source4/ntvfs/posix/config.mk

@@ -3,6 +3,7 @@
 [MODULE::ntvfs_posix]
 SUBSYSTEM = NTVFS
 INIT_FUNCTION = ntvfs_posix_init 
+PRIVATE_PROTO_HEADER = vfs_posix_proto.h
 OBJ_FILES = \
 		vfs_posix.o \
 		pvfs_util.o \

source4/ntvfs/posix/vfs_posix.h

@@ -204,4 +204,6 @@ void *pvfs_wait_message(struct pvfs_state *pvfs,
 			 void (*fn)(void *, enum pvfs_wait_notice),
 			 void *private);
 
+#include "ntvfs/posix/vfs_posix_proto.h"
+
 #endif /* _VFS_POSIX_H_ */

source4/passdb/secrets.c

@@ -28,6 +28,7 @@
 #include "system/filesys.h"
 #include "db_wrap.h"
 #include "lib/ldb/include/ldb.h"
+#include "dsdb/samdb/samdb.h"
 
 static struct tdb_wrap *tdb;
 

source4/rpc_server/config.mk

@@ -199,6 +199,7 @@ REQUIRED_SUBSYSTEMS = \
 ################################################
 # Start SUBSYSTEM DCERPC
 [SUBSYSTEM::DCERPC]
+PRIVATE_PROTO_HEADER = dcerpc_server_proto.h
 OBJ_FILES = \
 		dcerpc_server.o \
 		dcerpc_sock.o \

source4/rpc_server/dcerpc_server.h

@@ -238,4 +238,6 @@ struct dcesrv_critical_sizes {
 	int sizeof_dcesrv_handle;
 };
 
+#include "rpc_server/dcerpc_server_proto.h"
+
 #endif /* SAMBA_DCERPC_SERVER_H */

source4/rpc_server/dcesrv_auth.c

@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "rpc_server/dcerpc_server.h"
 #include "librpc/gen_ndr/ndr_dcerpc.h"
+#include "auth/gensec/gensec.h"
 
 /*
   parse any auth information from a dcerpc bind request

source4/rpc_server/drsuapi/dcesrv_drsuapi.c

@@ -26,6 +26,7 @@
 #include "rpc_server/common/common.h"
 #include "rpc_server/drsuapi/dcesrv_drsuapi.h"
 #include "auth/auth.h"
+#include "dsdb/samdb/samdb.h"
 
 /* 
   drsuapi_DsBind 

source4/rpc_server/dssetup/dcesrv_dssetup.c

@@ -26,6 +26,7 @@
 #include "librpc/gen_ndr/ndr_dssetup.h"
 #include "rpc_server/common/common.h"
 #include "ldb/include/ldb.h"
+#include "dsdb/samdb/samdb.h"
 /* 
   dssetup_DsRoleGetPrimaryDomainInformation 
 */

source4/rpc_server/lsa/dcesrv_lsa.c

@@ -30,6 +30,8 @@
 #include "system/time.h"
 #include "db_wrap.h"
 #include "auth/auth.h"
+#include "dsdb/samdb/samdb.h"
+#include "libcli/ldap/ldap.h"
 
 /*
   this type allows us to distinguish handle types

source4/rpc_server/netlogon/dcerpc_netlogon.c

@@ -28,6 +28,7 @@
 #include "librpc/gen_ndr/ndr_dcom.h"
 #include "lib/ldb/include/ldb.h"
 #include "auth/auth.h"
+#include "dsdb/samdb/samdb.h"
 
 struct server_pipe_state {
 	struct netr_Credential client_challenge;

source4/rpc_server/samr/dcesrv_samr.c

@@ -30,6 +30,8 @@
 #include "system/time.h"
 #include "lib/ldb/include/ldb.h"
 #include "ads.h"
+#include "dsdb/samdb/samdb.h"
+#include "libcli/ldap/ldap.h"
 
 
 /*

source4/rpc_server/samr/samr_password.c

@@ -30,6 +30,9 @@
 #include "lib/crypto/crypto.h"
 #include "lib/ldb/include/ldb.h"
 #include "ads.h"
+#include "libcli/ldap/ldap.h"
+#include "dsdb/samdb/samdb.h"
+#include "auth/auth.h"
 
 /* 
   samr_ChangePasswordUser 

source4/smb_server/smb/config.mk

@@ -1,6 +1,7 @@
 #######################
 # Start SUBSYSTEM SMB_PROTOCOL
 [SUBSYSTEM::SMB_PROTOCOL]
+PRIVATE_PROTO_HEADER = smb_proto.h
 OBJ_FILES = \
 		receive.o \
 		negprot.o \

source4/smb_server/smb/nttrans.c

@@ -26,6 +26,7 @@
 #include "smb_server/smb_server.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "ntvfs/ntvfs.h"
+#include "libcli/raw/libcliraw.h"
 
 
 

source4/smb_server/smb/signing.c

@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "smb_server/smb_server.h"
+#include "libcli/raw/libcliraw.h"
 
 
 /*

source4/smb_server/smb/trans2.c

@@ -26,6 +26,7 @@
 #include "smb_server/smb_server.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "ntvfs/ntvfs.h"
+#include "libcli/raw/libcliraw.h"
 
 #define CHECK_MIN_BLOB_SIZE(blob, size) do { \
 	if ((blob)->length < (size)) { \

source4/smb_server/smb2/config.mk

@@ -1,6 +1,7 @@
 #######################
 # Start SUBSYSTEM SMB2_PROTOCOL
 [SUBSYSTEM::SMB2_PROTOCOL]
+PRIVATE_PROTO_HEADER = smb2_proto.h
 OBJ_FILES = \
 		receive.o \
 		negprot.o \

source4/smb_server/smb2/smb2_server.h

@@ -48,3 +48,5 @@ struct smb2srv_request {
 	struct smb2_request_buffer in;
 	struct smb2_request_buffer out;
 };
+
+#include "smb_server/smb2/smb2_proto.h"

source4/smb_server/smb_server.c

@@ -28,6 +28,7 @@
 #include "lib/messaging/irpc.h"
 #include "lib/stream/packet.h"
 #include "libcli/smb2/smb2.h"
+#include "smb_server/smb2/smb2_server.h"
 
 static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob)
 {

source4/smb_server/smb_server.h

@@ -303,3 +303,4 @@ struct smbsrv_connection {
 };
 
 #include "smb_server/smb_server_proto.h"
+#include "smb_server/smb/smb_proto.h"

source4/smbd/server.c

@@ -33,6 +33,7 @@
 #include "smb_build.h"
 #include "registry/registry.h"
 #include "ntvfs/ntvfs.h"
+#include "ntptr/ntptr.h"
 
 /*
   recursively delete a directory tree

source4/torture/basic/aliases.c

@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "dlinklist.h"
+#include "libcli/raw/libcliraw.h"
 
 int create_complex_file(struct smbcli_state *cli, TALLOC_CTX *mem_ctx, const char *fname);
 

source4/torture/basic/charset.c

@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "libcli/raw/libcliraw.h"
 
 #define BASEDIR "\\chartest\\"
 

source4/torture/libnet/domain.c

@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "libnet/composite.h"
+#include "libnet/libnet.h"
 
 static BOOL test_domainopen(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 			    struct lsa_String *domname,

source4/torture/libnet/userinfo.c

@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_samr.h"
+#include "libnet/libnet.h"
 #include "libnet/composite.h"
 #include "libnet/userinfo.h"
 

source4/torture/libnet/userman.c

@@ -23,6 +23,7 @@
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "libnet/composite.h"
 #include "libnet/userman.h"
+#include "libnet/libnet.h"
 
 #define TEST_USERNAME  "libnetusermantest"
 

source4/torture/nbench/nbio.c

@@ -25,6 +25,7 @@
 #include "system/filesys.h"
 #include "dlinklist.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "libcli/raw/libcliraw.h"
 
 #define MAX_FILES 100
 

source4/torture/rap/rap.c

@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "rap.h"
+#include "libcli/raw/libcliraw.h"
 
 struct rap_call {
 	uint16_t callno;

source4/torture/raw/chkpath.c

@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "libcli/raw/libcliraw.h"
 
 #define BASEDIR "\\rawchkpath"
 

source4/torture/raw/close.c

@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "system/time.h"
+#include "libcli/raw/libcliraw.h"
 
 
 /* basic testing of all RAW_CLOSE_* calls 

source4/torture/raw/ioctl.c

@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "ioctl.h"
+#include "libcli/raw/libcliraw.h"
 
 #define BASEDIR "\\rawioctl"
 

source4/torture/raw/mkdir.c

@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "libcli/raw/libcliraw.h"
 
 #define BASEDIR "\\mkdirtest"
 

source4/torture/raw/notify.c

@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "libcli/raw/libcliraw.h"
 
 #define BASEDIR "\\test_notify"
 

source4/torture/raw/oplock.c

@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "libcli/raw/libcliraw.h"
 
 #define CHECK_VAL(v, correct) do { \
 	if ((v) != (correct)) { \

source4/torture/raw/rename.c

@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "libcli/raw/libcliraw.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \

source4/torture/raw/seek.c

@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "libcli/raw/libcliraw.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \

source4/torture/raw/setfileinfo.c

@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "system/time.h"
+#include "libcli/raw/libcliraw.h"
 
 #define BASEDIR "\\testsfileinfo"
 

source4/torture/raw/unlink.c

@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "libcli/raw/libcliraw.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \