r13924: Split more prototypes out of include/proto.h + initial work on header

file dependencies
(This used to be commit 122835876748a3eaf5e8d31ad1abddab9acb8781)

9 files changed, 16 insertions, 0 deletions

diff --git a/source4/nbt_server/config.mk b/source4/nbt_server/config.mk
index 94c3e9efce..36fec2d87c 100644
--- a/source4/nbt_server/config.mk
+++ b/source4/nbt_server/config.mk
@@ -40,6 +40,7 @@ REQUIRED_SUBSYSTEMS = \
 #######################
 # Start SUBSYSTEM NBTD_DGRAM
 [SUBSYSTEM::NBTD_DGRAM]
+PRIVATE_PROTO_HEADER = dgram/proto.h
 OBJ_FILES = \
 		dgram/request.o \
 		dgram/netlogon.o \
diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c
index 2c8ef5e772..eea36060dd 100644
--- a/source4/nbt_server/dgram/netlogon.c
+++ b/source4/nbt_server/dgram/netlogon.c
@@ -26,6 +26,7 @@
 #include "lib/ldb/include/ldb.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
+#include "db_wrap.h"
 
 /*
   reply to a GETDC request
diff --git a/source4/nbt_server/dgram/request.c b/source4/nbt_server/dgram/request.c
index 8dcd53b9b1..f28170c106 100644
--- a/source4/nbt_server/dgram/request.c
+++ b/source4/nbt_server/dgram/request.c
@@ -24,6 +24,8 @@
 #include "nbt_server/nbt_server.h"
 #include "smbd/service_task.h"
 #include "lib/socket/socket.h"
+#include "libcli/resolve/resolve.h"
+#include "nbt_server/dgram/proto.h"
 
 /*
   a list of mailslots that we have static handlers for
diff --git a/source4/nbt_server/interfaces.c b/source4/nbt_server/interfaces.c
index 36a65b1859..e51cd5c6f3 100644
--- a/source4/nbt_server/interfaces.c
+++ b/source4/nbt_server/interfaces.c
@@ -26,6 +26,9 @@
 #include "smbd/service_task.h"
 #include "lib/socket/socket.h"
 #include "nbt_server/wins/winsserver.h"
+#include "nbt_server/dgram/proto.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 
 /*
diff --git a/source4/nbt_server/irpc.c b/source4/nbt_server/irpc.c
index 8b9c4cfcaa..40ea2e5ef3 100644
--- a/source4/nbt_server/irpc.c
+++ b/source4/nbt_server/irpc.c
@@ -26,6 +26,7 @@
 #include "nbt_server/nbt_server.h"
 #include "nbt_server/wins/winsserver.h"
 #include "lib/socket/socket.h"
+#include "libcli/resolve/resolve.h"
 
 /*
   serve out the nbt statistics
diff --git a/source4/nbt_server/nbt_server.c b/source4/nbt_server/nbt_server.c
index ceeb565ffb..0d4940d459 100644
--- a/source4/nbt_server/nbt_server.c
+++ b/source4/nbt_server/nbt_server.c
@@ -24,6 +24,8 @@
 #include "smbd/service_task.h"
 #include "nbt_server/nbt_server.h"
 #include "nbt_server/wins/winsserver.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 /*
   startup the nbtd task
diff --git a/source4/nbt_server/wins/wins_dns_proxy.c b/source4/nbt_server/wins/wins_dns_proxy.c
index 540f4e2c38..da8b2195d3 100644
--- a/source4/nbt_server/wins/wins_dns_proxy.c
+++ b/source4/nbt_server/wins/wins_dns_proxy.c
@@ -27,6 +27,7 @@
 #include "system/time.h"
 #include "libcli/composite/composite.h"
 #include "smbd/service_task.h"
+#include "libcli/resolve/resolve.h"
 
 struct wins_dns_proxy_state {
 	struct nbt_name_socket *nbtsock;
diff --git a/source4/nbt_server/wins/wins_ldb.c b/source4/nbt_server/wins/wins_ldb.c
index 5efe6bd3ab..83b8d3f438 100644
--- a/source4/nbt_server/wins/wins_ldb.c
+++ b/source4/nbt_server/wins/wins_ldb.c
@@ -34,6 +34,8 @@
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
 #include "lib/ldb/include/ldb_private.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 /* add_record: do things with the sambaPassword attribute */
 static int wins_ldb_verify(struct ldb_module *module, struct ldb_request *req, const struct ldb_message *msg)
diff --git a/source4/nbt_server/wins/winsdb.c b/source4/nbt_server/wins/winsdb.c
index 60c2ab0e4f..7e726aedf2 100644
--- a/source4/nbt_server/wins/winsdb.c
+++ b/source4/nbt_server/wins/winsdb.c
@@ -27,6 +27,9 @@
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
 #include "system/time.h"
+#include "db_wrap.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 uint64_t winsdb_get_maxVersion(struct winsdb_handle *h)
 {