nbt: trim down header dependencies of nbt.idl.

Guenther

librpc/idl/nbt.idl

@@ -10,7 +10,7 @@
 
 import "misc.idl", "security.idl";
 [
-	helper("../libcli/netlogon/netlogon.h", "../libcli/nbt/libnbt.h", "../librpc/ndr/ndr_nbt.h"),
+	helper("../librpc/ndr/ndr_nbt.h"),
 	helpstring("NBT messages"),
 	uuid("6def41b6-86e4-4c32-997c-ed33af7bcd8e")
 ]

source3/libsmb/namequery.c

@@ -25,6 +25,7 @@
 #include "../libcli/netlogon/netlogon.h"
 #include "lib/async_req/async_sock.h"
 #include "libsmb/nmblib.h"
+#include "../libcli/nbt/libnbt.h"
 
 /* nmbd.c sets this to True. */
 bool global_in_nmbd = False;

source4/librpc/idl/winsif.idl

@@ -6,6 +6,7 @@ import "nbt.idl";
 	uuid("45f52c28-7f9f-101a-b52b-08002b2efabe"),
 	version(1.0),
 	helpstring("WINS Administration Interface1"),
+	helper("../libcli/nbt/libnbt.h"),
 	pointer_default(unique)
 ] interface winsif
 {

source4/librpc/idl/winsrepl.idl

@@ -13,7 +13,8 @@ import "nbt.idl";
 
 [
 	uuid("915f5653-bac1-431c-97ee-9ffb34526921"),
-	helpstring("WINS Replication PDUs")
+	helpstring("WINS Replication PDUs"),
+	helper("../libcli/nbt/libnbt.h")
 ] interface wrepl
 {
 	const int WINS_REPLICATION_PORT = 42;

source4/smb_server/smb/reply.c

@@ -27,6 +27,7 @@
 #include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
+#include "libcli/nbt/libnbt.h"
 
 
 /****************************************************************************

source4/torture/nbt/winsreplication.c

@@ -27,6 +27,7 @@
 #include "system/network.h"
 #include "lib/socket/netif.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
+#include "libcli/nbt/libnbt.h"
 #include "torture/torture.h"
 #include "torture/nbt/proto.h"
 #include "param/param.h"