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

file dependencies
(This used to be commit 122835876748a3eaf5e8d31ad1abddab9acb8781)

26 files changed, 42 insertions, 0 deletions

diff --git a/source4/torture/auth/pac.c b/source4/torture/auth/pac.c
index 2554295af9d..2e180bfa294 100644
--- a/source4/torture/auth/pac.c
+++ b/source4/torture/auth/pac.c
@@ -27,6 +27,7 @@
 #include "auth/kerberos/kerberos.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
 #include "samba3/samba3.h"
+#include "libcli/security/proto.h"
 
 static BOOL torture_pac_self_check(void) 
 {
diff --git a/source4/torture/ldap/cldapbench.c b/source4/torture/ldap/cldapbench.c
index 806bf9b558c..8d541325e8f 100644
--- a/source4/torture/ldap/cldapbench.c
+++ b/source4/torture/ldap/cldapbench.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "lib/events/events.h"
 #include "libcli/cldap/cldap.h"
+#include "libcli/resolve/resolve.h"
 
 struct bench_state {
 	int pass_count, fail_count;
diff --git a/source4/torture/libnet/userinfo.c b/source4/torture/libnet/userinfo.c
index 744059760ec..589b2ee288c 100644
--- a/source4/torture/libnet/userinfo.c
+++ b/source4/torture/libnet/userinfo.c
@@ -23,6 +23,7 @@
 #include "torture/torture.h"
 #include "libnet/libnet.h"
 #include "libnet/userinfo.h"
+#include "libcli/security/proto.h"
 
 #define TEST_USERNAME  "libnetuserinfotest"
 
diff --git a/source4/torture/local/resolve.c b/source4/torture/local/resolve.c
index f86b4b726b3..a52bfeeb48f 100644
--- a/source4/torture/local/resolve.c
+++ b/source4/torture/local/resolve.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "lib/events/events.h"
+#include "libcli/resolve/resolve.h"
 
 static BOOL test_async_resolve(TALLOC_CTX *mem_ctx)
 {
diff --git a/source4/torture/local/sddl.c b/source4/torture/local/sddl.c
index 30ce4247412..8d940093d1f 100644
--- a/source4/torture/local/sddl.c
+++ b/source4/torture/local/sddl.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "libcli/security/proto.h"
 
 
 /*
diff --git a/source4/torture/local/socket.c b/source4/torture/local/socket.c
index 195354611f4..66268f4f801 100644
--- a/source4/torture/local/socket.c
+++ b/source4/torture/local/socket.c
@@ -23,6 +23,8 @@
 #include "includes.h"
 #include "lib/socket/socket.h"
 #include "lib/events/events.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \
diff --git a/source4/torture/nbt/browse.c b/source4/torture/nbt/browse.c
index a231809ef0c..1b2b698a237 100644
--- a/source4/torture/nbt/browse.c
+++ b/source4/torture/nbt/browse.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
+#include "libcli/resolve/resolve.h"
 
 /*
   test nbt dgram operations
diff --git a/source4/torture/nbt/dgram.c b/source4/torture/nbt/dgram.c
index db074ebeba2..7e0058cd9f1 100644
--- a/source4/torture/nbt/dgram.c
+++ b/source4/torture/nbt/dgram.c
@@ -26,6 +26,9 @@
 #include "lib/socket/socket.h"
 #include "lib/events/events.h"
 #include "torture/rpc/proto.h"
+#include "libcli/resolve/resolve.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 #define TEST_NAME "TORTURE_TEST"
 
diff --git a/source4/torture/nbt/query.c b/source4/torture/nbt/query.c
index fbb4224b284..e9c302d89ce 100644
--- a/source4/torture/nbt/query.c
+++ b/source4/torture/nbt/query.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "lib/events/events.h"
+#include "libcli/resolve/resolve.h"
 
 struct result_struct {
 	int num_pass;
diff --git a/source4/torture/nbt/register.c b/source4/torture/nbt/register.c
index cd7d3c76247..9b928fefcf6 100644
--- a/source4/torture/nbt/register.c
+++ b/source4/torture/nbt/register.c
@@ -22,6 +22,9 @@
 
 #include "includes.h"
 #include "lib/socket/socket.h"
+#include "libcli/resolve/resolve.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 #define CHECK_VALUE(v, correct) do { \
 	if ((v) != (correct)) { \
diff --git a/source4/torture/nbt/wins.c b/source4/torture/nbt/wins.c
index bcb52dc9b81..fe2ffeb36ea 100644
--- a/source4/torture/nbt/wins.c
+++ b/source4/torture/nbt/wins.c
@@ -22,6 +22,9 @@
 
 #include "includes.h"
 #include "lib/socket/socket.h"
+#include "libcli/resolve/resolve.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 #define CHECK_VALUE(v, correct) do { \
 	if ((v) != (correct)) { \
diff --git a/source4/torture/nbt/winsbench.c b/source4/torture/nbt/winsbench.c
index 5aa97f9ade9..e629b842e78 100644
--- a/source4/torture/nbt/winsbench.c
+++ b/source4/torture/nbt/winsbench.c
@@ -23,6 +23,9 @@
 #include "includes.h"
 #include "lib/events/events.h"
 #include "lib/socket/socket.h"
+#include "libcli/resolve/resolve.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 struct wins_state {
 	int num_names;
diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c
index b53c55ca08c..25056f7b9c3 100644
--- a/source4/torture/nbt/winsreplication.c
+++ b/source4/torture/nbt/winsreplication.c
@@ -25,6 +25,9 @@
 #include "libcli/wrepl/winsrepl.h"
 #include "lib/events/events.h"
 #include "lib/socket/socket.h"
+#include "libcli/resolve/resolve.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \
diff --git a/source4/torture/raw/acls.c b/source4/torture/raw/acls.c
index 6450acab18a..470477165f3 100644
--- a/source4/torture/raw/acls.c
+++ b/source4/torture/raw/acls.c
@@ -24,6 +24,7 @@
 #include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
+#include "libcli/security/proto.h"
 
 #define BASEDIR "\\testsd"
 
diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c
index 6025c3d1e4b..97c47acc7e3 100644
--- a/source4/torture/raw/composite.c
+++ b/source4/torture/raw/composite.c
@@ -25,6 +25,7 @@
 #include "lib/events/events.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
+#include "libcli/security/proto.h"
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
 #include "lib/cmdline/popt_common.h"
diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index 5d7ddc6c80f..9b62faee8e4 100644
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -24,6 +24,8 @@
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "lib/events/events.h"
+#include "libcli/security/proto.h"
+#include "libcli/auth/proto.h"
 
 static void init_lsa_String(struct lsa_String *name, const char *s)
 {
diff --git a/source4/torture/rpc/lsa_lookup.c b/source4/torture/rpc/lsa_lookup.c
index 4bfe33baa16..aa36c63f29f 100644
--- a/source4/torture/rpc/lsa_lookup.c
+++ b/source4/torture/rpc/lsa_lookup.c
@@ -23,6 +23,7 @@
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "lib/events/events.h"
+#include "libcli/security/proto.h"
 
 static BOOL open_policy(TALLOC_CTX *mem_ctx, struct dcerpc_pipe *p,
 			struct policy_handle **handle)
diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 79e85cce578..e786dd38982 100644
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -29,6 +29,7 @@
 #include "smb.h"
 #include "lib/cmdline/popt_common.h"
 #include "torture/rpc/proto.h"
+#include "libcli/auth/proto.h"
 
 static const char *machine_password;
 
diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c
index 185a2a6870d..9965e5ddbd7 100644
--- a/source4/torture/rpc/samlogon.c
+++ b/source4/torture/rpc/samlogon.c
@@ -29,6 +29,7 @@
 #include "lib/cmdline/popt_common.h"
 #include "torture/rpc/proto.h"
 #include "auth/gensec/schannel_proto.h"
+#include "libcli/auth/proto.h"
 
 #define TEST_MACHINE_NAME "samlogontest"
 #define TEST_USER_NAME "samlogontestuser"
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 3950942b546..6d1b507c2b6 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -26,6 +26,8 @@
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "smb.h"
 #include "lib/crypto/crypto.h"
+#include "libcli/auth/proto.h"
+#include "libcli/security/proto.h"
 
 #define TEST_ACCOUNT_NAME "samrtorturetest"
 #define TEST_ALIASNAME "samrtorturetestalias"
diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index 68a5a4a2b67..6155b7ac1e0 100644
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -30,6 +30,8 @@
 #include "system/time.h"
 #include "torture/rpc/proto.h"
 #include "auth/gensec/schannel_proto.h"
+#include "libcli/auth/proto.h"
+#include "libcli/security/proto.h"
 
 #define TEST_MACHINE_NAME "samsynctest"
 #define TEST_WKSTA_MACHINE_NAME "samsynctest2"
diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c
index ee16d2de75f..b5ff8bbfac6 100644
--- a/source4/torture/rpc/schannel.c
+++ b/source4/torture/rpc/schannel.c
@@ -25,6 +25,8 @@
 #include "torture/rpc/proto.h"
 #include "lib/cmdline/popt_common.h"
 #include "auth/gensec/schannel_proto.h"
+#include "libcli/auth/proto.h"
+#include "libcli/security/proto.h"
 
 #define TEST_MACHINE_NAME "schannel"
 
diff --git a/source4/torture/rpc/session_key.c b/source4/torture/rpc/session_key.c
index 26626c908ee..b5f8889ded2 100644
--- a/source4/torture/rpc/session_key.c
+++ b/source4/torture/rpc/session_key.c
@@ -25,6 +25,7 @@
 #include "librpc/gen_ndr/ndr_lsa.h"
 
 #include "torture/rpc/proto.h"
+#include "libcli/auth/proto.h"
 
 static void init_lsa_String(struct lsa_String *name, const char *s)
 {
diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c
index 7a02ba24ca1..9f39224b68d 100644
--- a/source4/torture/rpc/testjoin.c
+++ b/source4/torture/rpc/testjoin.c
@@ -35,6 +35,8 @@
 #include "lib/ldb/include/ldb.h"
 
 #include "torture/rpc/proto.h"
+#include "libcli/security/proto.h"
+#include "libcli/auth/proto.h"
 
 struct test_join {
 	struct dcerpc_pipe *p;
diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index 2710215e602..293cba0ee1d 100644
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_winreg.h"
+#include "libcli/security/proto.h"
 
 #define TEST_KEY_BASE "smbtorture test"
 #define TEST_KEY1 TEST_KEY_BASE "\\spottyfoot"
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index 067af257fab..2ce51407beb 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -29,6 +29,7 @@
 #include "lib/ldb/include/ldb.h"
 #include "librpc/rpc/dcerpc_table.h"
 #include "lib/events/events.h"
+#include "libcli/resolve/resolve.h"
 
 #include "torture/basic/proto.h"
 #include "torture/raw/proto.h"