9 files changed, 11 insertions, 1 deletions
diff --git a/source4/auth/auth.h b/source4/auth/auth.h
index 58f72aa8af..9aa6d29c6e 100644
--- 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 49813a437d..15abeab091 100644
--- 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 b620cece96..b24aea836a 100644
--- 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 4efa81fb04..db36b01334 100644
--- 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 c8a95e2b51..8402676acd 100644
--- 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 fcaa760ed4..7ea15e7988 100644
--- 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 9078d72647..54b082bda0 100644
--- 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 4ff09d2066..ae85bf8f5e 100644
--- 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 edc7b8445b..43391b3a69 100644
--- 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