r12542: Move some more prototypes out to seperate headers

(This used to be commit 0aca5fd5130d980d07398f3291d294202aefe3c2)

16 files changed, 28 insertions, 0 deletions

diff --git a/source4/libcli/clitrans2.c b/source4/libcli/clitrans2.c
index 6be92fa17d..c440b25e36 100644
--- a/source4/libcli/clitrans2.c
+++ b/source4/libcli/clitrans2.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "libcli/raw/libcliraw.h"
 
 /****************************************************************************
 send a qpathinfo call
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index f76a396852..c3ebebed41 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -35,6 +35,7 @@ MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
 DESCRIPTION = NetBios over TCP/IP client library
+PRIVATE_PROTO_HEADER = nbt/nbt_proto.h
 OBJ_FILES = \
 	nbt/nbtname.o \
 	nbt/nbtsocket.o \
@@ -66,6 +67,7 @@ NOPROTO=YES
 REQUIRED_SUBSYSTEMS = LIBCLI_LDAP
 
 [LIBRARY::LIBCLI_WREPL]
+PRIVATE_PROTO_HEADER = wrepl/winsrepl_proto.h
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
@@ -103,6 +105,7 @@ OBJ_FILES = clireadwrite.o \
 		clideltree.o
 
 [SUBSYSTEM::LIBCLI_RAW]
+PRIVATE_PROTO_HEADER = raw/raw_proto.h
 REQUIRED_SUBSYSTEMS = LIBCLI_RAW_KRB5
 OBJ_FILES = raw/rawfile.o \
 		raw/smb_signing.o \
diff --git a/source4/libcli/ldap/config.mk b/source4/libcli/ldap/config.mk
index 243de79fce..b9fcb20038 100644
--- a/source4/libcli/ldap/config.mk
+++ b/source4/libcli/ldap/config.mk
@@ -1,6 +1,7 @@
 #################################
 # Start SUBSYSTEM LIBCLI_LDAP
 [SUBSYSTEM::LIBCLI_LDAP]
+PRIVATE_PROTO_HEADER = ldap_proto.h
 OBJ_FILES = ldap.o \
 		ldap_client.o \
 		ldap_bind.o \
diff --git a/source4/libcli/ldap/ldap.h b/source4/libcli/ldap/ldap.h
index 4f2dbc0787..b6e69ff8e6 100644
--- a/source4/libcli/ldap/ldap.h
+++ b/source4/libcli/ldap/ldap.h
@@ -254,4 +254,6 @@ struct ldap_message {
 	struct ldap_Control    *controls;
 };
 
+#include "libcli/ldap/ldap_proto.h"
+
 #endif
diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c
index 0a787bbf57..1ce86f7f85 100644
--- a/source4/libcli/ldap/ldap_client.c
+++ b/source4/libcli/ldap/ldap_client.c
@@ -33,6 +33,7 @@
 #include "libcli/ldap/ldap_client.h"
 #include "libcli/composite/composite.h"
 #include "lib/stream/packet.h"
+#include "auth/gensec/gensec.h"
 
 
 /*
diff --git a/source4/libcli/nbt/libnbt.h b/source4/libcli/nbt/libnbt.h
index 218b5e5921..7c9e3e9651 100644
--- a/source4/libcli/nbt/libnbt.h
+++ b/source4/libcli/nbt/libnbt.h
@@ -20,6 +20,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifndef __LIBNBT_H__
+#define __LIBNBT_H__
+
 #include "librpc/gen_ndr/ndr_nbt.h"
 
 /*
@@ -267,3 +270,7 @@ struct nbt_name_release {
 		uint8_t rcode;
 	} out;
 };
+
+#include "libcli/nbt/nbt_proto.h"
+
+#endif /* __LIBNBT_H__ */
diff --git a/source4/libcli/raw/clitransport.c b/source4/libcli/raw/clitransport.c
index a0efe7042c..2972da07a0 100644
--- a/source4/libcli/raw/clitransport.c
+++ b/source4/libcli/raw/clitransport.c
@@ -26,6 +26,7 @@
 #include "dlinklist.h"
 #include "lib/events/events.h"
 #include "lib/stream/packet.h"
