8 files changed, 2 insertions, 44 deletions
diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c
index 15024fa38eb..cdfec7b0b98 100644
--- a/source4/kdc/db-glue.c
+++ b/source4/kdc/db-glue.c
@@ -22,27 +22,18 @@
 */
 
 #include "includes.h"
-#include "system/time.h"
-#include "../libds/common/flags.h"
-#include "lib/ldb/include/ldb.h"
-#include "librpc/gen_ndr/netlogon.h"
 #include "libcli/security/security.h"
 #include "auth/auth.h"
-#include "auth/credentials/credentials.h"
 #include "auth/auth_sam.h"
 #include "dsdb/samdb/samdb.h"
 #include "dsdb/common/util.h"
-#include "librpc/ndr/libndr.h"
 #include "librpc/gen_ndr/ndr_drsblobs.h"
-#include "librpc/gen_ndr/lsa.h"
-#include "libcli/auth/libcli_auth.h"
 #include "param/param.h"
 #include "../lib/crypto/md4.h"
 #include "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"
 #include <hdb.h>
 #include "kdc/samba_kdc.h"
-#include "kdc/db-glue.h"
 #include "kdc/kdc-policy.h"
 
 enum samba_kdc_ent_type
diff --git a/source4/kdc/hdb-samba4.c b/source4/kdc/hdb-samba4.c
index 313f419a839..8511b2f27ba 100644
--- a/source4/kdc/hdb-samba4.c
+++ b/source4/kdc/hdb-samba4.c
@@ -33,10 +33,6 @@
  */
 
 #include "includes.h"
-#include "auth/auth.h"
-#include "auth/credentials/credentials.h"
-#include "dsdb/samdb/samdb.h"
-#include "param/param.h"
 #include "kdc/kdc-glue.h"
 #include "kdc/db-glue.h"
 
diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
index 99b07115925..c5beaba1a33 100644
--- a/source4/kdc/kdc.c
+++ b/source4/kdc/kdc.c
@@ -22,25 +22,16 @@
 */
 
 #include "includes.h"
-#include "smbd/service_task.h"
-#include "smbd/service.h"
-#include "smbd/service_stream.h"
 #include "smbd/process_model.h"
-#include "lib/events/events.h"
-#include "lib/socket/socket.h"
 #include "lib/tsocket/tsocket.h"
 #include "libcli/util/tstream.h"
-#include "system/network.h"
-#include "../lib/util/dlinklist.h"
 #include "lib/messaging/irpc.h"
-#include "lib/stream/packet.h"
-#include "librpc/gen_ndr/samr.h"
 #include "librpc/gen_ndr/ndr_irpc.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
+#include "lib/stream/packet.h"
 #include "lib/socket/netif.h"
 #include "param/param.h"
 #include "kdc/kdc-glue.h"
-#include "librpc/gen_ndr/ndr_misc.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/session.h"
 
diff --git a/source4/kdc/kpasswdd.c b/source4/kdc/kpasswdd.c
index 2c879c3de6b..800d560b44d 100644
--- a/source4/kdc/kpasswdd.c
+++ b/source4/kdc/kpasswdd.c
@@ -22,20 +22,11 @@
 
 #include "includes.h"
 #include "smbd/service_task.h"
-#include "lib/events/events.h"
-#include "lib/socket/socket.h"
-#include "lib/tsocket/tsocket.h"
-#include "system/network.h"
-#include "../lib/util/dlinklist.h"
-#include "lib/ldb/include/ldb.h"
 #include "auth/gensec/gensec.h"
 #include "auth/credentials/credentials.h"
-#include "auth/credentials/credentials_krb5.h"
 #include "auth/auth.h"
 #include "dsdb/samdb/samdb.h"
 #include "../lib/util/util_ldb.h"
-#include "rpc_server/dcerpc_server.h"
-#include "rpc_server/samr/proto.h"
 #include "libcli/security/security.h"
 #include "param/param.h"
 #include "kdc/kdc-glue.h"
diff --git a/source4/kdc/mit_samba.c b/source4/kdc/mit_samba.c
index 3d5888c4607..b9599789104 100644
--- a/source4/kdc/mit_samba.c
+++ b/source4/kdc/mit_samba.c
@@ -20,10 +20,8 @@
 #include "includes.h"
 #include "param/param.h"
 #include "dsdb/samdb/samdb.h"
-#include "auth/auth.h"
-#include "auth/credentials/credentials.h"
 #include "system/kerberos.h"
-#include "hdb.h"
+#include <hdb.h>
 #include "mit_samba_interface.h"
 #include "auth/kerberos/kerberos.h"
 #include "kdc/samba_kdc.h"
diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c
index 3c0c50430e2..6dbeb354e06 100644
--- a/source4/kdc/pac-glue.c
+++ b/source4/kdc/pac-glue.c
@@ -24,10 +24,7 @@
 #include "includes.h"
 #include "../libds/common/flags.h"
 #include "lib/ldb/include/ldb.h"
-#include "librpc/gen_ndr/ndr_krb5pac.h"
-#include "librpc/gen_ndr/krb5pac.h"
 #include "auth/auth.h"
-#include "auth/auth_sam.h"
 #include "auth/auth_sam_reply.h"
 #include "kdc/kdc-glue.h"
 #include "param/param.h"
diff --git a/source4/kdc/policy.c b/source4/kdc/policy.c
index 2760e069400..7502148b5f2 100644
--- a/source4/kdc/policy.c
+++ b/source4/kdc/policy.c
@@ -20,11 +20,8 @@
 */
 
 #include "includes.h"
-#include "lib/util/util.h"
-#include "kdc/kdc-policy.h"
 #include "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"
-#include "librpc/gen_ndr/lsa.h"
 #include "param/param.h"
 
 void kdc_get_policy(struct loadparm_context *lp_ctx, 
diff --git a/source4/kdc/wdc-samba4.c b/source4/kdc/wdc-samba4.c
index fb5816d33bf..805772f47fd 100644
--- a/source4/kdc/wdc-samba4.c
+++ b/source4/kdc/wdc-samba4.c
@@ -22,10 +22,7 @@
 */
 
 #include "includes.h"
-#include "../libds/common/flags.h"
-#include "auth/auth.h"
 #include "kdc/kdc-glue.h"
-#include "param/param.h"
 #include "kdc/pac-glue.h"
 
 /* Given the right private pointer from hdb_samba4, get a PAC from the attached ldb messages */