diff --git a/source4/kdc/wscript_build b/source4/kdc/wscript_build
index a5668188d56..78a79b7c403 100755
--- a/source4/kdc/wscript_build
+++ b/source4/kdc/wscript_build
@@ -1,5 +1,11 @@
 #!/usr/bin/env python
 
+# We do this because we do not want to depend on the KDC, only find and use it's header files.  We do not want 
+if not bld.CONFIG_SET("USING_SYSTEM_KDC"):
+    kdc_include = "../heimdal/kdc"
+else:
+    kdc_include = getattr(bld.env, "CPPPATH_KDC")
+
 bld.SAMBA_MODULE('service_kdc',
 	source='kdc.c kpasswdd.c proxy.c',
 	subsystem='service',
@@ -12,7 +18,7 @@ bld.SAMBA_MODULE('service_kdc',
 bld.SAMBA_LIBRARY('HDB_SAMBA4',
                   source='hdb-samba4.c hdb-samba4-plugin.c',
                   deps='ldb auth4_sam auth_sam_reply samba-credentials hdb db-glue samba-hostconfig com_err',
-                  includes='../heimdal/kdc',
+                  includes=kdc_include,
                   private_library=True
                   )
 
@@ -20,7 +26,7 @@ bld.SAMBA_LIBRARY('HDB_SAMBA4',
 bld.SAMBA_LIBRARY('HDB_SAMBA4_PLUGIN',
                   source='hdb-samba4-plugin.c',
                   deps='hdb HDB_SAMBA4 samba-util samba-hostconfig ',
-                  includes='../heimdal/kdc',
+                  includes=kdc_include,
                   link_name='modules/hdb/hdb_samba4.so',
                   realname='hdb_samba4.so',
                   install_path='${MODULESDIR}/hdb',
@@ -29,14 +35,14 @@ bld.SAMBA_LIBRARY('HDB_SAMBA4_PLUGIN',
 
 bld.SAMBA_SUBSYSTEM('WDC_SAMBA4',
 	source='wdc-samba4.c',
-	includes='../heimdal/kdc',
+        includes=kdc_include,
 	deps='ldb auth4_sam auth_sam_reply samba-credentials hdb PAC_GLUE samba-hostconfig com_err'
 	)
 
 
 bld.SAMBA_SUBSYSTEM('PAC_GLUE',
 	source='pac-glue.c',
-	includes='../heimdal/kdc',
+        includes=kdc_include,
 	deps='ldb auth4_sam auth_sam_reply samba-credentials hdb samba-hostconfig com_err'
 	)
 
@@ -51,7 +57,7 @@ bld.SAMBA_LIBRARY('db-glue',
 	source='db-glue.c',
 	deps='ldb auth4_sam auth_sam_reply samba-credentials hdb samba-hostconfig com_err',
 	private_library=True,
-	includes='../heimdal/kdc',
+        includes=kdc_include,
 	)
 
 bld.SAMBA_SUBSYSTEM('MIT_SAMBA',