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)

14 files changed, 15 insertions, 1 deletions

diff --git a/source4/nbt_server/defense.c b/source4/nbt_server/defense.c
index 72ebf0c301..fbd650b104 100644
--- a/source4/nbt_server/defense.c
+++ b/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"
 
 
diff --git a/source4/nbt_server/dgram/browse.c b/source4/nbt_server/dgram/browse.c
index 4cef705f02..37a00519ce 100644
--- a/source4/nbt_server/dgram/browse.c
+++ b/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)
 {
diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c
index eea36060dd..632f987c37 100644
--- a/source4/nbt_server/dgram/netlogon.c
+++ b/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
diff --git a/source4/nbt_server/dgram/ntlogon.c b/source4/nbt_server/dgram/ntlogon.c
index 580422f1de..165a9f461a 100644
--- a/source4/nbt_server/dgram/ntlogon.c
+++ b/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
diff --git a/source4/nbt_server/dgram/request.c b/source4/nbt_server/dgram/request.c
index f28170c106..d307acfb9c 100644
--- a/source4/nbt_server/dgram/request.c
+++ b/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
diff --git a/source4/nbt_server/irpc.c b/source4/nbt_server/irpc.c
index adcdbfd704..3f82bbd757 100644
--- a/source4/nbt_server/irpc.c
+++ b/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
diff --git a/source4/nbt_server/nbt_server.h b/source4/nbt_server/nbt_server.h
index 9203f20fd9..3b70c0a330 100644
--- a/source4/nbt_server/nbt_server.h
+++ b/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"
 
 /* 
diff --git a/source4/nbt_server/nodestatus.c b/source4/nbt_server/nodestatus.c
index 140451d74a..d87e5c470e 100644
--- a/source4/nbt_server/nodestatus.c
+++ b/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
diff --git a/source4/nbt_server/packet.c b/source4/nbt_server/packet.c
index d73a3b027a..da275dee88 100644
--- a/source4/nbt_server/packet.c
+++ b/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
diff --git a/source4/nbt_server/query.c b/source4/nbt_server/query.c
index 078a876c8e..9223e2ee3c 100644
--- a/source4/nbt_server/query.c
+++ b/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"
 
 /*
diff --git a/source4/nbt_server/register.c b/source4/nbt_server/register.c
index 958ab42a3d..7d178991ef 100644
--- a/source4/nbt_server/register.c
+++ b/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);
diff --git a/source4/nbt_server/wins/winsclient.c b/source4/nbt_server/wins/winsclient.c
index 70cc0e9ae8..bfaf1edbde 100644
--- a/source4/nbt_server/wins/winsclient.c
+++ b/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);
diff --git a/source4/nbt_server/wins/winsdb.c b/source4/nbt_server/wins/winsdb.c
index 7e726aedf2..a0b65bec25 100644
--- a/source4/nbt_server/wins/winsdb.c
+++ b/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"
diff --git a/source4/nbt_server/wins/winsserver.c b/source4/nbt_server/wins/winsserver.c
index 85ffd7bce5..9f9e72cbdc 100644
--- a/source4/nbt_server/wins/winsserver.c
+++ b/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"