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 3dd477ca5147f28a962b8437e2611a8222d706bd)

29 files changed, 40 insertions, 10 deletions

diff --git a/source4/torture/auth/pac.c b/source4/torture/auth/pac.c
index 2e180bfa29..2c5387391b 100644
--- a/source4/torture/auth/pac.c
+++ b/source4/torture/auth/pac.c
@@ -28,6 +28,7 @@
 #include "librpc/gen_ndr/ndr_krb5pac.h"
 #include "samba3/samba3.h"
 #include "libcli/security/proto.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 static BOOL torture_pac_self_check(void) 
 {
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index b28d92a586..9bfcbaac64 100644
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -24,7 +24,7 @@
 #include "libcli/raw/request.h"
 #include "libcli/libcli.h"
 #include "libcli/raw/libcliraw.h"
-#include "librpc/gen_ndr/ndr_security.h"
+#include "librpc/gen_ndr/security.h"
 #include "auth/gensec/gensec.h"
 #include "torture/torture.h"
 
diff --git a/source4/torture/ldap/cldap.c b/source4/torture/ldap/cldap.c
index 02b50e8155..3a2b4001b9 100644
--- a/source4/torture/ldap/cldap.c
+++ b/source4/torture/ldap/cldap.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "libcli/cldap/cldap.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \
diff --git a/source4/torture/libnet/domain.c b/source4/torture/libnet/domain.c
index 18933cb033..0151d5fbc2 100644
--- a/source4/torture/libnet/domain.c
+++ b/source4/torture/libnet/domain.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "torture/rpc/rpc.h"
 #include "libnet/libnet.h"
+#include "librpc/gen_ndr/ndr_samr.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 
 static BOOL test_domainopen(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
diff --git a/source4/torture/libnet/libnet_rpc.c b/source4/torture/libnet/libnet_rpc.c
index 418f579728..4f9348ee4b 100644
--- a/source4/torture/libnet/libnet_rpc.c
+++ b/source4/torture/libnet/libnet_rpc.c
@@ -22,6 +22,8 @@
 #include "includes.h"
 #include "lib/cmdline/popt_common.h"
 #include "libnet/libnet.h"
+#include "librpc/gen_ndr/ndr_lsa.h"
+#include "librpc/gen_ndr/ndr_samr.h"
 
 
 static BOOL test_lsa_connect(struct libnet_context *ctx)
diff --git a/source4/torture/libnet/libnet_share.c b/source4/torture/libnet/libnet_share.c
index b7d877b097..3366433e40 100644
--- a/source4/torture/libnet/libnet_share.c
+++ b/source4/torture/libnet/libnet_share.c
@@ -24,6 +24,7 @@
 #include "torture/rpc/rpc.h"
 #include "libnet/libnet.h"
 #include "lib/cmdline/popt_common.h"
+#include "librpc/gen_ndr/ndr_srvsvc.h"
 #include "librpc/gen_ndr/ndr_srvsvc_c.h"
 
 
diff --git a/source4/torture/libnet/userinfo.c b/source4/torture/libnet/userinfo.c
index 44a0dcf79b..1e9b5defbd 100644
--- a/source4/torture/libnet/userinfo.c
+++ b/source4/torture/libnet/userinfo.c
@@ -24,7 +24,9 @@
 #include "libnet/libnet.h"
 #include "libnet/userinfo.h"
 #include "libcli/security/proto.h"
+#include "librpc/gen_ndr/ndr_samr.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 #define TEST_USERNAME  "libnetuserinfotest"
 
diff --git a/source4/torture/libnet/userman.c b/source4/torture/libnet/userman.c
index 2df495a15f..cf25f0d760 100644
--- a/source4/torture/libnet/userman.c
+++ b/source4/torture/libnet/userman.c
@@ -23,6 +23,7 @@
 #include "torture/rpc/rpc.h"
 #include "libnet/userman.h"
 #include "libnet/libnet.h"
+#include "librpc/gen_ndr/ndr_samr.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 
 #define TEST_USERNAME  "libnetusermantest"
diff --git a/source4/torture/local/binding_string.c b/source4/torture/local/binding_string.c
index 827eb6c585..12637608c6 100644
--- a/source4/torture/local/binding_string.c
+++ b/source4/torture/local/binding_string.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_epmapper.h"
+#include "librpc/gen_ndr/epmapper.h"
 
 static BOOL test_BindingString(TALLOC_CTX *mem_ctx, const char *binding)
 {
diff --git a/source4/torture/local/sddl.c b/source4/torture/local/sddl.c
index 8d940093d1..5f956808d1 100644
--- a/source4/torture/local/sddl.c
+++ b/source4/torture/local/sddl.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "libcli/security/proto.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 
 /*
diff --git a/source4/torture/nbt/browse.c b/source4/torture/nbt/browse.c
index 1b2b698a23..415994ee86 100644
--- a/source4/torture/nbt/browse.c
+++ b/source4/torture/nbt/browse.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_nbt.h"
+#include "librpc/gen_ndr/nbt.h"
 #include "libcli/resolve/resolve.h"
 
 /*
diff --git a/source4/torture/nbt/dgram.c b/source4/torture/nbt/dgram.c
index 0de5554393..79bc3995dd 100644
--- a/source4/torture/nbt/dgram.c
+++ b/source4/torture/nbt/dgram.c
@@ -22,7 +22,9 @@
 
 #include "includes.h"
 #include "libcli/dgram/libdgram.h"
-#include "librpc/gen_ndr/ndr_samr.h"
+#include "librpc/gen_ndr/samr.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
+#include "librpc/gen_ndr/ndr_netlogon.h"
 #include "lib/socket/socket.h"
 #include "lib/events/events.h"
 #include "torture/rpc/rpc.h"
diff --git a/source4/torture/nbt/wins.c b/source4/torture/nbt/wins.c
index fe2ffeb36e..f983764129 100644
--- a/source4/torture/nbt/wins.c
+++ b/source4/torture/nbt/wins.c
@@ -25,6 +25,7 @@
 #include "libcli/resolve/resolve.h"
 #include "system/network.h"
 #include "netif/netif.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 #define CHECK_VALUE(v, correct) do { \
 	if ((v) != (correct)) { \
diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c
index 2ac9d1cfb3..07c4865bdf 100644
--- a/source4/torture/nbt/winsreplication.c
+++ b/source4/torture/nbt/winsreplication.c
@@ -28,6 +28,7 @@
 #include "libcli/resolve/resolve.h"
 #include "system/network.h"
 #include "netif/netif.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \
diff --git a/source4/torture/raw/acls.c b/source4/torture/raw/acls.c
index 7a7780c01c..8c6fbce851 100644
--- a/source4/torture/raw/acls.c
+++ b/source4/torture/raw/acls.c
@@ -27,6 +27,7 @@
 #include "librpc/gen_ndr/lsa.h"
 #include "libcli/util/clilsa.h"
 #include "libcli/security/proto.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 #define BASEDIR "\\testsd"
 
diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c
index 97c47acc7e..d8f7a78b11 100644
--- a/source4/torture/raw/composite.c
+++ b/source4/torture/raw/composite.c
@@ -29,7 +29,7 @@
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
 #include "lib/cmdline/popt_common.h"
-#include "librpc/gen_ndr/ndr_security.h"
+#include "librpc/gen_ndr/security.h"
 
 #define BASEDIR "\\composite"
 
diff --git a/source4/torture/raw/open.c b/source4/torture/raw/open.c
index 420580847e..94b28f6379 100644
--- a/source4/torture/raw/open.c
+++ b/source4/torture/raw/open.c
@@ -23,7 +23,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
 #include "system/filesys.h"
-#include "librpc/gen_ndr/ndr_security.h"
+#include "librpc/gen_ndr/security.h"
 #include "lib/events/events.h"
 #include "libcli/libcli.h"
 
diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index 65a72818cf..5630f94e64 100644
--- a/source4/torture/raw/oplock.c
+++ b/source4/torture/raw/oplock.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "torture/torture.h"
-#include "librpc/gen_ndr/ndr_security.h"
+#include "librpc/gen_ndr/security.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
 
diff --git a/source4/torture/rpc/lsa_lookup.c b/source4/torture/rpc/lsa_lookup.c
index 146131286d..bd7b98b987 100644
--- a/source4/torture/rpc/lsa_lookup.c
+++ b/source4/torture/rpc/lsa_lookup.c
@@ -21,12 +21,13 @@
 
 #include "includes.h"
 #include "torture/torture.h"
-#include "librpc/gen_ndr/ndr_lsa.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.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 static BOOL open_policy(TALLOC_CTX *mem_ctx, struct dcerpc_pipe *p,
 			struct policy_handle **handle)
diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 14e7a49305..ffa62f8fa3 100644
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -30,7 +30,9 @@
 #include "lib/cmdline/popt_common.h"
 #include "torture/rpc/rpc.h"
 #include "libcli/auth/libcli_auth.h"
+#include "librpc/gen_ndr/ndr_netlogon.h"
 #include "librpc/gen_ndr/ndr_netlogon_c.h"
+#include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
 
 static const char *machine_password;
diff --git a/source4/torture/rpc/oxidresolve.c b/source4/torture/rpc/oxidresolve.c
index 950d9184dc..0c128f9f1f 100644
--- a/source4/torture/rpc/oxidresolve.c
+++ b/source4/torture/rpc/oxidresolve.c
@@ -25,8 +25,9 @@
 #include "librpc/gen_ndr/ndr_oxidresolver_c.h"
 #include "librpc/gen_ndr/ndr_remact.h"
 #include "librpc/gen_ndr/ndr_remact_c.h"
-#include "librpc/gen_ndr/ndr_epmapper.h"
+#include "librpc/gen_ndr/epmapper.h"
 #include "torture/rpc/rpc.h"
+#include "librpc/gen_ndr/ndr_dcom.h"
 
 #define CLSID_IMAGEDOC "02B01C80-E03D-101A-B294-00DD010F2BF9"
 
diff --git a/source4/torture/rpc/remact.c b/source4/torture/rpc/remact.c
index 13d41394b8..81f609e8b3 100644
--- a/source4/torture/rpc/remact.c
+++ b/source4/torture/rpc/remact.c
@@ -25,6 +25,7 @@
 #include "librpc/gen_ndr/ndr_remact_c.h"
 #include "librpc/gen_ndr/ndr_epmapper.h"
 #include "librpc/gen_ndr/ndr_epmapper_c.h"
+#include "librpc/gen_ndr/ndr_dcom.h"
 #include "torture/rpc/rpc.h"
 
 #define CLSID_IMAGEDOC "02B01C80-E03D-101A-B294-00DD010F2BF9"
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 10541ccf54..fcf0215a1e 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -22,9 +22,10 @@
 
 #include "includes.h"
 #include "torture/torture.h"
-#include "librpc/gen_ndr/ndr_lsa.h"
+#include "librpc/gen_ndr/lsa.h"
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
+#include "librpc/gen_ndr/ndr_security.h"
 #include "smb.h"
 #include "lib/crypto/crypto.h"
 #include "libcli/auth/libcli_auth.h"
diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index 4ed28ab563..6b55c820d9 100644
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -32,9 +32,12 @@
 #include "auth/gensec/schannel_proto.h"
 #include "libcli/auth/libcli_auth.h"
 #include "libcli/security/proto.h"
+#include "librpc/gen_ndr/ndr_netlogon.h"
 #include "librpc/gen_ndr/ndr_netlogon_c.h"
+#include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 #define TEST_MACHINE_NAME "samsynctest"
 #define TEST_WKSTA_MACHINE_NAME "samsynctest2"
diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c
index efcb279286..b39d1258c2 100644
--- a/source4/torture/rpc/schannel.c
+++ b/source4/torture/rpc/schannel.c
@@ -23,7 +23,9 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
 #include "librpc/gen_ndr/ndr_netlogon_c.h"
+#include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
+#include "librpc/gen_ndr/ndr_samr.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 #include "auth/credentials/credentials.h"
 #include "torture/rpc/rpc.h"
diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c
index 55fa25fb38..76fe3ec2ae 100644
--- a/source4/torture/rpc/testjoin.c
+++ b/source4/torture/rpc/testjoin.c
@@ -33,6 +33,7 @@
 #include "lib/cmdline/popt_common.h"
 #include "smb.h"
 #include "lib/ldb/include/ldb.h"
+#include "librpc/gen_ndr/ndr_samr.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 
 #include "libcli/auth/libcli_auth.h"
diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index e8e2f0e346..0e219d4161 100644
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -24,6 +24,7 @@
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_winreg.h"
 #include "librpc/gen_ndr/ndr_winreg_c.h"
+#include "librpc/gen_ndr/ndr_security.h"
 #include "libcli/security/proto.h"
 #include "torture/rpc/rpc.h"
 
diff --git a/source4/torture/smb2/util.c b/source4/torture/smb2/util.c
index 84a35900a3..70be00f5fd 100644
--- a/source4/torture/smb2/util.c
+++ b/source4/torture/smb2/util.c
@@ -26,6 +26,7 @@
 #include "lib/cmdline/popt_common.h"
 #include "lib/events/events.h"
 #include "system/time.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 
 /*
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index ae0e1d20fd..aba6110acb 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -33,6 +33,7 @@
 #include "auth/credentials/credentials.h"
 #include "librpc/rpc/dcerpc_table.h"
 #include "libcli/ldap/ldap_client.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 #include "torture/basic/proto.h"
 #include "torture/raw/proto.h"