nbt: trim down header dependencies of nbt.idl.

Guenther

diff --git a/librpc/idl/nbt.idl b/librpc/idl/nbt.idl
index cd81081267f247e492c651763b15ce817d56273b..69a1853dafc94d27cdb873eea358961832c45309 100644 (file)
--- a/librpc/idl/nbt.idl
+++ b/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")
 ]

diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index c70e68b10333e6540a4052a189d8bb30ccd77069..df7fdc3d9f4ca9fe7142c49fc43dc97c9a912ecb 100644 (file)
--- a/source3/libsmb/namequery.c
+++ b/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;

diff --git a/source4/librpc/idl/winsif.idl b/source4/librpc/idl/winsif.idl
index a678331b11d362f0bb149e959bd8d3ef85de411e..1ca028a2dee3069ece5d62faf5799c92681c1785 100644 (file)
--- a/source4/librpc/idl/winsif.idl
+++ b/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
 {

diff --git a/source4/librpc/idl/winsrepl.idl b/source4/librpc/idl/winsrepl.idl
index 01b8e32bea5b8d94e8a72bd8d834d07076bd3dc8..f60449ec4b26f107aae91095029587763370c2b2 100644 (file)
--- a/source4/librpc/idl/winsrepl.idl
+++ b/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;

diff --git a/source4/smb_server/smb/reply.c b/source4/smb_server/smb/reply.c
index 74f093f37dc99eaa5cddf83156549dda7fe7b75b..bae6b2ca79e061858c322b76db0da49d2d08663e 100644 (file)
--- a/source4/smb_server/smb/reply.c
+++ b/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"
 
 
 /****************************************************************************

diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c
index 56a1c09301c545d754b790e72a861016c7f8133b..fef539c42697045630a3fc9123e1996866b241b1 100644 (file)
--- a/source4/torture/nbt/winsreplication.c
+++ b/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"