r14542: Remove librpc, libndr and libnbt from includes.h

source/auth/gensec/gensec.c

@@ -25,6 +25,7 @@
 #include "auth/auth.h"
 #include "lib/events/events.h"
 #include "build.h"
+#include "librpc/rpc/dcerpc.h"
 
 /* the list of currently registered GENSEC backends */
 static struct gensec_security_ops **generic_security_ops;

source/auth/gensec/gensec_gssapi.c

@@ -29,6 +29,7 @@
 #include "auth/auth.h"
 #include "lib/ldb/include/ldb.h"
 #include "auth/auth_sam.h"
+#include "librpc/rpc/dcerpc.h"
 
 enum gensec_gssapi_sasl_state 
 {

source/auth/gensec/gensec_krb5.c

@@ -33,6 +33,7 @@
 #include "auth/auth_sam.h"
 #include "system/network.h"
 #include "lib/socket/socket.h"
+#include "librpc/rpc/dcerpc.h"
 
 enum GENSEC_KRB5_STATE {
 	GENSEC_KRB5_SERVER_START,

source/auth/gensec/schannel.c

@@ -27,6 +27,7 @@
 #include "auth/gensec/schannel.h"
 #include "auth/gensec/schannel_state.h"
 #include "auth/gensec/schannel_proto.h"
+#include "librpc/rpc/dcerpc.h"
 
 static size_t schannel_sig_size(struct gensec_security *gensec_security, size_t data_size)
 {

source/auth/gensec/spnego.c

@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "auth/auth.h"
 #include "auth/gensec/spnego_proto.h"
+#include "librpc/gen_ndr/ndr_dcerpc.h"
 
 enum spnego_state_position {
 	SPNEGO_SERVER_START,

source/auth/ntlmssp/ntlmssp.c

@@ -26,6 +26,7 @@
 #include "auth/auth.h"
 #include "auth/ntlmssp/ntlmssp.h"
 #include "auth/ntlmssp/msrpc_parse.h"
+#include "librpc/gen_ndr/ndr_dcerpc.h"
 
 /**
  * Callbacks for NTLMSSP - for both client and server operating modes

source/cldap_server/netlogon.c

@@ -26,6 +26,7 @@
 #include "lib/socket/socket.h"
 #include "smbd/service_task.h"
 #include "cldap_server/cldap_server.h"
+#include "librpc/gen_ndr/ndr_misc.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
 #include "db_wrap.h"

source/dsdb/samdb/cracknames.c

@@ -33,6 +33,7 @@
 #include "auth/auth.h"
 #include "db_wrap.h"
 #include "dsdb/samdb/samdb.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
 				   struct smb_krb5_context *smb_krb5_context,

source/dsdb/samdb/samdb.h

@@ -26,6 +26,7 @@
 struct auth_session_info;
 struct drsuapi_DsNameInfo1;
 
+#include "librpc/gen_ndr/security.h"
 #include "lib/ldb/include/ldb.h"
 #include "dsdb/samdb/samdb_proto.h"
 

source/gtk/common/gtk-smb.c

@@ -23,6 +23,8 @@
 #include "gtk/common/gtk-smb.h"
 #include "gtk/common/select.h"
 #include "version.h"
+#include "librpc/rpc/dcerpc.h"
+#include "auth/credentials/credentials.h"
 
 void gtk_show_werror(GtkWidget *win, const char *message, WERROR err) 
 {

source/gtk/common/gtk-smb.h

@@ -71,6 +71,7 @@ int gtk_event_loop(void);
 struct event_context;
 struct event_context *gtk_event_context(void);
 
+struct cli_credentials;
 void cli_credentials_set_gtk_callbacks(struct cli_credentials *creds);
 
 #endif

source/gtk/tools/gregedit.c

@@ -21,8 +21,9 @@
 
 #include "includes.h"
 #include "lib/registry/registry.h"
-#include "lib/registry/reg_backend_rpc.h"
 #include "gtk/common/gtk-smb.h"
+#include "lib/events/events.h"
+#include "lib/registry/reg_backend_rpc.h"
 #include "auth/credentials/credentials.h"
 
 static GtkTreeStore *store_keys;

source/include/includes.h

@@ -106,9 +106,9 @@ _PUBLIC_ void smb_panic(const char *why) NORETURN_ATTRIBUTE;
 #include "param/param.h"
 #include "libcli/util/nterr.h"
 #include "libcli/util/doserr.h"
-#include "librpc/ndr/libndr.h"
-#include "librpc/rpc/dcerpc.h"
-#include "libcli/nbt/libnbt.h"
+#include "librpc/gen_ndr/misc.h"
+
+struct smbcli_tree;
 #include "libcli/util/proto.h"
 
 /* String routines */

source/kdc/kdc.h

@@ -28,6 +28,7 @@
 #include "kdc/pac-glue.h"
 
 struct kdc_server;
+struct socket_address;
 
 NTSTATUS kdc_hdb_ldb_create(TALLOC_CTX *mem_ctx, 
 			    krb5_context context, struct HDB **db, const char *arg);

source/lib/com/dcom/dcom.h

@@ -21,6 +21,9 @@
 #ifndef _DCOM_H /* _DCOM_H */
 #define _DCOM_H 
 
+struct cli_credentials;
+struct dcerpc_pipe;
+
 #include "lib/com/com.h"
 #include "librpc/gen_ndr/orpc.h"
 #include "lib/com/dcom/proto.h"

source/lib/com/tables.c

@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "dlinklist.h"
 #include "lib/com/com.h"
+#include "librpc/gen_ndr/ndr_misc.h"
 
 /* Specific implementation of one or more interfaces */
 struct com_class

source/lib/db_wrap.h

@@ -31,5 +31,6 @@ struct tdb_wrap {
 struct auth_session_info;
 struct ldb_message;
 struct ldb_dn;
+struct cli_credentials;
 
 #include "db_wrap_proto.h"

source/lib/events/events.h

@@ -20,6 +20,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifndef __EVENTS_H__
+#define __EVENTS_H__
+
 struct event_context;
 struct event_ops;
 struct fd_event;
@@ -64,3 +67,5 @@ struct event_context *event_context_find(TALLOC_CTX *mem_ctx);
 	event_set_fd_flags(fde, event_get_fd_flags(fde) & ~EVENT_FD_WRITE)
 #define EVENT_FD_NOT_READABLE(fde) \
 	event_set_fd_flags(fde, event_get_fd_flags(fde) & ~EVENT_FD_READ)
+
+#endif /* __EVENTS_H__ */

source/lib/messaging/messaging.c

@@ -31,6 +31,7 @@
 #include "db_wrap.h"
 #include "lib/tdb/include/tdbutil.h"
 #include "util/unix_privs.h"
+#include "librpc/rpc/dcerpc.h"
 
 /* change the message version with any incompatible changes in the protocol */
 #define MESSAGING_VERSION 1

source/lib/registry/registry.h

@@ -22,6 +22,9 @@
 #ifndef _REGISTRY_H /* _REGISTRY_H */
 #define _REGISTRY_H 
 
+#include "librpc/gen_ndr/security.h"
+#include "auth/credentials/credentials.h"
+
 /* Handles for the predefined keys */
 #define HKEY_CLASSES_ROOT		 0x80000000
 #define HKEY_CURRENT_USER		 0x80000001

source/lib/registry/tools/regdiff.c

@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "lib/registry/registry.h"
+#include "lib/events/events.h"
 #include "lib/registry/reg_backend_rpc.h"
 #include "lib/cmdline/popt_common.h"
 

source/lib/registry/tools/regpatch.c

@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "lib/events/events.h"
 #include "lib/registry/registry.h"
 #include "lib/cmdline/popt_common.h"
 #include "lib/registry/reg_backend_rpc.h"

source/lib/registry/tools/regshell.c

@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "lib/registry/registry.h"
 #include "lib/cmdline/popt_common.h"
+#include "lib/events/events.h"
 #include "lib/registry/reg_backend_rpc.h"
 #include "system/time.h"
 #include "lib/replace/readline.h"

source/lib/registry/tools/regtree.c

@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "lib/registry/registry.h"
+#include "lib/events/events.h"
 #include "lib/registry/reg_backend_rpc.h"
 #include "lib/cmdline/popt_common.h"
 

source/lib/socket/socket.h

@@ -21,6 +21,8 @@
 #ifndef _SAMBA_SOCKET_H
 #define _SAMBA_SOCKET_H
 
+#include "lib/events/events.h"
+
 struct socket_context;
 
 enum socket_type {

source/libcli/composite/composite.c

@@ -26,6 +26,8 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
 #include "lib/messaging/irpc.h"
+#include "librpc/rpc/dcerpc.h"
+#include "libcli/nbt/libnbt.h"
 
 /*
   block until a composite function has completed, then return the status

source/libcli/composite/composite.h

@@ -63,5 +63,7 @@ struct composite_context {
 
 struct irpc_request;
 struct smbcli_request;
+struct rpc_request;
+struct nbt_name_request;
 
 #include "libcli/composite/proto.h"

source/libcli/config.mk

@@ -80,7 +80,7 @@ OBJ_FILES = \
 REQUIRED_SUBSYSTEMS = NDR_WINSREPL SOCKET LIBEVENTS
 
 [SUBSYSTEM::LIBCLI_RESOLVE]
-PRIVATE_PROTO_HEADER = resolve/resolve.h
+PRIVATE_PROTO_HEADER = resolve/proto.h
 OBJ_FILES = \
 	resolve/resolve.o \
 	resolve/nbtlist.o \

source/libcli/ldap/ldap.h

@@ -247,6 +247,10 @@ struct ldap_message {
 	struct ldb_control    **controls;
 };
 
+struct event_context;
+struct cli_credentials;
+struct dom_sid;
+
 #include "libcli/ldap/ldap_proto.h"
 
 #endif

source/libcli/raw/libcliraw.h

@@ -31,6 +31,8 @@ struct smbcli_request;  /* forward declare */
 struct smbcli_session;  /* forward declare */
 struct smbcli_transport;  /* forward declare */
 
+struct cli_credentials;
+
 /* default timeout for all smb requests */
 #define SMB_REQUEST_TIMEOUT 60
 

source/libcli/resolve/nbtlist.c

@@ -29,6 +29,7 @@
 #include "system/network.h"
 #include "netif/netif.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
+#include "libcli/nbt/libnbt.h"
 
 struct nbtlist_state {
 	struct nbt_name name;

source/libcli/resolve/resolve.h

@@ -0,0 +1,29 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   general name resolution interface
+
+   Copyright (C) Andrew Tridgell 2005
+   
+   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.
+*/
+
+#ifndef __RESOLVE_H__
+#define __RESOLVE_H__
+
+#include "libcli/nbt/libnbt.h"
+#include "libcli/resolve/proto.h"
+
+#endif /* __RESOLVE_H__ */

source/libcli/resolve/wins.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "libcli/nbt/libnbt.h"
 #include "libcli/resolve/resolve.h"
 
 /*

source/libcli/security/access_check.c

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

source/libcli/security/dom_sid.c

@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/security.h"
 
 /*****************************************************************
  Compare the auth portion of two sids.

source/libcli/security/privilege.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/security.h" 
 
 
 static const struct {

source/libcli/security/sddl.c

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

source/libcli/security/security_descriptor.c

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

source/libcli/smb2/smb2_calls.h

@@ -363,4 +363,6 @@ struct smb2_flush {
 	} in;
 };
 
+struct cli_credentials;
+struct event_context;
 #include "libcli/smb2/smb2_proto.h"

source/libnet/libnet_samsync_ldb.c

@@ -32,6 +32,7 @@
 #include "db_wrap.h"
 #include "libcli/security/proto.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "librpc/rpc/dcerpc.h"
 
 struct samsync_ldb_secret {
 	struct samsync_ldb_secret *prev, *next;

source/libnet/libnet_site.c

@@ -23,6 +23,7 @@
 #include "libcli/cldap/cldap.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
+#include "librpc/rpc/dcerpc.h"
 
 /*
  * 1. Setup a CLDAP socket.

source/libnet/libnet_vampire.c

@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "libnet/libnet.h"
 #include "libcli/auth/libcli_auth.h"
+#include "auth/gensec/gensec.h"
 #include "auth/gensec/schannel_proto.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
 #include "librpc/gen_ndr/ndr_netlogon_c.h"

source/libnet/userinfo.c

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

source/librpc/ndr/ndr.c

@@ -28,7 +28,9 @@
 */
 
 #include "includes.h"
+#include "librpc/ndr/libndr.h"
 #include "dlinklist.h"
+#include "librpc/gen_ndr/dcerpc.h"
 
 #define NDR_BASE_MARSHALL_SIZE 1024
 

source/librpc/ndr/ndr_basic.c

@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "system/network.h"
+#include "librpc/ndr/libndr.h"
 
 #define NDR_SVAL(ndr, ofs) (NDR_BE(ndr)?RSVAL(ndr->data,ofs):SVAL(ndr->data,ofs))
 #define NDR_IVAL(ndr, ofs) (NDR_BE(ndr)?RIVAL(ndr->data,ofs):IVAL(ndr->data,ofs))

source/librpc/ndr/ndr_compression.c

@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "lib/compression/mszip.h"
+#include "librpc/ndr/libndr.h"
 
 static NTSTATUS ndr_pull_compression_mszip_chunk(struct ndr_pull *ndrpull,
 						 struct ndr_push *ndrpush,

source/librpc/ndr/ndr_misc.c

@@ -25,6 +25,7 @@
 
 #include "includes.h"
 #include "system/network.h"
+#include "librpc/ndr/libndr.h"
 
 _PUBLIC_ void ndr_print_ipv4_addr(struct ndr_print *ndr, const char *name, const struct ipv4_addr *_ip)
 {

source/librpc/ndr/ndr_obfuscate.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/ndr/libndr.h"
 
 /*
   handle obfuscated subcontext buffers, which in midl land are user-marshalled, but

source/librpc/ndr/ndr_string.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/ndr/libndr.h"
 
 /**
   pull a general string from the wire

source/librpc/rpc/dcerpc.c

@@ -24,8 +24,9 @@
 #include "includes.h"
 #include "dlinklist.h"
 #include "lib/events/events.h"
-#include "librpc/gen_ndr/ndr_dcerpc.h"
+#include "librpc/rpc/dcerpc.h"
 #include "librpc/gen_ndr/ndr_misc.h"
+#include "librpc/gen_ndr/ndr_dcerpc.h"
 #include "libcli/composite/composite.h"
 #include "auth/gensec/gensec.h"
 

source/librpc/rpc/dcerpc.h

@@ -26,6 +26,7 @@
 
 #include "core.h"
 #include "librpc/gen_ndr/dcerpc.h"
+#include "librpc/ndr/libndr.h"
 
 enum dcerpc_transport_t {
 	NCACN_NP, NCACN_IP_TCP, NCACN_IP_UDP, NCACN_VNS_IPC, NCACN_VNS_SPP, 

source/librpc/rpc/dcerpc_auth.c

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

source/librpc/rpc/dcerpc_connect.c

@@ -31,6 +31,7 @@
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
 #include "auth/credentials/credentials.h"
+#include "librpc/rpc/dcerpc.h"
 
 
 struct dcerpc_pipe_connect;

source/librpc/rpc/dcerpc_error.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/rpc/dcerpc.h"
 
 struct dcerpc_fault_table {
 	const char *errstr;

source/librpc/rpc/dcerpc_smb.c

@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
+#include "librpc/rpc/dcerpc.h"
 
 /* transport private information used by SMB pipe transport */
 struct smb_private {

source/librpc/rpc/dcerpc_smb2.c

@@ -26,6 +26,7 @@
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
 #include "libcli/raw/ioctl.h"
+#include "librpc/rpc/dcerpc.h"
 
 /* transport private information used by SMB2 pipe transport */
 struct smb2_private {

source/librpc/rpc/dcerpc_sock.c

@@ -27,6 +27,7 @@
 #include "lib/socket/socket.h"
 #include "lib/stream/packet.h"
 #include "libcli/composite/composite.h"
+#include "librpc/rpc/dcerpc.h"
 
 /* transport private information used by general socket pipe transports */
 struct sock_private {

source/librpc/rpc/table.c

@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "dlinklist.h"
+#include "librpc/rpc/dcerpc.h"
 #include "librpc/rpc/dcerpc_table.h"
 
 struct dcerpc_interface_list *dcerpc_pipes = NULL;

source/librpc/tables.pl

@@ -75,6 +75,7 @@ print TABLEC <<EOF;
 /* Automatically generated by tables.pl. DO NOT EDIT */
 
 #include "includes.h"
+#include "librpc/rpc/dcerpc.h"
 #include "librpc/rpc/dcerpc_table.h"
 EOF
 

source/main.mk

@@ -234,14 +234,11 @@ lib/charset/charset.h: lib/charset/charset_proto.h
 
 include/includes.h: \
 		include/config.h \
-		librpc/ndr/libndr.h \
-		librpc/rpc/dcerpc.h \
-		auth/credentials/credentials_proto.h \
-		libcli/nbt/libnbt.h \
 		lib/util/util_proto.h \
 		lib/charset/charset.h \
 		param/proto.h \
-		libcli/util/proto.h
+		libcli/util/proto.h \
+		librpc/gen_ndr/misc.h
 
 clean_pch: 
 	-rm -f include/includes.h.gch

source/ntvfs/ipc/ipc_rap.c

@@ -23,6 +23,7 @@
 #include "smb.h"
 #include "libcli/rap/rap.h"
 #include "ntvfs/ipc/proto.h"
+#include "librpc/ndr/libndr.h"
 
 #define NERR_Success 0
 #define NERR_badpass 86

source/ntvfs/ntvfs.h

@@ -265,5 +265,5 @@ struct ntvfs_critical_sizes {
 };
 
 struct messaging_context;
-
+#include "librpc/gen_ndr/security.h"
 #include "ntvfs/ntvfs_proto.h"

source/pidl/lib/Parse/Pidl/Samba4/EJS.pm

@@ -797,6 +797,7 @@ sub Parse($$)
     pidl "
 /* EJS wrapper functions auto-generated by pidl */
 #include \"includes.h\"
+#include \"librpc/rpc/dcerpc.h\"
 #include \"lib/appweb/ejs/ejs.h\"
 #include \"scripting/ejs/ejsrpc.h\"
 #include \"scripting/ejs/smbcalls.h\"

source/rpc_server/dcerpc_server.h

@@ -26,7 +26,7 @@
 
 #include "core.h"
 #include "librpc/gen_ndr/misc.h"
-#include "librpc/gen_ndr/dcerpc.h"
+#include "librpc/rpc/dcerpc.h"
 #include "librpc/ndr/libndr.h"
 
 /* modules can use the following to determine if the interface has changed

source/scripting/ejs/ejsrpc.h

@@ -20,6 +20,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include "librpc/gen_ndr/security.h"
+#include "librpc/rpc/dcerpc.h"
+
 struct ejs_rpc {
 	int eid;
 	const char *callname;

source/scripting/ejs/smbcalls.h

@@ -31,5 +31,6 @@ void mprSetStringCFunction(struct MprVar *obj, const char *name, MprStringCFunct
 
 struct ldb_context;
 struct ldb_message;
+struct cli_credentials;
 
 #include "scripting/ejs/proto.h"

source/scripting/ejs/smbcalls_rand.c

@@ -24,6 +24,7 @@
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "system/passwd.h"
+#include "librpc/gen_ndr/ndr_misc.h"
 
 /*
   usage:

source/scripting/ejs/smbcalls_rpc.c

@@ -31,6 +31,7 @@
 #include "lib/events/events.h"
 #include "librpc/rpc/dcerpc_table.h"
 #include "auth/credentials/credentials.h"
+#include "librpc/rpc/dcerpc.h"
 
 /*
   state of a irpc 'connection'

source/smb_server/smb/sesssetup.c

@@ -28,6 +28,7 @@
 #include "auth/auth.h"
 #include "smb_server/smb_server.h"
 #include "smbd/service_stream.h"
+#include "librpc/gen_ndr/nbt.h"
 
 /*
   setup the OS, Lanman and domain portions of a session setup reply

source/torture/com/simple.c

@@ -24,6 +24,7 @@
 #include "lib/com/dcom/dcom.h"
 #include "librpc/gen_ndr/com_dcom.h"
 #include "lib/cmdline/popt_common.h"
+#include "librpc/rpc/dcerpc.h"
 #include "torture/torture.h"
 
 #define DEFAULT_TRANS 4096

source/torture/libnet/libnet_lookup.c

@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "lib/cmdline/popt_common.h"
 #include "libnet/libnet.h"
+#include "librpc/gen_ndr/nbt.h"
 
 
 BOOL torture_lookup(void)

source/torture/libnet/libnet_rpc.c

@@ -24,6 +24,7 @@
 #include "libnet/libnet.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_samr.h"
+#include "librpc/rpc/dcerpc.h"
 
 
 static BOOL test_lsa_connect(struct libnet_context *ctx)

source/torture/local/binding_string.c

@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/epmapper.h"
+#include "librpc/rpc/dcerpc.h"
 
 static BOOL test_BindingString(TALLOC_CTX *mem_ctx, const char *binding)
 {

source/torture/local/iconv.c

@@ -25,6 +25,7 @@
 #include "torture/torture.h"
 #include "system/iconv.h"
 #include "system/time.h"
+#include "libcli/raw/libcliraw.h"
 #include "torture/util.h"
 
 #if HAVE_NATIVE_ICONV

source/torture/local/ndr.c

@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "torture/torture.h"
+#include "librpc/ndr/libndr.h"
 
 BOOL test_check_string_terminator(TALLOC_CTX *mem_ctx)
 {

source/torture/local/sddl.c

@@ -21,8 +21,8 @@
 */
 
 #include "includes.h"
-#include "libcli/security/proto.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "libcli/security/proto.h"
 
 
 /*

source/torture/rap/rap.c

@@ -25,6 +25,7 @@
 #include "libcli/rap/rap.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
+#include "librpc/ndr/libndr.h"
 
 struct rap_call {
 	uint16_t callno;

source/torture/raw/composite.c

@@ -28,6 +28,7 @@
 #include "libcli/security/proto.h"
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
+#include "librpc/gen_ndr/ndr_misc.h"
 #include "lib/cmdline/popt_common.h"
 #include "librpc/gen_ndr/security.h"
 #include "torture/util.h"

source/torture/rpc/alter_context.c

@@ -24,6 +24,7 @@
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_dssetup.h"
+#include "librpc/rpc/dcerpc.h"
 #include "torture/rpc/rpc.h"
 
 BOOL torture_rpc_alter_context(void)

source/torture/rpc/bind.c

@@ -25,6 +25,7 @@
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "lib/cmdline/popt_common.h"
+#include "librpc/rpc/dcerpc.h"
 #include "torture/rpc/rpc.h"
 
 /*

source/torture/rpc/countcalls.c

@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "torture/torture.h"
+#include "librpc/rpc/dcerpc.h"
 #include "librpc/rpc/dcerpc_table.h"
 #include "torture/rpc/rpc.h"
 

source/torture/rpc/lsa_lookup.c

@@ -22,11 +22,11 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "lib/events/events.h"
-#include "libcli/security/proto.h"
 #include "libnet/libnet_join.h"
 #include "torture/rpc/rpc.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "libcli/security/proto.h"
 
 static BOOL open_policy(TALLOC_CTX *mem_ctx, struct dcerpc_pipe *p,
 			struct policy_handle **handle)

source/torture/rpc/rpc.c

@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "auth/credentials/credentials.h"
 #include "lib/cmdline/popt_common.h"
+#include "librpc/rpc/dcerpc.h"
 #include "torture/rpc/rpc.h"
 #include "torture/torture.h"
 #include "librpc/rpc/dcerpc_table.h"

source/torture/rpc/rpc.h

@@ -25,6 +25,7 @@
 #include "auth/credentials/credentials.h"
 #include "torture/rpc/drsuapi.h"
 #include "libnet/libnet_join.h"
+#include "librpc/rpc/dcerpc.h"
 #include "torture/rpc/proto.h"
 
 #endif /* __TORTURE_RPC_H__ */

source/torture/smb2/connect.c

@@ -22,9 +22,9 @@
 
 #include "includes.h"
 #include "smb.h"
+#include "librpc/gen_ndr/security.h"
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
-
 #include "torture/smb2/proto.h"
 
 /*

source/torture/smbtorture.c

@@ -37,6 +37,7 @@
 #include "torture/torture.h"
 #include "build.h"
 #include "dlinklist.h"
+#include "librpc/rpc/dcerpc.h"
 
 #define MAX_COLS 80 /* FIXME: Determine this at run-time */
 

source/torture/torture.c

@@ -35,6 +35,7 @@
 #include "librpc/gen_ndr/ndr_nbt.h"
 
 #include "torture/raw/proto.h"
+#include "libcli/smb2/smb2.h"
 #include "torture/smb2/proto.h"
 #include "torture/rap/proto.h"
 #include "torture/auth/proto.h"

source/utils/ndrdump.c

@@ -22,6 +22,7 @@
 #include "lib/cmdline/popt_common.h"
 #include "system/iconv.h"
 #include "system/filesys.h"
+#include "librpc/rpc/dcerpc.h"
 #include "librpc/rpc/dcerpc_table.h"
 
 static const struct dcerpc_interface_call *find_function(

source/utils/net/net.c

@@ -45,6 +45,7 @@
 #include "utils/net/net.h"
 #include "lib/cmdline/popt_common.h"
 #include "lib/ldb/include/ldb.h"
+#include "librpc/rpc/dcerpc.h"
 
 /*
   run a function from a function table. If not found then

source/utils/nmblookup.c

@@ -28,6 +28,8 @@
 #include "lib/socket/socket.h"
 #include "system/network.h"
 #include "netif/netif.h"
+#include "librpc/gen_ndr/nbt.h"
+#include "libcli/nbt/libnbt.h"
 
 /* command line options */
 static struct {

source/winbind/wb_cmd_userdomgroups.c

@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "libcli/composite/composite.h"
+#include "librpc/gen_ndr/security.h"
 #include "libcli/security/proto.h"
 #include "winbind/wb_server.h"
 #include "winbind/wb_helper.h"

source/wrepl_server/wrepl_server.h

@@ -310,5 +310,6 @@ struct wreplsrv_service {
 	} scavenging;
 };
 
+struct socket_context;
 #include "wrepl_server/wrepl_out_helpers.h"
 #include "wrepl_server/wrepl_server_proto.h"