r14464: Don't include ndr_BASENAME.h files unless strictly required, instead

try to include just the BASENAME.h files (containing only structs)
(This used to be commit 3dd477ca51)

source4/auth/auth_sam.c

@@ -27,6 +27,7 @@
 #include "dsdb/samdb/samdb.h"
 #include "libcli/security/proto.h"
 #include "libcli/ldap/ldap.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 static const char *user_attrs[] = {
 	/* requried for the krb5 kdc*/

source4/auth/auth_winbind.c

@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "auth/auth.h"
 #include "nsswitch/winbind_client.h"
+#include "librpc/gen_ndr/ndr_netlogon.h"
 
 static NTSTATUS get_info3_from_ndr(TALLOC_CTX *mem_ctx, struct winbindd_response *response, struct netr_SamInfo3 *info3)
 {

source4/auth/credentials/credentials.c

@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_samr.h" /* for struct samrPassword */
+#include "librpc/gen_ndr/samr.h" /* for struct samrPassword */
 #include "auth/gensec/gensec.h"
 #include "libcli/auth/libcli_auth.h"
 

source4/auth/credentials/credentials_files.c

@@ -24,7 +24,7 @@
 
 #include "includes.h"
 #include "lib/ldb/include/ldb.h"
-#include "librpc/gen_ndr/ndr_samr.h" /* for struct samrPassword */
+#include "librpc/gen_ndr/samr.h" /* for struct samrPassword */
 #include "passdb/secrets.h"
 #include "system/filesys.h"
 #include "db_wrap.h"

source4/auth/credentials/credentials_ntlm.c

@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_samr.h" /* for struct samrPassword */
+#include "librpc/gen_ndr/samr.h" /* for struct samrPassword */
 #include "lib/crypto/crypto.h"
 #include "libcli/auth/libcli_auth.h"
 

source4/auth/gensec/gensec_gssapi.c

@@ -25,7 +25,7 @@
 #include "includes.h"
 #include "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"
-#include "librpc/gen_ndr/ndr_krb5pac.h"
+#include "librpc/gen_ndr/krb5pac.h"
 #include "auth/auth.h"
 #include "lib/ldb/include/ldb.h"
 #include "auth/auth_sam.h"

source4/auth/gensec/gensec_krb5.c

@@ -27,7 +27,7 @@
 #include "includes.h"
 #include "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"
-#include "librpc/gen_ndr/ndr_krb5pac.h"
+#include "librpc/gen_ndr/krb5pac.h"
 #include "auth/auth.h"
 #include "lib/ldb/include/ldb.h"
 #include "auth/auth_sam.h"

source4/auth/ntlm_check.c

@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "lib/crypto/crypto.h"
-#include "librpc/gen_ndr/ndr_netlogon.h"
+#include "librpc/gen_ndr/netlogon.h"
 #include "libcli/auth/libcli_auth.h"
 
 /****************************************************************************

source4/auth/ntlmssp/ntlmssp.h

@@ -20,7 +20,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "librpc/gen_ndr/ndr_samr.h"
+#include "librpc/gen_ndr/samr.h"
 
 /* NTLMSSP mode */
 enum ntlmssp_role

source4/client/client.c

@@ -39,6 +39,8 @@
 #include "libcli/resolve/resolve.h"
 #include "libcli/security/proto.h"
 #include "lib/replace/readline.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 static int io_bufsize = 64512;
 

source4/dsdb/common/flag_mapping.c

@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_samr.h"
+#include "librpc/gen_ndr/samr.h"
 #include "ads.h"
 
 /* 

source4/dsdb/samdb/cracknames.c

@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_drsuapi.h"
+#include "librpc/gen_ndr/drsuapi.h"
 #include "rpc_server/common/common.h"
 #include "lib/ldb/include/ldb_errors.h"
 #include "system/kerberos.h"

source4/dsdb/samdb/ldb_modules/extended_dn.c

@@ -37,6 +37,7 @@
 #include "ldb/include/ldb_errors.h"
 #include "ldb/include/ldb_private.h"
 #include "dsdb/samdb/samdb.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 #include <time.h>
 

source4/dsdb/samdb/ldb_modules/password_hash.c

@@ -34,8 +34,9 @@
 #include "libcli/ldap/ldap.h"
 #include "ldb/include/ldb_errors.h"
 #include "ldb/include/ldb_private.h"
-#include "librpc/gen_ndr/ndr_misc.h"
-#include "librpc/gen_ndr/ndr_samr.h"
+#include "librpc/gen_ndr/misc.h"
+#include "librpc/gen_ndr/samr.h"
+#include "librpc/gen_ndr/ndr_security.h"
 #include "libcli/auth/libcli_auth.h"
 #include "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"

source4/dsdb/samdb/ldb_modules/samldb.c

@@ -39,6 +39,7 @@
 #include "lib/ldb/include/ldb_private.h"
 #include "dsdb/samdb/samdb.h"
 #include "libcli/security/proto.h"
+#include "librpc/gen_ndr/ndr_security.h"
 #include "db_wrap.h"
 
 

source4/dsdb/samdb/samdb.c

@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
 #include "librpc/gen_ndr/ndr_misc.h"
+#include "librpc/gen_ndr/ndr_security.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
 #include "libcli/security/proto.h"

source4/kdc/kpasswdd.c

@@ -31,6 +31,7 @@
 #include "lib/ldb/include/ldb.h"
 #include "heimdal/lib/krb5/krb5_locl.h"
 #include "heimdal/lib/krb5/krb5-private.h"
+#include "librpc/gen_ndr/ndr_security.h"
 #include "auth/auth.h"
 #include "dsdb/samdb/samdb.h"
 #include "rpc_server/dcerpc_server.h"

source4/lib/com/dcom/main.c

@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "librpc/gen_ndr/ndr_epmapper.h"
+#include "librpc/gen_ndr/epmapper.h"
 #include "librpc/gen_ndr/ndr_remact.h"
 #include "librpc/gen_ndr/ndr_remact_c.h"
 #include "librpc/gen_ndr/com_dcom.h"

source4/lib/registry/tools/regshell.c

@@ -25,6 +25,7 @@
 #include "lib/registry/reg_backend_rpc.h"
 #include "system/time.h"
 #include "lib/replace/readline.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 /* 
  * ck/cd - change key

source4/lib/samba3/secrets.c

@@ -28,7 +28,7 @@
 #include "lib/tdb/include/tdb.h"
 #include "lib/samba3/samba3.h"
 #include "system/filesys.h"
-#include "librpc/gen_ndr/ndr_security.h"
+#include "librpc/gen_ndr/security.h"
 #include "lib/tdb/include/tdbutil.h"
 #include "auth/credentials/credentials.h"
 

source4/libcli/auth/credentials.h

@@ -20,7 +20,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "librpc/gen_ndr/ndr_netlogon.h"
+#include "librpc/gen_ndr/netlogon.h"
 
 struct creds_CredentialState {
 	uint32_t negotiate_flags;

source4/libcli/cldap/cldap.c

@@ -39,6 +39,7 @@
 #include "libcli/cldap/cldap.h"
 #include "lib/socket/socket.h"
 #include "libcli/security/proto.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 /*
   destroy a pending request

source4/libcli/cldap/cldap.h

@@ -21,7 +21,7 @@
 */
 
 #include "libcli/util/asn_1.h"
-#include "librpc/gen_ndr/ndr_nbt.h"
+#include "librpc/gen_ndr/nbt.h"
 
 struct ldap_message;
 

source4/libcli/dgram/browse.c

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

source4/libcli/dgram/dgramsocket.c

@@ -25,6 +25,7 @@
 #include "dlinklist.h"
 #include "libcli/dgram/libdgram.h"
 #include "lib/socket/socket.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 
 /*

source4/libcli/dgram/libdgram.h

@@ -20,7 +20,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "librpc/gen_ndr/ndr_nbt.h"
+#include "librpc/gen_ndr/nbt.h"
 
 /*
   a datagram name request

source4/libcli/dgram/netlogon.c

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

source4/libcli/dgram/ntlogon.c

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

source4/libcli/finddcs.c

@@ -24,7 +24,7 @@
 #include "include/includes.h"
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/ndr_irpc.h"
-#include "librpc/gen_ndr/ndr_samr.h"
+#include "librpc/gen_ndr/samr.h"
 #include "libcli/composite/composite.h"
 #include "libcli/libcli.h"
 #include "libcli/resolve/resolve.h"

source4/libcli/nbt/libnbt.h

@@ -23,7 +23,7 @@
 #ifndef __LIBNBT_H__
 #define __LIBNBT_H__
 
-#include "librpc/gen_ndr/ndr_nbt.h"
+#include "librpc/gen_ndr/nbt.h"
 
 /*
   possible states for pending requests

source4/libcli/nbt/nameregister.c

@@ -24,6 +24,7 @@
 #include "libcli/nbt/libnbt.h"
 #include "libcli/composite/composite.h"
 #include "lib/socket/socket.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 /*
   send a nbt name registration request

source4/libcli/nbt/nbtsocket.c

@@ -25,6 +25,7 @@
 #include "dlinklist.h"
 #include "libcli/nbt/libnbt.h"
 #include "lib/socket/socket.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 #define NBT_MAX_REPLIES 1000
 

source4/libcli/raw/clitransport.c

@@ -26,6 +26,7 @@
 #include "dlinklist.h"
 #include "lib/events/events.h"
 #include "lib/stream/packet.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 
 /*

source4/libcli/raw/libcliraw.h

@@ -22,7 +22,7 @@
 
 #include "libcli/raw/request.h"
 #include "smb.h"
-#include "librpc/gen_ndr/ndr_nbt.h"
+#include "librpc/gen_ndr/nbt.h"
 
 struct smbcli_tree;  /* forward declare */
 struct smbcli_request;  /* forward declare */

source4/libcli/raw/rawacl.c

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

source4/libcli/raw/rawfile.c

@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "smb.h"
 #include "libcli/raw/libcliraw.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 #define SETUP_REQUEST(cmd, wct, buflen) do { \
 	req = smbcli_request_setup(tree, cmd, wct, buflen); \

source4/libcli/raw/rawfileinfo.c

@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 /* local macros to make the code more readable */
 #define FINFO_CHECK_MIN_SIZE(size) if (blob->length < (size)) { \

source4/libcli/resolve/host.c

@@ -34,6 +34,7 @@
 #include "system/network.h"
 #include "system/filesys.h"
 #include "libcli/composite/composite.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 struct host_state {
 	struct nbt_name name;

source4/libcli/resolve/nbtlist.c

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

source4/libcli/resolve/resolve.c

@@ -24,6 +24,7 @@
 #include "lib/events/events.h"
 #include "libcli/composite/composite.h"
 #include "libcli/resolve/resolve.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 struct resolve_state {
 	struct nbt_name name;

source4/libcli/security/sddl.c

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

source4/libcli/security/security_token.c

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

source4/libcli/smb_composite/connect.c

@@ -28,6 +28,7 @@
 #include "lib/events/events.h"
 #include "libcli/resolve/resolve.h"
 #include "auth/credentials/credentials.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 /* the stages of this call */
 enum connect_stage {CONNECT_RESOLVE, 

source4/libcli/util/clilsa.c

@@ -31,6 +31,7 @@
 #include "libcli/libcli.h"
 #include "libcli/security/proto.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
+#include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
 
 struct smblsa_state {

source4/libcli/wrepl/winsrepl.c

@@ -25,6 +25,7 @@
 #include "dlinklist.h"
 #include "lib/socket/socket.h"
 #include "libcli/wrepl/winsrepl.h"
+#include "librpc/gen_ndr/ndr_winsrepl.h"
 #include "lib/stream/packet.h"
 #include "libcli/composite/composite.h"
 #include "system/network.h"

source4/libcli/wrepl/winsrepl.h

@@ -20,8 +20,8 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "librpc/gen_ndr/ndr_nbt.h"
-#include "librpc/gen_ndr/ndr_winsrepl.h"
+#include "librpc/gen_ndr/nbt.h"
+#include "librpc/gen_ndr/winsrepl.h"
 
 /*
   main context structure for the wins replication client library

source4/libnet/composite.h

@@ -22,7 +22,7 @@
   composite function io definitions
 */
 
-#include "librpc/gen_ndr/ndr_samr.h"
+#include "librpc/gen_ndr/samr.h"
 
 /*
  * Monitor structure and message types definitions. Composite function monitoring

source4/libnet/libnet_join.c

@@ -31,7 +31,9 @@
 #include "db_wrap.h"
 #include "libcli/security/proto.h"
 #include "auth/credentials/credentials.h"
+#include "librpc/gen_ndr/ndr_samr.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 /*
  * complete a domain join, when joining to a AD domain:

source4/libnet/libnet_join.h

@@ -23,7 +23,7 @@
 #ifndef __LIBNET_JOIN_H__
 #define __LIBNET_JOIN_H__
 
-#include "librpc/gen_ndr/ndr_netlogon.h"
+#include "librpc/gen_ndr/netlogon.h"
 
 enum libnet_Join_level {
 	LIBNET_JOIN_AUTOMATIC,

source4/libnet/libnet_passwd.c

@@ -24,6 +24,7 @@
 #include "libnet/libnet.h"
 #include "lib/crypto/crypto.h"
 #include "libcli/auth/libcli_auth.h"
+#include "librpc/gen_ndr/ndr_samr.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 
 /*

source4/libnet/libnet_rpc.c

@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "libnet/libnet.h"
 #include "libcli/libcli.h"
+#include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
 
 /**

source4/libnet/libnet_samdump.c

@@ -25,6 +25,7 @@
 #include "libnet/libnet.h"
 #include "dlinklist.h"
 #include "samba3/samba3.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 
 struct samdump_secret {

source4/libnet/libnet_samsync_ldb.c

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

source4/libnet/libnet_share.c

@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "libnet/libnet.h"
+#include "librpc/gen_ndr/ndr_srvsvc.h"
 #include "librpc/gen_ndr/ndr_srvsvc_c.h"
 
 

source4/libnet/libnet_share.h

@@ -18,7 +18,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "librpc/gen_ndr/ndr_srvsvc.h"
+#include "librpc/gen_ndr/srvsvc.h"
 
 enum libnet_ListShares_level {
 	LIBNET_LIST_SHARES_GENERIC,

source4/libnet/libnet_time.c

@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "libnet/libnet.h"
 #include "system/time.h"
+#include "librpc/gen_ndr/ndr_srvsvc.h"
 #include "librpc/gen_ndr/ndr_srvsvc_c.h"
 
 /*

source4/libnet/libnet_user.c

@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "libnet/libnet.h"
+#include "librpc/gen_ndr/ndr_samr.h"
 
 
 NTSTATUS libnet_CreateUser(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, struct libnet_CreateUser *r)

source4/libnet/libnet_vampire.c

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

source4/libnet/libnet_vampire.h

@@ -18,7 +18,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "librpc/gen_ndr/ndr_netlogon.h"
+#include "librpc/gen_ndr/netlogon.h"
 
 struct libnet_SamSync_state {
 	struct libnet_context *machine_net_ctx;

source4/librpc/idl/krb5pac.idl

@@ -7,7 +7,7 @@
 [
   version(0.0),
   pointer_default(unique),
-  depends(security,netlogon),
+  depends(security,netlogon,samr),
   helper("librpc/ndr/ndr_krb5pac.h")
 ]
 interface krb5pac

source4/librpc/idl/oxidresolver.idl

@@ -18,7 +18,7 @@
 	endpoint("ncacn_np:[\\pipe\\epmapper]", "ncacn_ip_tcp:[135]", "ncalrpc:"),
 	pointer_default(unique),
   	pointer_default_top(unique),
-	depends(dcom)
+	depends(dcom, orpc)
 ]
 interface IOXIDResolver
 {

source4/librpc/idl/remact.idl

@@ -10,7 +10,7 @@
 	pointer_default(unique),
   	pointer_default_top(unique),
 	endpoint("ncalrpc:", "ncacn_ip_tcp:[135]", "ncacn_np:[\\pipe\\epmapper]"),
-	depends(dcom)
+	depends(dcom,orpc)
 ]
 interface IRemoteActivation
 {

source4/librpc/idl/schannel.idl

@@ -5,7 +5,7 @@
 */
 
 [
-	depends(netlogon)
+	depends(netlogon,nbt)
 ]
 interface schannel
 {

source4/librpc/idl/winreg.idl

@@ -11,7 +11,7 @@
   pointer_default(unique),
   pointer_default_top(unique),
   helpstring("Remote Registry Service"),
-  depends(lsa,initshutdown)
+  depends(lsa,initshutdown,security)
 ] interface winreg
 {
 	declare bitmap security_secinfo;

source4/librpc/ndr/ndr_sec.c

@@ -23,6 +23,7 @@
 
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 /*
   parse a dom_sid2 - this is a dom_sid but with an extra copy of the num_auths field

source4/librpc/ndr/ndr_sec_helper.c

@@ -22,6 +22,7 @@
 
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 /*
   return the wire size of a dom_sid

source4/librpc/rpc/dcerpc_schannel.c

@@ -26,6 +26,7 @@
 #include "auth/auth.h"
 #include "libcli/composite/composite.h"
 #include "libcli/auth/libcli_auth.h"
+#include "librpc/gen_ndr/ndr_netlogon.h"
 #include "librpc/gen_ndr/ndr_netlogon_c.h"
 
 

source4/nbt_server/defense.c

@@ -25,6 +25,7 @@
 #include "system/network.h"
 #include "nbt_server/nbt_server.h"
 #include "nbt_server/wins/winsserver.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 #include "lib/socket/socket.h"
 
 

source4/nbt_server/dgram/browse.c

@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "nbt_server/nbt_server.h"
 #include "lib/socket/socket.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 static const char *nbt_browse_opcode_string(enum nbt_browse_opcode r)
 {

source4/nbt_server/dgram/netlogon.c

@@ -27,6 +27,7 @@
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
 #include "db_wrap.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 /*
   reply to a GETDC request

source4/nbt_server/dgram/ntlogon.c

@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "nbt_server/nbt_server.h"
 #include "lib/socket/socket.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 /*
   reply to a SAM LOGON request

source4/nbt_server/dgram/request.c

@@ -26,6 +26,7 @@
 #include "lib/socket/socket.h"
 #include "libcli/resolve/resolve.h"
 #include "nbt_server/dgram/proto.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 /*
   a list of mailslots that we have static handlers for

source4/nbt_server/irpc.c

@@ -26,8 +26,10 @@
 #include "smbd/service.h"
 #include "nbt_server/nbt_server.h"
 #include "nbt_server/wins/winsserver.h"
+#include "librpc/gen_ndr/ndr_irpc.h"
 #include "lib/socket/socket.h"
 #include "libcli/resolve/resolve.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 /*
   serve out the nbt statistics

source4/nbt_server/nbt_server.h

@@ -23,7 +23,7 @@
 #include "libcli/nbt/libnbt.h"
 #include "libcli/wrepl/winsrepl.h"
 #include "libcli/dgram/libdgram.h"
-#include "librpc/gen_ndr/ndr_irpc.h"
+#include "librpc/gen_ndr/irpc.h"
 #include "lib/messaging/irpc.h"
 
 /* 

source4/nbt_server/nodestatus.c

@@ -25,6 +25,7 @@
 #include "system/network.h"
 #include "nbt_server/nbt_server.h"
 #include "lib/socket/socket.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 /*
   send a name status reply

source4/nbt_server/packet.c

@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "nbt_server/nbt_server.h"
 #include "lib/socket/socket.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 /*
   we received a badly formed packet - log it

source4/nbt_server/query.c

@@ -25,6 +25,7 @@
 #include "system/network.h"
 #include "nbt_server/nbt_server.h"
 #include "nbt_server/wins/winsserver.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 #include "lib/socket/socket.h"
 
 /*

source4/nbt_server/register.c

@@ -28,6 +28,7 @@
 #include "libcli/composite/composite.h"
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "nbt_server/wins/winsserver.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 
 static void nbtd_start_refresh_timer(struct nbtd_iface_name *iname);

source4/nbt_server/wins/winsclient.c

@@ -25,6 +25,7 @@
 #include "nbt_server/wins/winsserver.h"
 #include "libcli/composite/composite.h"
 #include "lib/events/events.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 #include "smbd/service_task.h"
 
 static void nbtd_wins_refresh_handler(struct composite_context *c);

source4/nbt_server/wins/winsdb.c

@@ -26,6 +26,7 @@
 #include "nbt_server/wins/winsdb.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 #include "system/time.h"
 #include "db_wrap.h"
 #include "system/network.h"

source4/nbt_server/wins/winsserver.c

@@ -25,6 +25,7 @@
 #include "nbt_server/nbt_server.h"
 #include "nbt_server/wins/winsdb.h"
 #include "nbt_server/wins/winsserver.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 #include "system/time.h"
 #include "libcli/composite/composite.h"
 #include "smbd/service_task.h"

source4/ntvfs/common/sidmap.c

@@ -28,6 +28,7 @@
 #include "libcli/ldap/ldap.h"
 #include "db_wrap.h"
 #include "libcli/security/proto.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 /*
   these are used for the fallback local uid/gid to sid mapping

source4/ntvfs/ipc/rap_server.c

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

source4/ntvfs/posix/pvfs_acl.c

@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "auth/auth.h"
 #include "vfs_posix.h"
-#include "librpc/gen_ndr/ndr_xattr.h"
+#include "librpc/gen_ndr/xattr.h"
 #include "libcli/security/proto.h"
 
 

source4/ntvfs/posix/pvfs_fsinfo.c

@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "vfs_posix.h"
-#include "librpc/gen_ndr/ndr_xattr.h"
+#include "librpc/gen_ndr/xattr.h"
 
 /* We use libblkid out of e2fsprogs to identify UUID of a volume */
 #ifdef HAVE_LIBBLKID

source4/ntvfs/posix/pvfs_mkdir.c

@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "system/dir.h"
 #include "vfs_posix.h"
-#include "librpc/gen_ndr/ndr_security.h"
+#include "librpc/gen_ndr/security.h"
 
 /*
   create a directory with EAs

source4/ntvfs/posix/pvfs_open.c

@@ -26,7 +26,7 @@
 #include "system/time.h"
 #include "dlinklist.h"
 #include "messaging/messaging.h"
-#include "librpc/gen_ndr/ndr_xattr.h"
+#include "librpc/gen_ndr/xattr.h"
 
 /*
   create file handles with convenient numbers for sniffers

source4/ntvfs/posix/pvfs_qfileinfo.c

@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "vfs_posix.h"
-#include "librpc/gen_ndr/ndr_xattr.h"
+#include "librpc/gen_ndr/xattr.h"
 
 
 /*

source4/ntvfs/posix/pvfs_read.c

@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "vfs_posix.h"
-#include "librpc/gen_ndr/ndr_security.h"
+#include "librpc/gen_ndr/security.h"
 
 /*
   read from a file

source4/ntvfs/posix/pvfs_rename.c

@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "vfs_posix.h"
-#include "librpc/gen_ndr/ndr_security.h"
+#include "librpc/gen_ndr/security.h"
 
 /*
   resolve a wildcard rename pattern. This works on one component of the name

source4/ntvfs/posix/pvfs_search.c

@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "vfs_posix.h"
 #include "system/time.h"
-#include "librpc/gen_ndr/ndr_security.h"
+#include "librpc/gen_ndr/security.h"
 #include "smbd/service_stream.h"
 #include "lib/events/events.h"
 

source4/ntvfs/posix/pvfs_setfileinfo.c

@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "vfs_posix.h"
 #include "system/time.h"
-#include "librpc/gen_ndr/ndr_xattr.h"
+#include "librpc/gen_ndr/xattr.h"
 
 
 /*

source4/ntvfs/posix/pvfs_streams.c

@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "vfs_posix.h"
-#include "librpc/gen_ndr/ndr_xattr.h"
+#include "librpc/gen_ndr/xattr.h"
 
 
 /*

source4/ntvfs/posix/pvfs_write.c

@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "vfs_posix.h"
-#include "librpc/gen_ndr/ndr_security.h"
+#include "librpc/gen_ndr/security.h"
 
 
 /*

source4/ntvfs/posix/pvfs_xattr.c

@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "vfs_posix.h"
 #include "util/unix_privs.h"
+#include "librpc/gen_ndr/ndr_xattr.h"
 
 /*
   pull a xattr as a blob

source4/ntvfs/posix/vfs_posix.c

@@ -26,7 +26,7 @@
 
 #include "includes.h"
 #include "vfs_posix.h"
-#include "librpc/gen_ndr/ndr_security.h"
+#include "librpc/gen_ndr/security.h"
 #include "smbd/service_stream.h"
 #include "lib/tdb/include/tdb.h"
 #include "db_wrap.h"

source4/ntvfs/posix/vfs_posix.h

@@ -23,7 +23,7 @@
 #ifndef _VFS_POSIX_H_
 #define _VFS_POSIX_H_
 
-#include "librpc/gen_ndr/ndr_xattr.h"
+#include "librpc/gen_ndr/xattr.h"
 #include "system/filesys.h"
 #include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"

source4/param/loadparm.c

@@ -59,8 +59,8 @@
 #include "pstring.h"
 #include "system/time.h"
 #include "system/iconv.h"
-#include "librpc/gen_ndr/ndr_svcctl.h"
-#include "librpc/gen_ndr/ndr_samr.h"
+#include "librpc/gen_ndr/svcctl.h"
+#include "librpc/gen_ndr/samr.h"
 #include "smb_server/smb_server.h"
 #include "libcli/raw/signing.h"
 #include "dlinklist.h"

source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm

@@ -2239,10 +2239,14 @@ sub HeaderInterface($)
 
 	pidl_hdr "#include \"librpc/ndr/libndr.h\"";
 
+	if (has_property($interface, "object")) {
+		pidl "#include \"librpc/gen_ndr/ndr_orpc.h\"";
+	}
+
 	if (defined $interface->{PROPERTIES}->{depends}) {
 		my @d = split / /, $interface->{PROPERTIES}->{depends};
 		foreach my $i (@d) {
-			pidl_hdr "#include \"librpc/gen_ndr/ndr_$i\.h\"";
+			pidl "#include \"librpc/gen_ndr/ndr_$i\.h\"";
 		}
 	}
 

source4/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm

@@ -309,11 +309,11 @@ sub ParseInterface($)
 
 sub Parse($$)
 {
-	my($ndr) = shift;
-	my($filename) = shift;
+	my($ndr,$header) = @_;
 
 	$res =  "";
 	$res .= "/* server functions auto-generated by pidl */\n";
+	$res .= "#include \"$header\"\n";
 	$res .= "\n";
 
 	foreach my $x (@{$ndr}) {