6 files changed, 13 insertions, 1 deletions
diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c
index 7a3b1f4f69..6ef928caa1 100644
--- a/source4/kdc/db-glue.c
+++ b/source4/kdc/db-glue.c
@@ -34,7 +34,9 @@
 #include "auth/kerberos/kerberos.h"
 #include <hdb.h>
 #include "kdc/samba_kdc.h"
+#include "kdc/kdc-glue.h"
 #include "kdc/kdc-policy.h"
+#include "kdc/db-glue.h"
 
 #define SAMBA_KVNO_GET_KRBTGT(kvno) \
 	((uint16_t)(((uint32_t)kvno) >> 16))
diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
index 26365acc7c..784b98b072 100644
--- a/source4/kdc/kdc.c
+++ b/source4/kdc/kdc.c
@@ -35,6 +35,8 @@
 #include "dsdb/samdb/samdb.h"
 #include "auth/session.h"
 
+NTSTATUS server_service_kdc_init(void);
+
 extern struct krb5plugin_windc_ftable windc_plugin_table;
 extern struct hdb_method hdb_samba4;
 
diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c
index 52769493da..38db41d837 100644
--- a/source4/kdc/pac-glue.c
+++ b/source4/kdc/pac-glue.c
@@ -27,6 +27,7 @@
 #include "auth/auth.h"
 #include "auth/auth_sam_reply.h"
 #include "kdc/kdc-glue.h"
+#include "kdc/pac-glue.h"
 #include "param/param.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
 
diff --git a/source4/kdc/policy.c b/source4/kdc/policy.c
index 8f62c48649..e9cc608e10 100644
--- a/source4/kdc/policy.c
+++ b/source4/kdc/policy.c
@@ -23,6 +23,7 @@
 #include "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"
 #include "param/param.h"
+#include "kdc/kdc-policy.h"
 
 void kdc_get_policy(struct loadparm_context *lp_ctx, 
 		    struct smb_krb5_context *smb_krb5_context, 
diff --git a/source4/kdc/samba_kdc.h b/source4/kdc/samba_kdc.h
index faa4c7b7ad..3852955e45 100644
--- a/source4/kdc/samba_kdc.h
+++ b/source4/kdc/samba_kdc.h
@@ -21,6 +21,9 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef _SAMBA_KDC_H_
+#define _SAMBA_KDC_H_
+
 struct samba_kdc_base_context {
 	struct tevent_context *ev_ctx;
 	struct loadparm_context *lp_ctx;
@@ -45,3 +48,5 @@ struct samba_kdc_entry {
 	struct ldb_dn *realm_dn;
 	hdb_entry_ex *entry_ex;
 };
+
+#endif /* _SAMBA_KDC_H_ */
diff --git a/source4/kdc/wscript_build b/source4/kdc/wscript_build
index ac8f879ed4..2d633ad6a7 100644
--- a/source4/kdc/wscript_build
+++ b/source4/kdc/wscript_build
@@ -39,7 +39,8 @@ bld.SAMBA_LIBRARY('pac',
 bld.SAMBA_LIBRARY('db-glue',
 	source='db-glue.c',
 	deps='ldb auth4_sam auth_sam_reply credentials hdb samba-hostconfig com_err kdc-policy',
-	private_library=True
+	private_library=True,
+	includes='../heimdal/kdc',
 	)
 
 bld.SAMBA_LIBRARY('kdc-policy',