r12542: Move some more prototypes out to seperate headers

(This used to be commit 0aca5fd5130d980d07398f3291d294202aefe3c2)

diff --git a/source4/auth/auth.h b/source4/auth/auth.h
index 58f72aa8af48d016409959c526dd94ceb4798b4f..9aa6d29c6eef482e68876f19dd629d84a818337c 100644 (file)
--- a/source4/auth/auth.h
+++ b/source4/auth/auth.h
@@ -180,5 +180,6 @@ struct auth_critical_sizes {
                           const struct auth_usersupplied_info *user_info_in,
                           const struct auth_usersupplied_info **user_info_encrypted);
 
+#include "auth/auth_proto.h"
 
 #endif /* _SMBAUTH_H_ */

diff --git a/source4/auth/auth_sam.c b/source4/auth/auth_sam.c
index 49813a437dedbd0654fa10d333f3a7fcd47e8ed4..15abeab09100a679b2e4fadac64f37869b14283b 100644 (file)
--- a/source4/auth/auth_sam.c
+++ b/source4/auth/auth_sam.c
@@ -25,6 +25,8 @@
 #include "system/time.h"
 #include "auth/auth.h"
 #include "lib/ldb/include/ldb.h"
+#include "dsdb/samdb/samdb.h"
+#include "libcli/ldap/ldap.h"
 
 static const char *user_attrs[] = {
        /* requried for the krb5 kdc*/

diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index b620cece967ef12656ba5891e5b69cffdd5462d3..b24aea836a36060cf25728ac196f5ecd3b1b26a8 100644 (file)
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -67,6 +67,7 @@ OBJ_FILES = pam_errors.o
 #######################
 # Start SUBSYSTEM AUTH
 [SUBSYSTEM::AUTH]
+PRIVATE_PROTO_HEADER = auth_proto.h
 OBJ_FILES = \
                auth.o \
                auth_util.o \

diff --git a/source4/auth/credentials/config.mk b/source4/auth/credentials/config.mk
index 4efa81fb04addfa94d651d4964833d7beb49417f..db36b01334ee8657f8ad9342d24555695177a649 100644 (file)
--- a/source4/auth/credentials/config.mk
+++ b/source4/auth/credentials/config.mk
@@ -1,6 +1,7 @@
 #################################
 # Start SUBSYSTEM GENSEC
 [SUBSYSTEM::CREDENTIALS]
+PRIVATE_PROTO_HEADER = credentials_proto.h
 OBJ_FILES = credentials.o \
                credentials_files.o \
                credentials_krb5.o \

diff --git a/source4/auth/credentials/credentials.h b/source4/auth/credentials/credentials.h
index c8a95e2b516eb257f3c4dcf7cf3c5af55f80fcf6..8402676acd440c6daa0d9665f436d19c0b98170f 100644 (file)
--- a/source4/auth/credentials/credentials.h
+++ b/source4/auth/credentials/credentials.h
@@ -97,3 +97,5 @@ struct cli_credentials {
        /* A list of valid GENSEC mechanisms for use on this account */
        const struct gensec_security_ops **gensec_list;
 };
+
+#include "auth/credentials/credentials_proto.h"

diff --git a/source4/auth/credentials/credentials_gensec.c b/source4/auth/credentials/credentials_gensec.c
index fcaa760ed4ce925b842ef241748cccf942162a59..7ea15e7988d5bcb68686c2b964e7d4cbdb908106 100644 (file)
--- a/source4/auth/credentials/credentials_gensec.c
+++ b/source4/auth/credentials/credentials_gensec.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "auth/gensec/gensec.h"
 
 const struct gensec_security_ops **cli_credentials_gensec_list(struct cli_credentials *creds) 
 {

diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk
index 9078d72647c745e413f99d64b7cb5072baa0c720..54b082bda0c75f5e4acb2c38e818ae06e28c1d67 100644 (file)
--- a/source4/auth/gensec/config.mk
+++ b/source4/auth/gensec/config.mk
@@ -6,6 +6,7 @@ MINOR_VERSION = 0
 DESCRIPTION = Generic Security Library
 RELEASE_VERSION = 1
 PUBLIC_HEADERS = gensec.h
+PRIVATE_PROTO_HEADER = gensec_proto.h
 INIT_FUNCTION = gensec_init
 OBJ_FILES = gensec.o
 REQUIRED_SUBSYSTEMS = \

diff --git a/source4/auth/gensec/gensec.h b/source4/auth/gensec/gensec.h
index 4ff09d2066f4e9328a83f0168ad8dc7b580f7cfa..ae85bf8f5e81f1ecbb7bdceb11dd06535998fb68 100644 (file)
--- a/source4/auth/gensec/gensec.h
+++ b/source4/auth/gensec/gensec.h
@@ -123,4 +123,4 @@ struct gensec_critical_sizes {
        int sizeof_gensec_security;
 };
 
-
+#include "gensec_proto.h"

diff --git a/source4/auth/gensec/schannel_state.c b/source4/auth/gensec/schannel_state.c
index edc7b8445bbea78b2d3a299466992c8fa15c5c3d..43391b3a699935aabf1f7fc39bb8d8f821602427 100644 (file)
--- a/source4/auth/gensec/schannel_state.c
+++ b/source4/auth/gensec/schannel_state.c
@@ -26,6 +26,7 @@
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
 #include "db_wrap.h"
+#include "dsdb/samdb/samdb.h"
 
 /*
   connect to the schannel ldb

diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index 4435258c2c5fad94b97c6e867ac41412818f36a4..f5703d5b93c61eb290b436cf96e1f6435e1f90cf 100644 (file)
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -45,6 +45,7 @@ my $section_types = {
                "NOPROTO"               => "bool",
 
                "MANPAGE"               => "string",
+               "PRIVATE_PROTO_HEADER" => "string"
                },
        "BINARY" => {
                "OBJ_FILES"             => "list",
@@ -56,6 +57,7 @@ my $section_types = {
 
                "MANPAGE"               => "string",
                "INSTALLDIR"            => "string",
+               "PRIVATE_PROTO_HEADER" => "string"
                },
        "LIBRARY" => {
                "MAJOR_VERSION"         => "string",

diff --git a/source4/cldap_server/netlogon.c b/source4/cldap_server/netlogon.c
index 95d0250268cec9849b148b413a89ea2080c67343..e58907d69f90105fa0d9e032af504d4ef4cc8145 100644 (file)
--- a/source4/cldap_server/netlogon.c
+++ b/source4/cldap_server/netlogon.c
@@ -26,6 +26,8 @@
 #include "lib/socket/socket.h"
 #include "smbd/service_task.h"
 #include "cldap_server/cldap_server.h"
+#include "dsdb/samdb/samdb.h"
+#include "auth/auth.h"
 
 /*
   fill in the cldap netlogon union for a given version

diff --git a/source4/client/client.c b/source4/client/client.c
index 2dfd1f940a23955cc6cbfb2ed6f8fd409aaf4c54..dc3ea7df746719ff6ae693d0ad37420a739d5a81 100644 (file)
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -28,6 +28,7 @@
 #include "librpc/gen_ndr/ndr_srvsvc.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/nbt/libnbt.h"
 #include "system/time.h"
 #include "system/dir.h"
 #include "system/filesys.h"

diff --git a/source4/dsdb/config.mk b/source4/dsdb/config.mk
index bcdc92d9c05c71f87c4f4f0be028628fb140cb5c..b691a45f2137ad2e955016ba4886b2bcc4eedc5c 100644 (file)
--- a/source4/dsdb/config.mk
+++ b/source4/dsdb/config.mk
@@ -5,6 +5,7 @@ include samdb/ldb_modules/config.mk
 ################################################
 # Start SUBSYSTEM SAMDB
 [SUBSYSTEM::SAMDB]
+PRIVATE_PROTO_HEADER = samdb/samdb.h
 OBJ_FILES = \
                samdb/samdb.o \
                samdb/samdb_privilege.o \

diff --git a/source4/dsdb/samdb/cracknames.c b/source4/dsdb/samdb/cracknames.c
index a29e611566c2a83ffbe54a0df47d3b7ab4a8e1e6..b5479e89be5496598b3d9958214c1c3f73cb3117 100644 (file)
--- a/source4/dsdb/samdb/cracknames.c
+++ b/source4/dsdb/samdb/cracknames.c
@@ -31,6 +31,9 @@
 #include "lib/ldb/include/ldb_errors.h"
 #include "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"
+#include "dsdb/samdb/samdb.h"
+#include "libcli/ldap/ldap.h"
+#include "auth/auth.h"
 
 static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                                   struct smb_krb5_context *smb_krb5_context,

diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
index a959cc9bb4d8fee2eb44970210500acdfd7f0f65..cc4465b17db29a714836c2705637e0bcd3ea73df 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -38,6 +38,7 @@
 #include "lib/ldb/include/ldb_private.h"
 #include "system/time.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "dsdb/samdb/samdb.h"
 
 #define SAM_ACCOUNT_NAME_BASE "$000000-000000000000"
 

diff --git a/source4/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c
index c5eba8ae84aeac49a72174d2947378dcf0d326d7..b6a2f9ce33ac76a48ef2d2b679fcbd0b8cb35b2c 100644 (file)
--- a/source4/dsdb/samdb/samdb.c
+++ b/source4/dsdb/samdb/samdb.c
@@ -28,6 +28,7 @@
 #include "system/time.h"
 #include "system/filesys.h"
 #include "db_wrap.h"
+#include "dsdb/samdb/samdb.h"
 
 /*
   connect to the SAM database

diff --git a/source4/dsdb/samdb/samdb_privilege.c b/source4/dsdb/samdb/samdb_privilege.c
index 55dfef04aa23118ef7024043bd7261add7112e03..ba29a8e96ed1c0869d0c5c43f639c20be4b7d478 100644 (file)
--- a/source4/dsdb/samdb/samdb_privilege.c
+++ b/source4/dsdb/samdb/samdb_privilege.c
@@ -23,6 +23,9 @@
 #include "includes.h"
 #include "librpc/gen_ndr/security.h"
 #include "lib/ldb/include/ldb.h"
+#include "libcli/ldap/ldap.h"
+#include "dsdb/samdb/samdb.h"
+#include "auth/auth.h"
 
 /*
   add privilege bits for one sid to a security_token

diff --git a/source4/gtk/tools/gepdump.c b/source4/gtk/tools/gepdump.c
index 9275bc1ebd0bdd7e8a36360af6b123d6bf7f3aef..e43c79b9264ce02ada3f7cad80dbf96033e491a3 100644 (file)
--- a/source4/gtk/tools/gepdump.c
+++ b/source4/gtk/tools/gepdump.c
@@ -25,6 +25,7 @@
 #include "gtk/common/select.h"
 #include "gtk/common/gtk-smb.h"
 #include "lib/cmdline/popt_common.h"
+#include "auth/gensec/gensec.h"
 #include "smb_build.h"
 
 /* 

diff --git a/source4/include/includes.h b/source4/include/includes.h
index a8aecc36102d6907e56724f8c4c7d6bbe1b5681c..b6d074f8b22a57bf397701699b3358209a25414f 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -85,6 +85,7 @@ struct ipv4_addr {
 };
 
 
+#define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
 #include "lib/replace/replace.h"
 
 /* Lists, trees, caching, database... */
@@ -102,7 +103,6 @@ struct ipv4_addr {
 #include "smb.h"
 #include "byteorder.h"
 #include "librpc/ndr/libndr.h"
-#include "librpc/gen_ndr/misc.h"
 #include "librpc/gen_ndr/dcerpc.h"
 #include "librpc/ndr/ndr_orpc.h"
 #include "librpc/gen_ndr/orpc.h"
@@ -110,9 +110,9 @@ struct ipv4_addr {
 #include "smb_interfaces.h"
 #include "cli_context.h"
 #include "auth/credentials/credentials.h"
+#include "libcli/nbt/libnbt.h"
 
 /***** automatically generated prototypes *****/
-#define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
 #include "include/proto.h"
 #include "basic.h"
 #undef _PRINTF_ATTRIBUTE

diff --git a/source4/include/structs.h b/source4/include/structs.h
index 2187fcd8ba860304c51f9f1ed8c5cc06b8de0106..b78d9184177328cf4570001b6e7dd5126723bfef 100644 (file)
--- a/source4/include/structs.h
+++ b/source4/include/structs.h
@@ -340,6 +340,7 @@ struct packet_context;
 
 struct smbcli_socket;
 struct smbcli_request;
+struct smbcli_tree;
 
 struct _krb5_krb_auth_data;
 

diff --git a/source4/kdc/hdb-ldb.c b/source4/kdc/hdb-ldb.c
index 367c211b90a74477e12f6c4f60ad40a75934cc06..5a3d9c25e7dc82aabf9e57b8cf082106c2d07236 100644 (file)
--- a/source4/kdc/hdb-ldb.c
+++ b/source4/kdc/hdb-ldb.c
@@ -41,6 +41,7 @@
 #include "system/iconv.h"
 #include "librpc/gen_ndr/netlogon.h"
 #include "auth/auth.h"
+#include "dsdb/samdb/samdb.h"
 
 enum hdb_ldb_ent_type 
 { HDB_LDB_ENT_TYPE_CLIENT, HDB_LDB_ENT_TYPE_SERVER, 

diff --git a/source4/kdc/kpasswdd.c b/source4/kdc/kpasswdd.c
index 4dd0eda44429193ce7c4c52c13c9fccc2c5c0071..e6f0ae9dd7a9fe93e8ec81bd8d3fe01f017fab1e 100644 (file)
--- a/source4/kdc/kpasswdd.c
+++ b/source4/kdc/kpasswdd.c
@@ -31,6 +31,7 @@
 #include "lib/ldb/include/ldb.h"
 #include "heimdal/lib/krb5/krb5-private.h"
 #include "auth/auth.h"
+#include "dsdb/samdb/samdb.h"
 
 /* hold information about one kdc socket */
 struct kpasswd_socket {

diff --git a/source4/ldap_server/ldap_bind.c b/source4/ldap_server/ldap_bind.c
index 4350f3abe8617ca9912cf1c74ccb91509a0425d8..badd4ec541bb7040349a9fc376e7ce575fadd198 100644 (file)
--- a/source4/ldap_server/ldap_bind.c
+++ b/source4/ldap_server/ldap_bind.c
@@ -23,6 +23,7 @@
 #include "auth/auth.h"
 #include "libcli/ldap/ldap.h"
 #include "smbd/service_stream.h"
+#include "dsdb/samdb/samdb.h"
 
 static NTSTATUS ldapsrv_BindSimple(struct ldapsrv_call *call)
 {

diff --git a/source4/ldap_server/ldap_simple_ldb.c b/source4/ldap_server/ldap_simple_ldb.c
index 07d85f634ff06577910859c3c5933980a56e20ed..a32cc3b5e0f7f7c91967ded07c95f3c97159d469 100644 (file)
--- a/source4/ldap_server/ldap_simple_ldb.c
+++ b/source4/ldap_server/ldap_simple_ldb.c
@@ -25,6 +25,7 @@
 #include "lib/ldb/include/ldb_errors.h"
 #include "auth/auth.h"
 #include "db_wrap.h"
+#include "dsdb/samdb/samdb.h"
 
 #define VALID_DN_SYNTAX(dn,i) do {\
        if (!(dn)) {\

diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index b4bde76d3f61cbff99fd2040714fcc00570c0d99..a092f2c818d3ddb45600f5a07cc77d60276daceb 100644 (file)
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -57,6 +57,7 @@ OBJ_FILES = \
 ################################################
 
 [SUBSYSTEM::GENCACHE]
+PRIVATE_PROTO_HEADER = gencache.h
 OBJ_FILES = \
                gencache.o \
 

diff --git a/source4/lib/ldb/samba/ldif_handlers.c b/source4/lib/ldb/samba/ldif_handlers.c
index 6d2e4349cfb0036e75a2f61f2cbec8552824ec41..84270195dc9a525ff87c55195b016a48476f803d 100644 (file)
--- a/source4/lib/ldb/samba/ldif_handlers.c
+++ b/source4/lib/ldb/samba/ldif_handlers.c
@@ -27,6 +27,7 @@
 #include "ldb/include/ldb_private.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/gen_ndr/ndr_misc.h"
+#include "dsdb/samdb/samdb.h"
 
 /*
   convert a ldif formatted objectSid to a NDR formatted blob

diff --git a/source4/lib/ldb/tools/cmdline.c b/source4/lib/ldb/tools/cmdline.c
index 3bbc87d05f67795b49d19801163b1bf2a7247928..a14434622fdfbbaa2c394d1fa3d6e04a82266e5b 100644 (file)
--- a/source4/lib/ldb/tools/cmdline.c
+++ b/source4/lib/ldb/tools/cmdline.c
@@ -29,6 +29,7 @@
 #ifdef _SAMBA_BUILD_
 #include "lib/cmdline/popt_common.h"
 #include "smb_build.h"
+#include "auth/auth.h"
 #endif
 
 /*

diff --git a/source4/libcli/clitrans2.c b/source4/libcli/clitrans2.c
index 6be92fa17d6b8221c9bcaef2d809342db190c01e..c440b25e36edab58cbde7e9a97d3ebdbda53adfd 100644 (file)
--- 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 f76a396852ef9f863d5ca0d8bf3258d57d2dcfcb..c3ebebed412f790d6cda2b93b14801376e6048d7 100644 (file)
--- 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 243de79fce435f7841161babf8bafa19ff2bcd86..b9fcb200386891d7f10550572fa420df4e603f7a 100644 (file)
--- 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 4f2dbc07871182d5d6182bd388355ddc7b38d516..b6e69ff8e6926a3c3661543cff13ef4280bc7eaf 100644 (file)
--- 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 0a787bbf5780329709da626aa0a48f9bc8786482..1ce86f7f8570a7752d6d165c858a24179e425f77 100644 (file)
--- 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 218b5e5921b8b5983b679128e7876d5b9c2498d0..7c9e3e9651ac5f2e6de8ed23e21248ef8fcb0cec 100644 (file)
--- 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 a0efe7042c9b26bf8433459ea621db43e3e385ab..2972da07a0ceec9f3319e4cfdc30dc41cf35d9a5 100644 (file)
--- 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 decee83eb71ed9392e92540c22af5ecaf8ab684c..b09361b5ffd1450012cbe6fd9b8c312b3fbe1efb 100644 (file)
--- 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 e168da9d1d51c5cd379d994c13cf09ec98063e63..ae17447784e179bcea615accfdeba25e1da669fe 100644 (file)
--- 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 13503b66b3765f6239ec8e2b59a122c74b20d6da..f1925ca0d86aa3486c7e9255ce615501eddd350d 100644 (file)
--- 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 bbed931eedfd83615a06dff7718658ec2a3d357d..dcbccc0c706f7b289124950e73528e9e33acf283 100644 (file)
--- 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 8e52759e70c1725346c7261b3a33b634646674e2..e61e2edcf59bb9435d29965d1261dfd3d4dd4ba5 100644 (file)
--- 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 a5b7ce2f38e740c476c90fba14e1a348265f164f..dc4715ffe4af5e6c13bd42f8e1ace3e39c3cd962 100644 (file)
--- 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 ceafacf9d4036097223d988f7cf994e9dde60ffe..eb7c10ed9d310d17df58a6bcc11c9979c8938117 100644 (file)
--- 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 785b0d076bd2b4f76471a750c7ee7355c84eaa9e..4191c43ca6e447995d9d739bbe9c761a742c4471 100644 (file)
--- 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 e679bef6e630db03010bf7d59fd3498edaf248bf..2fea11bd63a69718d6ddfc085e301a98d4bd02de 100644 (file)
--- 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"

diff --git a/source4/libnet/config.mk b/source4/libnet/config.mk
index cf0c64a01427d4866c35dbf27f7db1807e0a8da0..3c695edd39bedc14df0fb4db30711a4c8a42ff9d 100644 (file)
--- a/source4/libnet/config.mk
+++ b/source4/libnet/config.mk
@@ -5,6 +5,7 @@ MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
 DESCRIPTION = User-friendly access to Samba interfaces
+PRIVATE_PROTO_HEADER = libnet_proto.h
 PUBLIC_HEADERS = libnet.h libnet_join.h libnet_lookup.h libnet_passwd.h \
                                 libnet_rpc.h libnet_share.h libnet_time.h libnet_user.h \
                                 libnet_vampire.h userinfo.h userman.h

diff --git a/source4/libnet/libnet.h b/source4/libnet/libnet.h
index be224395901945ec70307d278acf8dd04d5eb8f7..3044b5a95fa2f82b2ce4d6841af07116f6fe8f02 100644 (file)
--- a/source4/libnet/libnet.h
+++ b/source4/libnet/libnet.h
@@ -47,3 +47,4 @@ struct libnet_context {
 #include "libnet/libnet_user.h"
 #include "libnet/libnet_share.h"
 #include "libnet/libnet_lookup.h"
+#include "libnet/libnet_proto.h"

diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index 11e1dfc17576465b440e960a57b3e4fc9482de3b..af15d81797514fcf1929c4a053534c8d61440958 100644 (file)
--- a/source4/libnet/libnet_join.c
+++ b/source4/libnet/libnet_join.c
@@ -30,6 +30,7 @@
 #include "libcli/cldap/cldap.h"
 #include "include/secrets.h"
 #include "librpc/gen_ndr/drsuapi.h"
+#include "dsdb/samdb/samdb.h"
 
 /*
  * find out Site specific stuff:

diff --git a/source4/libnet/libnet_samsync_ldb.c b/source4/libnet/libnet_samsync_ldb.c
index 658c1254dd4b430645b57dfacad9266acf39bfa5..c97d9013c9c819e66a961ea1467e965b08455d1e 100644 (file)
--- a/source4/libnet/libnet_samsync_ldb.c
+++ b/source4/libnet/libnet_samsync_ldb.c
@@ -28,7 +28,10 @@
 #include "librpc/gen_ndr/ndr_netlogon.h"
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "dlinklist.h"
+#include "libcli/ldap/ldap.h"
 #include "lib/ldb/include/ldb.h"
+#include "dsdb/samdb/samdb.h"
+#include "auth/auth.h"
 
 struct samsync_ldb_secret {
        struct samsync_ldb_secret *prev, *next;

diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 5a43fbe0b107dfac72f7d731737c82a924eb4ca1..421a5866d3d4143103d226481d05dbdf2059b496 100644 (file)
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -6,6 +6,7 @@ MINOR_VERSION = 0
 RELEASE_VERSION = 1
 DESCRIPTION = Network Data Representation Core Library
 PUBLIC_HEADERS = ndr/libndr.h
+PRIVATE_PROTO_HEADER = ndr/libndr_proto.h
 OBJ_FILES = \
                ndr/ndr.o \
                ndr/ndr_basic.o \

diff --git a/source4/librpc/ndr/libndr.h b/source4/librpc/ndr/libndr.h
index 3d8bdf9f36df765b913d6fada5e01c92d7fe3be8..86962bd563bb463cb865fa36e658561883f29046 100644 (file)
--- a/source4/librpc/ndr/libndr.h
+++ b/source4/librpc/ndr/libndr.h
@@ -280,3 +280,6 @@ typedef void (*ndr_print_function_t)(struct ndr_print *, const char *, int, cons
 
 extern const struct dcerpc_syntax_id ndr_transfer_syntax;
 extern const struct dcerpc_syntax_id ndr64_transfer_syntax;
+
+#include "librpc/gen_ndr/misc.h"
+#include "librpc/ndr/libndr_proto.h"

diff --git a/source4/librpc/rpc/config.mk b/source4/librpc/rpc/config.mk
index 564e6f61e6b9bba286a7405cabd88f4c6648ae6d..7206d2f651d58a9de44ee954efb9eedbbbcee52f 100644 (file)
--- a/source4/librpc/rpc/config.mk
+++ b/source4/librpc/rpc/config.mk
@@ -1,6 +1,7 @@
 ################################################
 # Start SUBSYSTEM RPC_RAW
 [SUBSYSTEM::RPC_RAW]
+PRIVATE_PROTO_HEADER = dcerpc_proto.h
 OBJ_FILES = \
                dcerpc.o \
                dcerpc_auth.o \

diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c
index 9e585f961223ea9caa297a11c3fe927fec128b28..e9c479a9cd9ced18342e8acfedec05dcbc33e204 100644 (file)
--- a/source4/librpc/rpc/dcerpc.c
+++ b/source4/librpc/rpc/dcerpc.c
@@ -28,6 +28,7 @@
 #include "librpc/gen_ndr/ndr_dcerpc.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "libcli/composite/composite.h"
+#include "auth/gensec/gensec.h"
 
 static void dcerpc_ship_next_request(struct dcerpc_connection *c);
 

diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h
index 058bef1ddfc75c5648be40c918cdaaeeccd23dfd..b12093351798a6ec3c0b9f88eae414e6f08b4d73 100644 (file)
--- a/source4/librpc/rpc/dcerpc.h
+++ b/source4/librpc/rpc/dcerpc.h
@@ -239,3 +239,5 @@ struct rpc_request {
                void *private;
        } async;
 };
+
+#include "librpc/rpc/dcerpc_proto.h"

diff --git a/source4/librpc/rpc/dcerpc_auth.c b/source4/librpc/rpc/dcerpc_auth.c
index c66384a3cfc0e20e1b3e5732b3440b8825f48738..bffa994abe42127a7237142040a449df89edb8bb 100644 (file)
--- a/source4/librpc/rpc/dcerpc_auth.c
+++ b/source4/librpc/rpc/dcerpc_auth.c
@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "libcli/composite/composite.h"
+#include "auth/gensec/gensec.h"
 
 /*
   do a non-athenticated dcerpc bind

diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c
index 03a408de79dc16bef2a80daacfe14dd9806cbc7e..7ab90fbbf7140f41dd0edf6a47546b437f93ecd3 100644 (file)
--- a/source4/librpc/rpc/dcerpc_connect.c
+++ b/source4/librpc/rpc/dcerpc_connect.c
@@ -32,6 +32,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
+#include "libcli/smb2/smb2.h"
 
 
 struct dcerpc_pipe_connect;

diff --git a/source4/main.mk b/source4/main.mk
index 98eca425e3dc5d84c2e2645c1ce86d23b77c076a..ed4e4f79a8f3ed39336995bdf5b27358c1558e90 100644 (file)
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -210,7 +210,8 @@ pch: include/config.h \
        idl \
        include/includes.h.gch
 
-include/includes.h: lib/basic.h
+libcli/nbt/libnbt.h: libcli/nbt/nbt_proto.h
+include/includes.h: lib/basic.h libcli/nbt/libnbt.h
 
 clean_pch: 
        -rm -f include/includes.h.gch

diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c
index 059aad8c665013b7e296648d635151f18cf24f5d..4b62025875513814c7c20aa6ad32c9fb5cb9a992 100644 (file)
--- a/source4/nbt_server/dgram/netlogon.c
+++ b/source4/nbt_server/dgram/netlogon.c
@@ -26,6 +26,8 @@
 #include "smbd/service_task.h"
 #include "lib/socket/socket.h"
 #include "lib/ldb/include/ldb.h"
+#include "dsdb/samdb/samdb.h"
+#include "auth/auth.h"
 
 /*
   reply to a GETDC request

diff --git a/source4/nbt_server/wins/winsdb.c b/source4/nbt_server/wins/winsdb.c
index a037f9cc497a7c8590f071fbd1f554bd51e889fd..55e2522f25c61f5f486f46a18c01d9b25d7a7276 100644 (file)
--- a/source4/nbt_server/wins/winsdb.c
+++ b/source4/nbt_server/wins/winsdb.c
@@ -28,6 +28,7 @@
 #include "lib/ldb/include/ldb_errors.h"
 #include "db_wrap.h"
 #include "system/time.h"
+#include "auth/auth.h"
 
 /*
   return the new maxVersion and save it

diff --git a/source4/ntptr/config.mk b/source4/ntptr/config.mk
index 14124e12fe9d8c28a699523de14a6f0122cadaeb..d425f57ca41574c0d7062ca1db654b820462aaee 100644 (file)
--- a/source4/ntptr/config.mk
+++ b/source4/ntptr/config.mk
@@ -15,6 +15,7 @@ REQUIRED_SUBSYSTEMS = \
 ################################################
 # Start SUBSYSTEM NTPTR
 [SUBSYSTEM::NTPTR]
+PRIVATE_PROTO_HEADER = ntptr_proto.h
 OBJ_FILES = \
                ntptr_base.o \
                ntptr_interface.o

diff --git a/source4/ntptr/ntptr.h b/source4/ntptr/ntptr.h
index 0f07f26cbbd2daea607a1c577def4afa8cd8025b..86cf2eeac61fbc334e483d6f7cbeb660e0e11067 100644 (file)
--- a/source4/ntptr/ntptr.h
+++ b/source4/ntptr/ntptr.h
@@ -186,3 +186,4 @@ struct ntptr_critical_sizes {
        int sizeof_ntptr_context;
        int sizeof_ntptr_ops;
 };
+#include "ntptr/ntptr_proto.h"

diff --git a/source4/ntptr/simple_ldb/ntptr_simple_ldb.c b/source4/ntptr/simple_ldb/ntptr_simple_ldb.c
index ebd6eb4f468db126cbc38290995e68b8e990e15d..60aa6299a639b9c51105317a066868baa763d8f5 100644 (file)
--- a/source4/ntptr/simple_ldb/ntptr_simple_ldb.c
+++ b/source4/ntptr/simple_ldb/ntptr_simple_ldb.c
@@ -33,6 +33,8 @@
 #include "librpc/gen_ndr/ndr_spoolss.h"
 #include "lib/ldb/include/ldb.h"
 #include "db_wrap.h"
+#include "auth/auth.h"
+#include "dsdb/samdb/samdb.h"
 
 /*
   connect to the SPOOLSS database

diff --git a/source4/ntvfs/common/sidmap.c b/source4/ntvfs/common/sidmap.c
index f3ee938d847a6c13d6b1418bf2b8916239d48c65..1f19ba171d2f1518584c7698fc4375851cfde0ee 100644 (file)
--- a/source4/ntvfs/common/sidmap.c
+++ b/source4/ntvfs/common/sidmap.c
@@ -25,6 +25,9 @@
 #include "system/passwd.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "ads.h"
+#include "dsdb/samdb/samdb.h"
+#include "auth/auth.h"
+#include "libcli/ldap/ldap.h"
 
 /*
   these are used for the fallback local uid/gid to sid mapping

diff --git a/source4/ntvfs/ipc/vfs_ipc.c b/source4/ntvfs/ipc/vfs_ipc.c
index 3a643d71458dab8c07a6d3f178bddbef3e411763..415d09a72955805f779c1db8a13bad3b744a79f3 100644 (file)
--- a/source4/ntvfs/ipc/vfs_ipc.c
+++ b/source4/ntvfs/ipc/vfs_ipc.c
@@ -30,6 +30,7 @@
 #include "dlinklist.h"
 #include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
+#include "rpc_server/dcerpc_server.h"
 
 #define IPC_BASE_FNUM 0x400
 

diff --git a/source4/ntvfs/posix/config.mk b/source4/ntvfs/posix/config.mk
index 53c51cf8050d5b705cbae44b989e35ebc8c5fca3..a2a4685d8c74b68b99abd748f953f8ea5eafe28e 100644 (file)
--- a/source4/ntvfs/posix/config.mk
+++ b/source4/ntvfs/posix/config.mk
@@ -3,6 +3,7 @@
 [MODULE::ntvfs_posix]
 SUBSYSTEM = NTVFS
 INIT_FUNCTION = ntvfs_posix_init 
+PRIVATE_PROTO_HEADER = vfs_posix_proto.h
 OBJ_FILES = \
                vfs_posix.o \
                pvfs_util.o \

diff --git a/source4/ntvfs/posix/vfs_posix.h b/source4/ntvfs/posix/vfs_posix.h
index dd2bf74543a85f42a9148ead7c9d3692e5711615..3028053f5e866c7d3d33db80977cb26f445c9d10 100644 (file)
--- a/source4/ntvfs/posix/vfs_posix.h
+++ b/source4/ntvfs/posix/vfs_posix.h
@@ -204,4 +204,6 @@ void *pvfs_wait_message(struct pvfs_state *pvfs,
                         void (*fn)(void *, enum pvfs_wait_notice),
                         void *private);
 
+#include "ntvfs/posix/vfs_posix_proto.h"
+
 #endif /* _VFS_POSIX_H_ */

diff --git a/source4/passdb/secrets.c b/source4/passdb/secrets.c
index 9673b89d2c3562f169d7708ce813448047cd3f95..13f71e269e0a2c6b876f66ea7308e7af28f8c444 100644 (file)
--- a/source4/passdb/secrets.c
+++ b/source4/passdb/secrets.c
@@ -28,6 +28,7 @@
 #include "system/filesys.h"
 #include "db_wrap.h"
 #include "lib/ldb/include/ldb.h"
+#include "dsdb/samdb/samdb.h"
 
 static struct tdb_wrap *tdb;
 

diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk
index f3fccc77fcdb06a0f50ac8960cc1d50867e92ead..f6ec5d308080312cc66d87d734c49037026568ea 100644 (file)
--- a/source4/rpc_server/config.mk
+++ b/source4/rpc_server/config.mk
@@ -199,6 +199,7 @@ REQUIRED_SUBSYSTEMS = \
 ################################################
 # Start SUBSYSTEM DCERPC
 [SUBSYSTEM::DCERPC]
+PRIVATE_PROTO_HEADER = dcerpc_server_proto.h
 OBJ_FILES = \
                dcerpc_server.o \
                dcerpc_sock.o \

diff --git a/source4/rpc_server/dcerpc_server.h b/source4/rpc_server/dcerpc_server.h
index e831b70060f3f0a9983ed6868ffbea1ca401b6db..783cdb58b13ab065d3b32607b02ce480cff8dc1e 100644 (file)
--- a/source4/rpc_server/dcerpc_server.h
+++ b/source4/rpc_server/dcerpc_server.h
@@ -238,4 +238,6 @@ struct dcesrv_critical_sizes {
        int sizeof_dcesrv_handle;
 };
 
+#include "rpc_server/dcerpc_server_proto.h"
+
 #endif /* SAMBA_DCERPC_SERVER_H */

diff --git a/source4/rpc_server/dcesrv_auth.c b/source4/rpc_server/dcesrv_auth.c
index 6caef7424d8a9499ad03eef24d81600f07135203..d33b123f222669229daf1bc1a331da37394f0e90 100644 (file)
--- a/source4/rpc_server/dcesrv_auth.c
+++ b/source4/rpc_server/dcesrv_auth.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "rpc_server/dcerpc_server.h"
 #include "librpc/gen_ndr/ndr_dcerpc.h"
+#include "auth/gensec/gensec.h"
 
 /*
   parse any auth information from a dcerpc bind request

diff --git a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
index a762b448787064365ebc9ac3584078817d01c944..68bac0f2ce96ea78de424cd900a01afa12959e86 100644 (file)
--- a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
+++ b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
@@ -26,6 +26,7 @@
 #include "rpc_server/common/common.h"
 #include "rpc_server/drsuapi/dcesrv_drsuapi.h"
 #include "auth/auth.h"
+#include "dsdb/samdb/samdb.h"
 
 /* 
   drsuapi_DsBind 

diff --git a/source4/rpc_server/dssetup/dcesrv_dssetup.c b/source4/rpc_server/dssetup/dcesrv_dssetup.c
index 1d391f588fdf0a03b1a4a9fe408bcc36e879160a..61e560299cbc6118e72e301dee9df7eb54bfe339 100644 (file)
--- a/source4/rpc_server/dssetup/dcesrv_dssetup.c
+++ b/source4/rpc_server/dssetup/dcesrv_dssetup.c
@@ -26,6 +26,7 @@
 #include "librpc/gen_ndr/ndr_dssetup.h"
 #include "rpc_server/common/common.h"
 #include "ldb/include/ldb.h"
+#include "dsdb/samdb/samdb.h"
 /* 
   dssetup_DsRoleGetPrimaryDomainInformation 
 */

diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index 64da9f488f18874fe31e0aa1b103931424e7aadb..2171ac48b0b9b0bfbb17da6450e121023b6297fa 100644 (file)
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -30,6 +30,8 @@
 #include "system/time.h"
 #include "db_wrap.h"
 #include "auth/auth.h"
+#include "dsdb/samdb/samdb.h"
+#include "libcli/ldap/ldap.h"
 
 /*
   this type allows us to distinguish handle types

diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index e482a229b7282da4156363aafe2e43e4dc27e89e..335cd3d9e7367ee4a4f24f0089304dbdb6070282 100644 (file)
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -28,6 +28,7 @@
 #include "librpc/gen_ndr/ndr_dcom.h"
 #include "lib/ldb/include/ldb.h"
 #include "auth/auth.h"
+#include "dsdb/samdb/samdb.h"
 
 struct server_pipe_state {
        struct netr_Credential client_challenge;

diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index de08695502b8d82309b64e3fa8109ac9af3f65d0..b7d770af84a7e17fbd4b9dc55ae8567b529d6ad0 100644 (file)
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -30,6 +30,8 @@
 #include "system/time.h"
 #include "lib/ldb/include/ldb.h"
 #include "ads.h"
+#include "dsdb/samdb/samdb.h"
+#include "libcli/ldap/ldap.h"
 
 
 /*

diff --git a/source4/rpc_server/samr/samr_password.c b/source4/rpc_server/samr/samr_password.c
index 0b4709fa9720c512ede12760a0a442394ef5972d..3831be10afdd85db81e1f47c8b6ce128d1ec9e45 100644 (file)
--- a/source4/rpc_server/samr/samr_password.c
+++ b/source4/rpc_server/samr/samr_password.c
@@ -30,6 +30,9 @@
 #include "lib/crypto/crypto.h"
 #include "lib/ldb/include/ldb.h"
 #include "ads.h"
+#include "libcli/ldap/ldap.h"
+#include "dsdb/samdb/samdb.h"
+#include "auth/auth.h"
 
 /* 
   samr_ChangePasswordUser 

diff --git a/source4/smb_server/smb/config.mk b/source4/smb_server/smb/config.mk
index b412674c00f1aa2823b6bb4205675532777cccd5..2f0da230728a3ef7939c5c0a97f8ff14a59418c1 100644 (file)
--- a/source4/smb_server/smb/config.mk
+++ b/source4/smb_server/smb/config.mk
@@ -1,6 +1,7 @@
 #######################
 # Start SUBSYSTEM SMB_PROTOCOL
 [SUBSYSTEM::SMB_PROTOCOL]
+PRIVATE_PROTO_HEADER = smb_proto.h
 OBJ_FILES = \
                receive.o \
                negprot.o \

diff --git a/source4/smb_server/smb/nttrans.c b/source4/smb_server/smb/nttrans.c
index 7d5398671dfca73d9c2985ebf152d1bdfa20872a..1ade18d69434cc5da53a7cec60957117217898fc 100644 (file)
--- a/source4/smb_server/smb/nttrans.c
+++ b/source4/smb_server/smb/nttrans.c
@@ -26,6 +26,7 @@
 #include "smb_server/smb_server.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "ntvfs/ntvfs.h"
+#include "libcli/raw/libcliraw.h"
 
 
 

diff --git a/source4/smb_server/smb/signing.c b/source4/smb_server/smb/signing.c
index b461056397a27323575865f4aaf78a832a876053..7f441a2816b50f3d41c6975778776b2cae0a98cc 100644 (file)
--- a/source4/smb_server/smb/signing.c
+++ b/source4/smb_server/smb/signing.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "smb_server/smb_server.h"
+#include "libcli/raw/libcliraw.h"
 
 
 /*

diff --git a/source4/smb_server/smb/trans2.c b/source4/smb_server/smb/trans2.c
index ef7fa40b201d7294da3e3336d6373b5f664508e8..885f54a48e65d8647adde5f7fa23b216ff130ffa 100644 (file)
--- a/source4/smb_server/smb/trans2.c
+++ b/source4/smb_server/smb/trans2.c
@@ -26,6 +26,7 @@
 #include "smb_server/smb_server.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "ntvfs/ntvfs.h"
+#include "libcli/raw/libcliraw.h"
 
 #define CHECK_MIN_BLOB_SIZE(blob, size) do { \
        if ((blob)->length < (size)) { \

diff --git a/source4/smb_server/smb2/config.mk b/source4/smb_server/smb2/config.mk
index 4a680200fd9e9471ff8fcb37265d5d3c7598bbfa..686f6f783cda6997a375fdbe33123643ccae4c46 100644 (file)
--- a/source4/smb_server/smb2/config.mk
+++ b/source4/smb_server/smb2/config.mk
@@ -1,6 +1,7 @@
 #######################
 # Start SUBSYSTEM SMB2_PROTOCOL
 [SUBSYSTEM::SMB2_PROTOCOL]
+PRIVATE_PROTO_HEADER = smb2_proto.h
 OBJ_FILES = \
                receive.o \
                negprot.o \

diff --git a/source4/smb_server/smb2/smb2_server.h b/source4/smb_server/smb2/smb2_server.h
index 913c7f2eab5c7aaab7c7d8a1796ed6a63ed9f186..1c544bfe82600e4d1a49df5ebff7a5b60d50dd89 100644 (file)
--- a/source4/smb_server/smb2/smb2_server.h
+++ b/source4/smb_server/smb2/smb2_server.h
@@ -48,3 +48,5 @@ struct smb2srv_request {
        struct smb2_request_buffer in;
        struct smb2_request_buffer out;
 };
+
+#include "smb_server/smb2/smb2_proto.h"

diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c
index bffc19fc72226c1be8f928cdcef7004140be4a00..e4b9a227d489db1b9e088e5d423a6452e181c871 100644 (file)
--- a/source4/smb_server/smb_server.c
+++ b/source4/smb_server/smb_server.c
@@ -28,6 +28,7 @@
 #include "lib/messaging/irpc.h"
 #include "lib/stream/packet.h"
 #include "libcli/smb2/smb2.h"
+#include "smb_server/smb2/smb2_server.h"
 
 static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob)
 {

diff --git a/source4/smb_server/smb_server.h b/source4/smb_server/smb_server.h
index d0df15e022f057871adc7efba5e1ef439a0ab2dc..3280706eca5ac4c9a788f16eceaa9204173025e3 100644 (file)
--- a/source4/smb_server/smb_server.h
+++ b/source4/smb_server/smb_server.h
@@ -303,3 +303,4 @@ struct smbsrv_connection {
 };
 
 #include "smb_server/smb_server_proto.h"
+#include "smb_server/smb/smb_proto.h"

diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 7174084f13d9ab83d0dde99eb9886773d880b93e..d6bc88248f60d2b97517f638434d7f4ac234ebff 100644 (file)
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -33,6 +33,7 @@
 #include "smb_build.h"
 #include "registry/registry.h"
 #include "ntvfs/ntvfs.h"
+#include "ntptr/ntptr.h"
 
 /*
   recursively delete a directory tree

diff --git a/source4/torture/basic/aliases.c b/source4/torture/basic/aliases.c
index 159c2ae4aeef853cd264fe201c53d9f68f3f718e..e4e2b7140554f79a1040184cb5da4f4bfac66e0a 100644 (file)
--- a/source4/torture/basic/aliases.c
+++ b/source4/torture/basic/aliases.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "dlinklist.h"
+#include "libcli/raw/libcliraw.h"
 
 int create_complex_file(struct smbcli_state *cli, TALLOC_CTX *mem_ctx, const char *fname);
 

diff --git a/source4/torture/basic/charset.c b/source4/torture/basic/charset.c
index af6020da17af8939fa305829d0ddd6a9ec6fe709..a216ebc05a2443b262e6df30df2c6b54df5fe73a 100644 (file)
--- a/source4/torture/basic/charset.c
+++ b/source4/torture/basic/charset.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "libcli/raw/libcliraw.h"
 
 #define BASEDIR "\\chartest\\"
 

diff --git a/source4/torture/libnet/domain.c b/source4/torture/libnet/domain.c
index 7f8600d2dd2c60044486ad5fc618c3eeaa35af8d..de1dfad6fffe1cbb09a111977b73791ae67f95e9 100644 (file)
--- a/source4/torture/libnet/domain.c
+++ b/source4/torture/libnet/domain.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "libnet/composite.h"
+#include "libnet/libnet.h"
 
 static BOOL test_domainopen(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                            struct lsa_String *domname,

diff --git a/source4/torture/libnet/userinfo.c b/source4/torture/libnet/userinfo.c
index b987bd5c218fe52066879f13056ef5ee74f1269b..1334763c125a773fb5f7a5bff151ef49ee054562 100644 (file)
--- a/source4/torture/libnet/userinfo.c
+++ b/source4/torture/libnet/userinfo.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_samr.h"
+#include "libnet/libnet.h"
 #include "libnet/composite.h"
 #include "libnet/userinfo.h"
 

diff --git a/source4/torture/libnet/userman.c b/source4/torture/libnet/userman.c
index 6ec5d9a7b7b34d7d3bce92bd39e6379c23abfe58..6a450e8b78b5b98dd0a9caaa706ab99712862ec9 100644 (file)
--- a/source4/torture/libnet/userman.c
+++ b/source4/torture/libnet/userman.c
@@ -23,6 +23,7 @@
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "libnet/composite.h"
 #include "libnet/userman.h"
+#include "libnet/libnet.h"
 
 #define TEST_USERNAME  "libnetusermantest"
 

diff --git a/source4/torture/nbench/nbio.c b/source4/torture/nbench/nbio.c
index 1cb00b67331f7afc1e6945800c651eb5f8a075fb..540f70921166c82ebb3743065ca45b52d4c34e16 100644 (file)
--- a/source4/torture/nbench/nbio.c
+++ b/source4/torture/nbench/nbio.c
@@ -25,6 +25,7 @@
 #include "system/filesys.h"
 #include "dlinklist.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "libcli/raw/libcliraw.h"
 
 #define MAX_FILES 100
 

diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index 52fc100b2354398a8111e1f547dc42cee23b0faf..66609b8e80f18183fd7832a08493ed5ae968586f 100644 (file)
--- a/source4/torture/rap/rap.c
+++ b/source4/torture/rap/rap.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "rap.h"
+#include "libcli/raw/libcliraw.h"
 
 struct rap_call {
        uint16_t callno;

diff --git a/source4/torture/raw/chkpath.c b/source4/torture/raw/chkpath.c
index fd6a3d972d3bdeb39df363d0defc0bb5f38601f7..44dbe97e004e122e950d76e7654eb0dbae6a78cf 100644 (file)
--- a/source4/torture/raw/chkpath.c
+++ b/source4/torture/raw/chkpath.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "libcli/raw/libcliraw.h"
 
 #define BASEDIR "\\rawchkpath"
 

diff --git a/source4/torture/raw/close.c b/source4/torture/raw/close.c
index 733800da193117115529b3b28bd9a20e4616b2ec..6d55501cd38defa18dc2b84fecf6ea3419280b23 100644 (file)
--- a/source4/torture/raw/close.c
+++ b/source4/torture/raw/close.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "system/time.h"
+#include "libcli/raw/libcliraw.h"
 
 
 /* basic testing of all RAW_CLOSE_* calls 

diff --git a/source4/torture/raw/ioctl.c b/source4/torture/raw/ioctl.c
index 2768002893f278c2aee8a3570703fbb3605de6a9..7cce8aa61b2ac8948408428db1ec564676b5733a 100644 (file)
--- a/source4/torture/raw/ioctl.c
+++ b/source4/torture/raw/ioctl.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "ioctl.h"
+#include "libcli/raw/libcliraw.h"
 
 #define BASEDIR "\\rawioctl"
 

diff --git a/source4/torture/raw/mkdir.c b/source4/torture/raw/mkdir.c
index 5cdc839194d630160603e738e5d2fc6ef1f3699d..eb63bdee46f9f565cb1ed5227c7c8be24ee06f7c 100644 (file)
--- a/source4/torture/raw/mkdir.c
+++ b/source4/torture/raw/mkdir.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "libcli/raw/libcliraw.h"
 
 #define BASEDIR "\\mkdirtest"
 

diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c
index 921fdb4dbf89d93f1e4602c2e224b548198434ae..6f115adc9e8e73e3ad41dcf3168d96f42c2b0a64 100644 (file)
--- a/source4/torture/raw/notify.c
+++ b/source4/torture/raw/notify.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "libcli/raw/libcliraw.h"
 
 #define BASEDIR "\\test_notify"
 

diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index 95d88f2b070b589b158cbeb8a747e2eebc948edb..4b67ce5cac5336c16b764aaf8bbc2d66f33df02b 100644 (file)
--- a/source4/torture/raw/oplock.c
+++ b/source4/torture/raw/oplock.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "libcli/raw/libcliraw.h"
 
 #define CHECK_VAL(v, correct) do { \
        if ((v) != (correct)) { \

diff --git a/source4/torture/raw/rename.c b/source4/torture/raw/rename.c
index f4737920fa04ae89d2ad9a01384e59e7b0c5530a..921e7f574f6be36085982bb95d091e0660784bbf 100644 (file)
--- a/source4/torture/raw/rename.c
+++ b/source4/torture/raw/rename.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "libcli/raw/libcliraw.h"
 
 #define CHECK_STATUS(status, correct) do { \
        if (!NT_STATUS_EQUAL(status, correct)) { \

diff --git a/source4/torture/raw/seek.c b/source4/torture/raw/seek.c
index 9652b7597f818a845d20bff45e916c378204b889..d7d0527bbcc1e859bea692c5222e1ba87c064fa6 100644 (file)
--- a/source4/torture/raw/seek.c
+++ b/source4/torture/raw/seek.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "libcli/raw/libcliraw.h"
 
 #define CHECK_STATUS(status, correct) do { \
        if (!NT_STATUS_EQUAL(status, correct)) { \

diff --git a/source4/torture/raw/setfileinfo.c b/source4/torture/raw/setfileinfo.c
index c18a607f113a50e08b57005763f497f8592e4a48..6d2dcbc03f07f1e4186836256caa20e2c390db56 100644 (file)
--- a/source4/torture/raw/setfileinfo.c
+++ b/source4/torture/raw/setfileinfo.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "system/time.h"
+#include "libcli/raw/libcliraw.h"
 
 #define BASEDIR "\\testsfileinfo"
 

diff --git a/source4/torture/raw/unlink.c b/source4/torture/raw/unlink.c
index 855ecaf07767c6a533374960b269ec7abf1ed56c..9ff9496cd474f2cb34467833ff6feeffe393b8ea 100644 (file)
--- a/source4/torture/raw/unlink.c
+++ b/source4/torture/raw/unlink.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "libcli/raw/libcliraw.h"
 
 #define CHECK_STATUS(status, correct) do { \
        if (!NT_STATUS_EQUAL(status, correct)) { \

diff --git a/source4/torture/rpc/mgmt.c b/source4/torture/rpc/mgmt.c
index 28ac07f60764c36290d4c7df62ece062be060945..4ac5fa390cf5a683b70ce421fc8e23025f55022f 100644 (file)
--- a/source4/torture/rpc/mgmt.c
+++ b/source4/torture/rpc/mgmt.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_mgmt.h"
+#include "auth/gensec/gensec.h"
 
 
 /*

diff --git a/source4/torture/smb2/setinfo.c b/source4/torture/smb2/setinfo.c
index aa66d510d4bf74b4e5b90fe93b847707f2e87979..d659af329dcfbeb6f65d48f80e92a1d2bf4de37b 100644 (file)
--- a/source4/torture/smb2/setinfo.c
+++ b/source4/torture/smb2/setinfo.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "system/time.h"
+#include "libcli/smb2/smb2.h"
 
 #define BASEDIR ""
 

diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index a86a9257784ac00f1684cc135a6e148502610bd7..a6ec030c1d693ec850bccb71bb54c9ec6d4cd70b 100644 (file)
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -28,6 +28,7 @@
 #include "ioctl.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "smb_build.h"
+#include "libcli/nbt/libnbt.h"
 
 int torture_nprocs=4;
 int torture_numops=10;

diff --git a/source4/utils/net/config.mk b/source4/utils/net/config.mk
index 382906f349bf6206140fa1229fd37ed06c33a4e4..e9f7e6ef520fd12c6cc3144fa6f386057d08372a 100644 (file)
--- a/source4/utils/net/config.mk
+++ b/source4/utils/net/config.mk
@@ -4,6 +4,7 @@
 # Start BINARY net
 [BINARY::net]
 INSTALLDIR = BINDIR
+PRIVATE_PROTO_HEADER = net_proto.h
 OBJ_FILES = \
                net.o \
                net_password.o \

diff --git a/source4/utils/net/net.h b/source4/utils/net/net.h
index 6f3aa1086bd4a5a53320f30be390ca1a009d290b..8d9c78c1a92d93f4849c65b2118a5c129cb5dc38 100644 (file)
--- a/source4/utils/net/net.h
+++ b/source4/utils/net/net.h
@@ -34,4 +34,6 @@ struct net_functable {
        int (*usage)(struct net_context *ctx, int argc, const char **argv);
 };
 
+#include "utils/net/net_proto.h"
+
 #endif /* _UTIL_NET_H */

diff --git a/source4/winbind/config.mk b/source4/winbind/config.mk
index e3ed9a057b31fc3f456e4dbef53986ab7a81172d..1a91f7bee5c0b4f10099047e2ce7c5bee725be52 100644 (file)
--- a/source4/winbind/config.mk
+++ b/source4/winbind/config.mk
@@ -3,6 +3,7 @@
 #######################
 # Start SUBSYSTEM WINBIND
 [SUBSYSTEM::WINBIND]
+PRIVATE_PROTO_HEADER = wb_proto.h
 OBJ_FILES = \
                wb_server.o \
                wb_samba3_protocol.o \

diff --git a/source4/winbind/wb_server.h b/source4/winbind/wb_server.h
index 09afffb0c9ab4b5d27d3932f690e96bda00a5737..d64ca93a33fa7e7db2786ebb7d6400263e936698 100644 (file)
--- a/source4/winbind/wb_server.h
+++ b/source4/winbind/wb_server.h
@@ -157,3 +157,5 @@ struct wbsrv_call {
        /* storage for protocol specific data */
        void *private_data;
 };
+
+#include "winbind/wb_proto.h"

diff --git a/source4/wrepl_server/config.mk b/source4/wrepl_server/config.mk
index 6dd0e2a3056636d10debca08a65bdad3a2626f7b..feb3e878278172cde8086d6b22a5ebf09095bf50 100644 (file)
--- a/source4/wrepl_server/config.mk
+++ b/source4/wrepl_server/config.mk
@@ -13,6 +13,7 @@ OBJ_FILES = \
                wrepl_out_pull.o \
                wrepl_out_push.o \
                wrepl_out_helpers.o
+PRIVATE_PROTO_HEADER = wrepl_server_proto.h
 REQUIRED_SUBSYSTEMS = \
                LIBCLI_WREPL WINSDB
 # End SUBSYSTEM WREPL_SRV

diff --git a/source4/wrepl_server/wrepl_apply_records.c b/source4/wrepl_server/wrepl_apply_records.c
index 978415104f4e51e035f3789abb9137946417e852..9c65446942d46326a50ad7438afc1ffea51906e2 100644 (file)
--- a/source4/wrepl_server/wrepl_apply_records.c
+++ b/source4/wrepl_server/wrepl_apply_records.c
@@ -36,6 +36,7 @@
 #include "libcli/composite/composite.h"
 #include "libcli/wrepl/winsrepl.h"
 #include "system/time.h"
+#include "libcli/nbt/libnbt.h"
 
 enum _R_ACTION {
        R_INVALID,

diff --git a/source4/wrepl_server/wrepl_scavenging.c b/source4/wrepl_server/wrepl_scavenging.c
index a19604d4165f2d55ce762f2bca30ed65666938f0..c0bbb41dae7b96802ac43cd1e81c48c763b239a5 100644 (file)
--- a/source4/wrepl_server/wrepl_scavenging.c
+++ b/source4/wrepl_server/wrepl_scavenging.c
@@ -36,6 +36,7 @@
 #include "libcli/wrepl/winsrepl.h"
 #include "wrepl_server/wrepl_out_helpers.h"
 #include "system/time.h"
+#include "libcli/nbt/libnbt.h"
 
 static NTSTATUS wreplsrv_scavenging_owned_records(struct wreplsrv_service *service, TALLOC_CTX *tmp_mem)
 {

diff --git a/source4/wrepl_server/wrepl_server.c b/source4/wrepl_server/wrepl_server.c
index 47b3da480b790eced074c57a96db0d7b32de4688..aead6a199797bf20c718ca6fe5f637bba0e71194 100644 (file)
--- a/source4/wrepl_server/wrepl_server.c
+++ b/source4/wrepl_server/wrepl_server.c
@@ -32,6 +32,7 @@
 #include "nbt_server/wins/winsdb.h"
 #include "ldb/include/ldb.h"
 #include "ldb/include/ldb_errors.h"
+#include "auth/auth.h"
 
 static struct ldb_context *wins_config_db_connect(TALLOC_CTX *mem_ctx)
 {

diff --git a/source4/wrepl_server/wrepl_server.h b/source4/wrepl_server/wrepl_server.h
index 125e04b84c0455e8e441b3a1839b6beb8fe39da3..fabba093896ebf29fdc4e4d448c1356c02025516 100644 (file)
--- a/source4/wrepl_server/wrepl_server.h
+++ b/source4/wrepl_server/wrepl_server.h
@@ -302,3 +302,5 @@ struct wreplsrv_service {
                BOOL processing;        
        } scavenging;
 };
+
+#include "wrepl_server/wrepl_server_proto.h"