+#include "libcli/nbt/libnbt.h"
 
 
 /*
diff --git a/source4/libcli/raw/libcliraw.h b/source4/libcli/raw/libcliraw.h
index decee83eb7..b09361b5ff 100644
--- a/source4/libcli/raw/libcliraw.h
+++ b/source4/libcli/raw/libcliraw.h
@@ -269,3 +269,5 @@ struct smbcli_request {
       req->status = NT_STATUS_INVALID_PARAMETER; \
       goto failed; \
 }
+
+#include "libcli/raw/raw_proto.h"
diff --git a/source4/libcli/raw/rawacl.c b/source4/libcli/raw/rawacl.c
index e168da9d1d..ae17447784 100644
--- a/source4/libcli/raw/rawacl.c
+++ b/source4/libcli/raw/rawacl.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "libcli/raw/libcliraw.h"
 
 /****************************************************************************
 fetch file ACL (async send)
diff --git a/source4/libcli/resolve/host.c b/source4/libcli/resolve/host.c
index 13503b66b3..f1925ca0d8 100644
--- a/source4/libcli/resolve/host.c
+++ b/source4/libcli/resolve/host.c
@@ -35,6 +35,7 @@
 #include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
+#include "libcli/nbt/libnbt.h"
 
 struct host_state {
 	struct nbt_name name;
diff --git a/source4/libcli/resolve/resolve.c b/source4/libcli/resolve/resolve.c
index bbed931eed..dcbccc0c70 100644
--- a/source4/libcli/resolve/resolve.c
+++ b/source4/libcli/resolve/resolve.c
@@ -24,6 +24,7 @@
 #include "lib/events/events.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
+#include "libcli/nbt/libnbt.h"
 
 struct resolve_state {
 	struct nbt_name name;
diff --git a/source4/libcli/security/security_token.c b/source4/libcli/security/security_token.c
index 8e52759e70..e61e2edcf5 100644
--- a/source4/libcli/security/security_token.c
+++ b/source4/libcli/security/security_token.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "dsdb/samdb/samdb.h"
 
 /*
   return a blank security token
diff --git a/source4/libcli/smb2/config.mk b/source4/libcli/smb2/config.mk
index a5b7ce2f38..dc4715ffe4 100644
--- a/source4/libcli/smb2/config.mk
+++ b/source4/libcli/smb2/config.mk
@@ -1,4 +1,5 @@
 [SUBSYSTEM::LIBCLI_SMB2]
+PRIVATE_PROTO_HEADER = smb2_proto.h
 OBJ_FILES = \
 	transport.o \
 	request.o \
diff --git a/source4/libcli/smb2/smb2.h b/source4/libcli/smb2/smb2.h
index ceafacf9d4..eb7c10ed9d 100644
--- a/source4/libcli/smb2/smb2.h
+++ b/source4/libcli/smb2/smb2.h
@@ -197,3 +197,5 @@ struct smb2_request {
 		return NT_STATUS_INVALID_PARAMETER; \
 	} \
 } while (0)
+
+#include "libcli/smb2/smb2_proto.h"
diff --git a/source4/libcli/smb_composite/connect.c b/source4/libcli/smb_composite/connect.c
index 785b0d076b..4191c43ca6 100644
--- a/source4/libcli/smb_composite/connect.c
+++ b/source4/libcli/smb_composite/connect.c
@@ -26,6 +26,7 @@
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
 #include "lib/events/events.h"
+#include "libcli/nbt/libnbt.h"
 
 /* the stages of this call */
 enum connect_stage {CONNECT_RESOLVE, 
diff --git a/source4/libcli/wrepl/winsrepl.h b/source4/libcli/wrepl/winsrepl.h
index e679bef6e6..2fea11bd63 100644
--- a/source4/libcli/wrepl/winsrepl.h
+++ b/source4/libcli/wrepl/winsrepl.h
@@ -154,3 +154,5 @@ struct wrepl_pull_names {
 		} *names;
 	} out;
 };
+
+#include "libcli/wrepl/winsrepl_proto.h"