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)

26 files changed, 27 insertions, 8 deletions

diff --git a/source4/libcli/auth/credentials.h b/source4/libcli/auth/credentials.h
index 27c5a4e689..2e781f701f 100644
--- a/source4/libcli/auth/credentials.h
+++ b/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;
diff --git a/source4/libcli/cldap/cldap.c b/source4/libcli/cldap/cldap.c
index 9e407ba200..2773dba1d7 100644
--- a/source4/libcli/cldap/cldap.c
+++ b/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
diff --git a/source4/libcli/cldap/cldap.h b/source4/libcli/cldap/cldap.h
index 944510077b..98cb54dded 100644
--- a/source4/libcli/cldap/cldap.h
+++ b/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;
 
diff --git a/source4/libcli/dgram/browse.c b/source4/libcli/dgram/browse.c
index f67e561afc..18ab398c79 100644
--- a/source4/libcli/dgram/browse.c
+++ b/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,
diff --git a/source4/libcli/dgram/dgramsocket.c b/source4/libcli/dgram/dgramsocket.c
index 326ec7e908..16bb9d2fb7 100644
--- a/source4/libcli/dgram/dgramsocket.c
+++ b/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"
 
 
 /*
diff --git a/source4/libcli/dgram/libdgram.h b/source4/libcli/dgram/libdgram.h
index 830d81257d..26675cb420 100644
--- a/source4/libcli/dgram/libdgram.h
+++ b/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
diff --git a/source4/libcli/dgram/netlogon.c b/source4/libcli/dgram/netlogon.c
index df8c63fa87..08b9b0e641 100644
--- a/source4/libcli/dgram/netlogon.c
+++ b/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 
diff --git a/source4/libcli/dgram/ntlogon.c b/source4/libcli/dgram/ntlogon.c
index 84ad814fa0..f480212b79 100644
--- a/source4/libcli/dgram/ntlogon.c
+++ b/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 
diff --git a/source4/libcli/finddcs.c b/source4/libcli/finddcs.c
index 085aa352ac..9ed20b77ba 100644
--- a/source4/libcli/finddcs.c
+++ b/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"
diff --git a/source4/libcli/nbt/libnbt.h b/source4/libcli/nbt/libnbt.h
index b4411d6fe6..e828beb29f 100644
--- a/source4/libcli/nbt/libnbt.h
+++ b/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
diff --git a/source4/libcli/nbt/nameregister.c b/source4/libcli/nbt/nameregister.c
index 5c7e86367f..957f87abfd 100644
--- a/source4/libcli/nbt/nameregister.c
+++ b/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
diff --git a/source4/libcli/nbt/nbtsocket.c b/source4/libcli/nbt/nbtsocket.c
index 42b92b14cc..eca5253113 100644
--- a/source4/libcli/nbt/nbtsocket.c
+++ b/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
 
diff --git a/source4/libcli/raw/clitransport.c b/source4/libcli/raw/clitransport.c
index df5c608d08..2ad155e9b9 100644
--- a/source4/libcli/raw/clitransport.c
+++ b/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"
 
 
 /*
diff --git a/source4/libcli/raw/libcliraw.h b/source4/libcli/raw/libcliraw.h
index 96a06b9bec..f115a18d23 100644
--- a/source4/libcli/raw/libcliraw.h
+++ b/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 */
diff --git a/source4/libcli/raw/rawacl.c b/source4/libcli/raw/rawacl.c
index 59ac65a340..6f35b7f829 100644
--- a/source4/libcli/raw/rawacl.c
+++ b/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)
diff --git a/source4/libcli/raw/rawfile.c b/source4/libcli/raw/rawfile.c
index 6f8befebfe..d889b500fb 100644
--- a/source4/libcli/raw/rawfile.c
+++ b/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); \
diff --git a/source4/libcli/raw/rawfileinfo.c b/source4/libcli/raw/rawfileinfo.c
index cf8f2f71b4..b33d0df828 100644
--- a/source4/libcli/raw/rawfileinfo.c
+++ b/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)) { \
diff --git a/source4/libcli/resolve/host.c b/source4/libcli/resolve/host.c
index c283f0fda1..781ea957df 100644
--- a/source4/libcli/resolve/host.c
+++ b/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;
diff --git a/source4/libcli/resolve/nbtlist.c b/source4/libcli/resolve/nbtlist.c
index e8473966b4..7188faba7b 100644
--- a/source4/libcli/resolve/nbtlist.c
+++ b/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;
diff --git a/source4/libcli/resolve/resolve.c b/source4/libcli/resolve/resolve.c
index c3fdf4bc25..8bacab8cd7 100644
--- a/source4/libcli/resolve/resolve.c
+++ b/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;
diff --git a/source4/libcli/security/sddl.c b/source4/libcli/security/sddl.c
index a1e9985edd..862a25e20d 100644
--- a/source4/libcli/security/sddl.c
+++ b/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;
diff --git a/source4/libcli/security/security_token.c b/source4/libcli/security/security_token.c
index 7760ee7c22..1391a4654d 100644
--- a/source4/libcli/security/security_token.c
+++ b/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
diff --git a/source4/libcli/smb_composite/connect.c b/source4/libcli/smb_composite/connect.c
index b36e37a1a4..a28d33cf7f 100644
--- a/source4/libcli/smb_composite/connect.c
+++ b/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, 
diff --git a/source4/libcli/util/clilsa.c b/source4/libcli/util/clilsa.c
index 7cafef829a..f1f0f01c1d 100644
--- a/source4/libcli/util/clilsa.c
+++ b/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 {
diff --git a/source4/libcli/wrepl/winsrepl.c b/source4/libcli/wrepl/winsrepl.c
index 3fb142ea0b..c37d5f9873 100644
--- a/source4/libcli/wrepl/winsrepl.c
+++ b/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"
diff --git a/source4/libcli/wrepl/winsrepl.h b/source4/libcli/wrepl/winsrepl.h
index 2fea11bd63..3ea672327b 100644
--- a/source4/libcli/wrepl/winsrepl.h
+++ b/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