6 files changed, 17 insertions, 1 deletions
diff --git a/source4/auth/credentials/credentials.c b/source4/auth/credentials/credentials.c
index 21ee987852..015c549693 100644
--- a/source4/auth/credentials/credentials.c
+++ b/source4/auth/credentials/credentials.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/samr.h" /* for struct samrPassword */
 #include "auth/credentials/credentials.h"
+#include "auth/credentials/credentials_proto.h"
 #include "libcli/auth/libcli_auth.h"
 #include "lib/events/events.h"
 #include "param/param.h"
diff --git a/source4/auth/credentials/credentials_secrets.c b/source4/auth/credentials/credentials_secrets.c
index 0be4680e34..86e31f4c8b 100644
--- a/source4/auth/credentials/credentials_secrets.c
+++ b/source4/auth/credentials/credentials_secrets.c
@@ -28,6 +28,7 @@
 #include "param/secrets.h"
 #include "system/filesys.h"
 #include "auth/credentials/credentials.h"
+#include "auth/credentials/credentials_proto.h"
 #include "auth/credentials/credentials_krb5.h"
 #include "auth/kerberos/kerberos_util.h"
 #include "param/param.h"
diff --git a/source4/auth/credentials/pycredentials.c b/source4/auth/credentials/pycredentials.c
index c51e5e1f45..909d89786f 100644
--- a/source4/auth/credentials/pycredentials.c
+++ b/source4/auth/credentials/pycredentials.c
@@ -26,6 +26,8 @@
 #include "param/pyparam.h"
 #include <tevent.h>
 
+void initcredentials(void);
+
 static PyObject *PyString_FromStringOrNULL(const char *str)
 {
 	if (str == NULL)
@@ -267,7 +269,7 @@ static PyObject *py_creds_set_machine_account(py_talloc_Object *self, PyObject *
 	Py_RETURN_NONE;
 }
 
-PyObject *PyCredentialCacheContainer_from_ccache_container(struct ccache_container *ccc)
+static PyObject *PyCredentialCacheContainer_from_ccache_container(struct ccache_container *ccc)
 {
 	PyCredentialCacheContainerObject *py_ret;
 
diff --git a/source4/auth/kerberos/kerberos.h b/source4/auth/kerberos/kerberos.h
index 501a4653d7..3f021ad70a 100644
--- a/source4/auth/kerberos/kerberos.h
+++ b/source4/auth/kerberos/kerberos.h
@@ -18,6 +18,9 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef _AUTH_KERBEROS_H_
+#define _AUTH_KERBEROS_H_
+
 #if defined(HAVE_KRB5)
 
 #include "auth/kerberos/krb5_init_context.h"
@@ -157,3 +160,5 @@ krb5_error_code smb_krb5_update_keytab(TALLOC_CTX *parent_ctx,
 #include "auth/kerberos/proto.h"
 
 #endif /* HAVE_KRB5 */
+
+#endif /* _AUTH_KERBEROS_H_ */
diff --git a/source4/auth/kerberos/krb5_init_context.h b/source4/auth/kerberos/krb5_init_context.h
index 047772c8f7..835438cc5b 100644
--- a/source4/auth/kerberos/krb5_init_context.h
+++ b/source4/auth/kerberos/krb5_init_context.h
@@ -17,6 +17,9 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef _KRB5_INIT_CONTEXT_H_
+#define _KRB5_INIT_CONTEXT_H_
+
 struct smb_krb5_context {
 	krb5_context krb5_context;
 	krb5_log_facility *logf;
@@ -41,3 +44,5 @@ krb5_error_code smb_krb5_send_and_recv_func(krb5_context context,
 					    time_t timeout,
 					    const krb5_data *send_buf,
 					    krb5_data *recv_buf);
+
+#endif /* _KRB5_INIT_CONTEXT_H_ */
diff --git a/source4/auth/pyauth.c b/source4/auth/pyauth.c
index 2b310bfa1b..9cb770b798 100644
--- a/source4/auth/pyauth.c
+++ b/source4/auth/pyauth.c
@@ -31,6 +31,8 @@
 #include <tevent.h>
 #include "librpc/rpc/pyrpc_util.h"
 
+void initauth(void);
+
 staticforward PyTypeObject PyAuthContext;
 
 /* There's no Py_ssize_t in 2.4, apparently */