s4-torture: ran minimal_includes.pl over source4/torture

This reduces compile time somewhat.

124 files changed, 0 insertions, 274 deletions

diff --git a/source4/torture/auth/ntlmssp.c b/source4/torture/auth/ntlmssp.c
index e62b150a4b..259896d63a 100644
--- a/source4/torture/auth/ntlmssp.c
+++ b/source4/torture/auth/ntlmssp.c
@@ -19,7 +19,6 @@
 
 #include "includes.h"
 #include "auth/gensec/gensec.h"
-#include "auth/gensec/gensec_proto.h"
 #include "auth/ntlmssp/ntlmssp.h"
 #include "lib/cmdline/popt_common.h"
 #include "torture/torture.h"
diff --git a/source4/torture/auth/pac.c b/source4/torture/auth/pac.c
index 076120bfee..182478a465 100644
--- a/source4/torture/auth/pac.c
+++ b/source4/torture/auth/pac.c
@@ -24,7 +24,6 @@
 #include "system/kerberos.h"
 #include "auth/auth.h"
 #include "auth/kerberos/kerberos.h"
-#include "librpc/gen_ndr/ndr_krb5pac.h"
 #include "samba3/samba3.h"
 #include "libcli/security/security.h"
 #include "torture/torture.h"
diff --git a/source4/torture/basic/aliases.c b/source4/torture/basic/aliases.c
index 0309557acb..6d3447d772 100644
--- a/source4/torture/basic/aliases.c
+++ b/source4/torture/basic/aliases.c
@@ -21,7 +21,6 @@
 #include "../lib/util/dlinklist.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.h"
-#include "torture/torture.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
 
diff --git a/source4/torture/basic/attr.c b/source4/torture/basic/attr.c
index 07071bb68a..6c18e18e4e 100644
--- a/source4/torture/basic/attr.c
+++ b/source4/torture/basic/attr.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
 
diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c
index 355c569bb3..2c72257845 100644
--- a/source4/torture/basic/base.c
+++ b/source4/torture/basic/base.c
@@ -27,9 +27,7 @@
 #include "system/filesys.h"
 #include "system/time.h"
 #include "libcli/resolve/resolve.h"
-#include "librpc/gen_ndr/ndr_nbt.h"
 #include "lib/events/events.h"
-#include "lib/cmdline/popt_common.h"
 #include "param/param.h"
 
 
diff --git a/source4/torture/basic/charset.c b/source4/torture/basic/charset.c
index 2f50376f87..3cfcadcb7a 100644
--- a/source4/torture/basic/charset.c
+++ b/source4/torture/basic/charset.c
@@ -20,8 +20,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
-#include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
 #include "param/param.h"
diff --git a/source4/torture/basic/delete.c b/source4/torture/basic/delete.c
index c1ac62f1b1..0f7c939f5c 100644
--- a/source4/torture/basic/delete.c
+++ b/source4/torture/basic/delete.c
@@ -21,10 +21,8 @@
 
 #include "includes.h"
 #include "libcli/libcli.h"
-#include "torture/torture.h"
 #include "torture/util.h"
 #include "system/filesys.h"
-#include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.h"
 
 #include "torture/raw/proto.h"
diff --git a/source4/torture/basic/denytest.c b/source4/torture/basic/denytest.c
index d13ea2c745..9eceb4ca85 100644
--- a/source4/torture/basic/denytest.c
+++ b/source4/torture/basic/denytest.c
@@ -18,14 +18,10 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "system/filesys.h"
-#include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
 #include "libcli/security/security.h"
 #include "torture/util.h"
-#include "torture/smbtorture.h"
-#include "libcli/util/clilsa.h"
 #include "cxd_known.h"
 
 extern int torture_failures;
diff --git a/source4/torture/basic/dir.c b/source4/torture/basic/dir.c
index 9a1ae2f744..2024f4c30c 100644
--- a/source4/torture/basic/dir.c
+++ b/source4/torture/basic/dir.c
@@ -21,7 +21,6 @@
 
 #include "includes.h"
 #include "libcli/libcli.h"
-#include "torture/torture.h"
 #include "torture/util.h"
 #include "system/filesys.h"
 
diff --git a/source4/torture/basic/disconnect.c b/source4/torture/basic/disconnect.c
index 0de0910512..7f071178f4 100644
--- a/source4/torture/basic/disconnect.c
+++ b/source4/torture/basic/disconnect.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.h"
diff --git a/source4/torture/basic/locking.c b/source4/torture/basic/locking.c
index 06a960bc81..8feea23534 100644
--- a/source4/torture/basic/locking.c
+++ b/source4/torture/basic/locking.c
@@ -21,9 +21,7 @@
 */
 
 #include "includes.h"
-#include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
-#include "torture/smbtorture.h"
 #include "torture/util.h"
 #include "system/time.h"
 #include "system/filesys.h"
diff --git a/source4/torture/basic/mangle_test.c b/source4/torture/basic/mangle_test.c
index 98c53aac21..0d710f2cfe 100644
--- a/source4/torture/basic/mangle_test.c
+++ b/source4/torture/basic/mangle_test.c
@@ -18,7 +18,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "system/filesys.h"
 #include "system/dir.h"
 #include "../tdb/include/tdb.h"
diff --git a/source4/torture/basic/misc.c b/source4/torture/basic/misc.c
index f4f91c8ba3..a8ea88fb7f 100644
--- a/source4/torture/basic/misc.c
+++ b/source4/torture/basic/misc.c
@@ -28,8 +28,6 @@
 #include "libcli/libcli.h"
 #include "lib/events/events.h"
 #include "libcli/resolve/resolve.h"
-#include "auth/credentials/credentials.h"
-#include "librpc/gen_ndr/ndr_nbt.h"
 #include "torture/smbtorture.h"
 #include "torture/util.h"
 #include "libcli/smb_composite/smb_composite.h"
diff --git a/source4/torture/basic/properties.c b/source4/torture/basic/properties.c
index 1825dff993..ca62466f20 100644
--- a/source4/torture/basic/properties.c
+++ b/source4/torture/basic/properties.c
@@ -20,8 +20,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
-#include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
 
diff --git a/source4/torture/basic/rename.c b/source4/torture/basic/rename.c
index 12fd5e1c99..8901c9e64f 100644
--- a/source4/torture/basic/rename.c
+++ b/source4/torture/basic/rename.c
@@ -21,7 +21,6 @@
 
 #include "includes.h"
 #include "libcli/libcli.h"
-#include "torture/torture.h"
 #include "torture/util.h"
 
 /*
diff --git a/source4/torture/basic/scanner.c b/source4/torture/basic/scanner.c
index a6173e4501..37c1f43c39 100644
--- a/source4/torture/basic/scanner.c
+++ b/source4/torture/basic/scanner.c
@@ -18,10 +18,8 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
-#include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.h"
 #include "system/filesys.h"
 #include "param/param.h"
diff --git a/source4/torture/basic/secleak.c b/source4/torture/basic/secleak.c
index 3fdd9a9bbd..363b824b66 100644
--- a/source4/torture/basic/secleak.c
+++ b/source4/torture/basic/secleak.c
@@ -20,14 +20,12 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
 #include "system/time.h"
 #include "libcli/smb_composite/smb_composite.h"
-#include "libcli/smb_composite/proto.h"
 #include "auth/credentials/credentials.h"
 #include "param/param.h"
 
diff --git a/source4/torture/basic/unlink.c b/source4/torture/basic/unlink.c
index 5d0e4f6964..ca32d5ff96 100644
--- a/source4/torture/basic/unlink.c
+++ b/source4/torture/basic/unlink.c
@@ -20,9 +20,7 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "system/filesys.h"
-#include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
 
diff --git a/source4/torture/basic/utable.c b/source4/torture/basic/utable.c
index ca6c2fd576..158418a284 100644
--- a/source4/torture/basic/utable.c
+++ b/source4/torture/basic/utable.c
@@ -18,7 +18,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "system/filesys.h"
 #include "system/locale.h"
 #include "libcli/libcli.h"
diff --git a/source4/torture/drs/internal/prefixmap_tests.c b/source4/torture/drs/internal/prefixmap_tests.c
index 00a4312d56..6e6c4aac57 100644
--- a/source4/torture/drs/internal/prefixmap_tests.c
+++ b/source4/torture/drs/internal/prefixmap_tests.c
@@ -22,9 +22,7 @@
 #include "includes.h"
 #include "torture/smbtorture.h"
 #include "torture/rpc/drsuapi.h"
-#include "torture/drs/proto.h"
 #include "dsdb/samdb/samdb.h"
-#include "dsdb/schema/prefixmap.h"
 
 
 /**
diff --git a/source4/torture/ldap/basic.c b/source4/torture/ldap/basic.c
index a9d9ea0832..87719f81ac 100644
--- a/source4/torture/ldap/basic.c
+++ b/source4/torture/ldap/basic.c
@@ -28,7 +28,6 @@
 #include "torture/torture.h"
 #include "torture/ldap/proto.h"
 
-#include "param/param.h"
 
 static bool test_bind_simple(struct ldap_connection *conn, const char *userdn, const char *password)
 {
diff --git a/source4/torture/ldap/cldap.c b/source4/torture/ldap/cldap.c
index a77b8a4b43..edd959346c 100644
--- a/source4/torture/ldap/cldap.c
+++ b/source4/torture/ldap/cldap.c
@@ -24,10 +24,8 @@
 #include "includes.h"
 #include "libcli/cldap/cldap.h"
 #include "libcli/ldap/ldap.h"
-#include "librpc/gen_ndr/ndr_nbt.h"
 #include "librpc/gen_ndr/netlogon.h"
 #include "torture/torture.h"
-#include "lib/ldb/include/ldb.h"
 #include "param/param.h"
 #include "../lib/tsocket/tsocket.h"
 
diff --git a/source4/torture/ldap/cldapbench.c b/source4/torture/ldap/cldapbench.c
index 1614120294..f77c0e00da 100644
--- a/source4/torture/ldap/cldapbench.c
+++ b/source4/torture/ldap/cldapbench.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include <tevent.h>
 #include "libcli/cldap/cldap.h"
 #include "libcli/resolve/resolve.h"
 #include "torture/torture.h"
diff --git a/source4/torture/ldap/schema.c b/source4/torture/ldap/schema.c
index 7ea7b39d5c..e746a32f2b 100644
--- a/source4/torture/ldap/schema.c
+++ b/source4/torture/ldap/schema.c
@@ -23,15 +23,11 @@
 #include "libcli/ldap/ldap_client.h"
 #include "lib/cmdline/popt_common.h"
 #include "ldb_wrap.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
 #include "dsdb/samdb/samdb.h"
 #include "../lib/util/dlinklist.h"
 
 #include "torture/torture.h"
-#include "torture/ldap/proto.h"
 
-#include "param/param.h"
 
 struct test_rootDSE {
 	const char *defaultdn;
diff --git a/source4/torture/ldap/uptodatevector.c b/source4/torture/ldap/uptodatevector.c
index bf32edb065..c53459a58e 100644
--- a/source4/torture/ldap/uptodatevector.c
+++ b/source4/torture/ldap/uptodatevector.c
@@ -23,15 +23,10 @@
 #include "libcli/ldap/ldap_client.h"
 #include "lib/cmdline/popt_common.h"
 #include "ldb_wrap.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
 #include "dsdb/samdb/samdb.h"
-#include "../lib/util/dlinklist.h"
 
 #include "torture/torture.h"
-#include "torture/ldap/proto.h"
 
-#include "librpc/ndr/libndr.h"
 #include "librpc/gen_ndr/ndr_drsblobs.h"
 
 #include "param/param.h"
diff --git a/source4/torture/libnet/domain.c b/source4/torture/libnet/domain.c
index ab7846e5e1..0ba72df4e4 100644
--- a/source4/torture/libnet/domain.c
+++ b/source4/torture/libnet/domain.c
@@ -20,7 +20,6 @@
 
 #include "includes.h"
 #include "torture/rpc/rpc.h"
-#include "lib/events/events.h"
 #include "libnet/libnet.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 #include "param/param.h"
diff --git a/source4/torture/libnet/libnet.c b/source4/torture/libnet/libnet.c
index 8c8353e8d6..3dbd777604 100644
--- a/source4/torture/libnet/libnet.c
+++ b/source4/torture/libnet/libnet.c
@@ -20,7 +20,6 @@
 #include "includes.h"
 #include "torture/smbtorture.h"
 #include "librpc/rpc/dcerpc.h"
-#include "librpc/gen_ndr/security.h"
 #include "librpc/gen_ndr/lsa.h"
 #include "libnet/composite.h"
 #include "torture/libnet/proto.h"
diff --git a/source4/torture/libnet/libnet_BecomeDC.c b/source4/torture/libnet/libnet_BecomeDC.c
index 81bdf342b2..e1c4b751af 100644
--- a/source4/torture/libnet/libnet_BecomeDC.c
+++ b/source4/torture/libnet/libnet_BecomeDC.c
@@ -21,23 +21,16 @@
 
 #include "includes.h"
 #include "lib/cmdline/popt_common.h"
-#include "torture/torture.h"
 #include "torture/rpc/rpc.h"
 #include "libnet/libnet.h"
-#include "lib/events/events.h"
 #include "dsdb/samdb/samdb.h"
 #include "../lib/util/dlinklist.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
-#include "librpc/ndr/libndr.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"
 #include "librpc/gen_ndr/ndr_drsblobs.h"
-#include "librpc/gen_ndr/ndr_misc.h"
 #include "system/time.h"
 #include "lib/ldb_wrap.h"
 #include "auth/auth.h"
 #include "param/param.h"
-#include "torture/util.h"
 #include "param/provision.h"
 
 struct test_become_dc_state {
diff --git a/source4/torture/libnet/libnet_domain.c b/source4/torture/libnet/libnet_domain.c
index 3c28d1a019..fc45c4efa7 100644
--- a/source4/torture/libnet/libnet_domain.c
+++ b/source4/torture/libnet/libnet_domain.c
@@ -21,14 +21,9 @@
 
 #include "includes.h"
 #include "lib/cmdline/popt_common.h"
-#include "lib/events/events.h"
-#include "auth/credentials/credentials.h"
 #include "libnet/libnet.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
-#include "libcli/security/security.h"
-#include "librpc/rpc/dcerpc.h"
-#include "torture/torture.h"
 #include "torture/rpc/rpc.h"
 #include "param/param.h"
 
diff --git a/source4/torture/libnet/libnet_group.c b/source4/torture/libnet/libnet_group.c
index c7fdfbd10b..d2a8c12f21 100644
--- a/source4/torture/libnet/libnet_group.c
+++ b/source4/torture/libnet/libnet_group.c
@@ -24,7 +24,6 @@
 #include "libnet/libnet.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
-#include "torture/torture.h"
 #include "torture/rpc/rpc.h"
 #include "param/param.h"
 
diff --git a/source4/torture/libnet/libnet_lookup.c b/source4/torture/libnet/libnet_lookup.c
index b25b51b7d9..b7d0704f30 100644
--- a/source4/torture/libnet/libnet_lookup.c
+++ b/source4/torture/libnet/libnet_lookup.c
@@ -21,11 +21,8 @@
 #include "includes.h"
 #include "lib/cmdline/popt_common.h"
 #include "libnet/libnet.h"
-#include "librpc/gen_ndr/nbt.h"
-#include "librpc/rpc/dcerpc.h"
 #include "libcli/libcli.h"
 #include "torture/rpc/rpc.h"
-#include "torture/torture.h"
 #include "param/param.h"
 
 
diff --git a/source4/torture/libnet/libnet_rpc.c b/source4/torture/libnet/libnet_rpc.c
index c9ba875589..0177789543 100644
--- a/source4/torture/libnet/libnet_rpc.c
+++ b/source4/torture/libnet/libnet_rpc.c
@@ -20,16 +20,12 @@
 
 #include "includes.h"
 #include "lib/cmdline/popt_common.h"
-#include "auth/credentials/credentials.h"
 #include "libnet/libnet.h"
 #include "libcli/security/security.h"
-#include "librpc/ndr/libndr.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "librpc/gen_ndr/ndr_srvsvc.h"
-#include "librpc/rpc/dcerpc.h"
 #include "torture/rpc/rpc.h"
-#include "torture/torture.h"
 #include "param/param.h"
 
 
diff --git a/source4/torture/libnet/libnet_user.c b/source4/torture/libnet/libnet_user.c
index 18007dccad..3bb962c2fa 100644
--- a/source4/torture/libnet/libnet_user.c
+++ b/source4/torture/libnet/libnet_user.c
@@ -24,7 +24,6 @@
 #include "libnet/libnet.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
-#include "torture/torture.h"
 #include "torture/rpc/rpc.h"
 #include "torture/libnet/usertest.h"
 #include "param/param.h"
diff --git a/source4/torture/libnet/utils.c b/source4/torture/libnet/utils.c
index 942540c80e..c66466ea9d 100644
--- a/source4/torture/libnet/utils.c
+++ b/source4/torture/libnet/utils.c
@@ -26,7 +26,6 @@
 #include "torture/rpc/rpc.h"
 #include "libnet/libnet.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
-#include "torture/libnet/utils.h"
 
 
 bool test_opendomain(struct torture_context *tctx, 
diff --git a/source4/torture/local/local.c b/source4/torture/local/local.c
index 8c6fd5e10c..50b2ea9d62 100644
--- a/source4/torture/local/local.c
+++ b/source4/torture/local/local.c
@@ -20,7 +20,6 @@
 #include "includes.h"
 #include "torture/smbtorture.h"
 #include "torture/local/proto.h"
-#include "torture/ndr/ndr.h"
 #include "torture/ndr/proto.h"
 #include "torture/auth/proto.h"
 #include "../lib/crypto/test_proto.h"
diff --git a/source4/torture/local/torture.c b/source4/torture/local/torture.c
index 7935f6cc35..5a8700d34d 100644
--- a/source4/torture/local/torture.c
+++ b/source4/torture/local/torture.c
@@ -20,9 +20,7 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "system/wait.h"
-#include "lib/events/events.h"
 #include "libcli/raw/libcliraw.h"
 #include "torture/util.h"
 #include "param/provision.h"
diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c
index 0a937e9638..12be00f298 100644
--- a/source4/torture/locktest.c
+++ b/source4/torture/locktest.c
@@ -26,7 +26,6 @@
 #include "auth/gensec/gensec.h"
 #include "libcli/libcli.h"
 #include "param/param.h"
-#include "dynconfig/dynconfig.h"
 #include "libcli/resolve/resolve.h"
 
 static int numops = 1000;
diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c
index 7b0251d159..0dd6a8f929 100644
--- a/source4/torture/masktest.c
+++ b/source4/torture/masktest.c
@@ -22,12 +22,10 @@
 #include "system/filesys.h"
 #include "system/dir.h"
 #include "libcli/libcli.h"
-#include "libcli/raw/libcliraw.h"
 #include "system/time.h"
 #include "auth/credentials/credentials.h"
 #include "auth/gensec/gensec.h"
 #include "param/param.h"
-#include "dynconfig/dynconfig.h"
 #include "libcli/resolve/resolve.h"
 #include "lib/events/events.h"
 
diff --git a/source4/torture/nbench/nbio.c b/source4/torture/nbench/nbio.c
index 0f811ab56e..2c9e568003 100644
--- a/source4/torture/nbench/nbio.c
+++ b/source4/torture/nbench/nbio.c
@@ -27,9 +27,6 @@
 #include "system/filesys.h"
 #include "../lib/util/dlinklist.h"
 #include "libcli/libcli.h"
-#include "libcli/raw/libcliraw.h"
-#include "torture/torture.h"
-#include "libcli/libcli.h"
 #include "torture/util.h"
 #include "torture/nbench/proto.h"
 
diff --git a/source4/torture/nbt/dgram.c b/source4/torture/nbt/dgram.c
index 568e9c3e26..ed1bd57bd1 100644
--- a/source4/torture/nbt/dgram.c
+++ b/source4/torture/nbt/dgram.c
@@ -21,9 +21,6 @@
 
 #include "includes.h"
 #include "libcli/dgram/libdgram.h"
-#include "librpc/gen_ndr/samr.h"
-#include "librpc/gen_ndr/ndr_nbt.h"
-#include "librpc/gen_ndr/ndr_netlogon.h"
 #include "lib/socket/socket.h"
 #include "lib/events/events.h"
 #include "torture/rpc/rpc.h"
diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c
index ca557de8fe..1ad0543d66 100644
--- a/source4/torture/nbt/winsreplication.c
+++ b/source4/torture/nbt/winsreplication.c
@@ -24,7 +24,6 @@
 #include "libcli/wrepl/winsrepl.h"
 #include "lib/events/events.h"
 #include "lib/socket/socket.h"
-#include "libcli/resolve/resolve.h"
 #include "system/network.h"
 #include "lib/socket/netif.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
diff --git a/source4/torture/ndr/ndr.c b/source4/torture/ndr/ndr.c
index 70bd070009..7bd3631ad0 100644
--- a/source4/torture/ndr/ndr.c
+++ b/source4/torture/ndr/ndr.c
@@ -21,7 +21,6 @@
 #include "includes.h"
 #include "torture/ndr/ndr.h"
 #include "torture/ndr/proto.h"
-#include "torture/torture.h"
 #include "../lib/util/dlinklist.h"
 #include "param/param.h"
 
diff --git a/source4/torture/ntp/ntp_signd.c b/source4/torture/ntp/ntp_signd.c
index 1b3c59543e..e38ab4e3a7 100644
--- a/source4/torture/ntp/ntp_signd.c
+++ b/source4/torture/ntp/ntp_signd.c
@@ -20,18 +20,14 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "torture/smbtorture.h"
 #include <tevent.h>
 #include "lib/socket/socket.h"
 #include "lib/stream/packet.h"
-#include "auth/credentials/credentials.h"
 #include "torture/rpc/rpc.h"
-#include "torture/rpc/netlogon.h"
 #include "../lib/crypto/crypto.h"
 #include "libcli/auth/libcli_auth.h"
 #include "librpc/gen_ndr/ndr_netlogon_c.h"
-#include "librpc/gen_ndr/ndr_netlogon.h"
 #include "librpc/gen_ndr/ndr_ntp_signd.h"
 #include "param/param.h"
 
diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index be231107dd..2660aaf3d4 100644
--- a/source4/torture/rap/rap.c
+++ b/source4/torture/rap/rap.c
@@ -24,8 +24,6 @@
 #include "torture/smbtorture.h"
 #include "torture/util.h"
 #include "libcli/rap/rap.h"
-#include "libcli/raw/libcliraw.h"
-#include "libcli/libcli.h"
 #include "librpc/ndr/libndr.h"
 #include "param/param.h"
 
diff --git a/source4/torture/raw/chkpath.c b/source4/torture/raw/chkpath.c
index a39993489b..433525b7cc 100644
--- a/source4/torture/raw/chkpath.c
+++ b/source4/torture/raw/chkpath.c
@@ -19,9 +19,7 @@
 
 #include "includes.h"
 #include "system/locale.h"
-#include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
-#include "libcli/raw/raw_proto.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
 
diff --git a/source4/torture/raw/context.c b/source4/torture/raw/context.c
index 0e0851e741..1335b7d461 100644
--- a/source4/torture/raw/context.c
+++ b/source4/torture/raw/context.c
@@ -18,13 +18,10 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.h"
-#include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
 #include "lib/cmdline/popt_common.h"
-#include "lib/events/events.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
 #include "auth/credentials/credentials.h"
diff --git a/source4/torture/raw/ioctl.c b/source4/torture/raw/ioctl.c
index 4cb366f807..87fbfaaab6 100644
--- a/source4/torture/raw/ioctl.c
+++ b/source4/torture/raw/ioctl.c
@@ -19,7 +19,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "libcli/raw/ioctl.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.h"
diff --git a/source4/torture/raw/lockbench.c b/source4/torture/raw/lockbench.c
index c7f99aeb3c..a3fe03370f 100644
--- a/source4/torture/raw/lockbench.c
+++ b/source4/torture/raw/lockbench.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.h"
 #include "system/time.h"
diff --git a/source4/torture/raw/lookuprate.c b/source4/torture/raw/lookuprate.c
index e4caf7b1be..e26c5b0b89 100644
--- a/source4/torture/raw/lookuprate.c
+++ b/source4/torture/raw/lookuprate.c
@@ -20,11 +20,8 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "torture/smbtorture.h"
-#include "torture/basic/proto.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
-#include "lib/cmdline/popt_common.h"
-#include "auth/credentials/credentials.h"
 
 #define BASEDIR "\\lookuprate"
 #define MISSINGNAME BASEDIR "\\foo"
diff --git a/source4/torture/raw/mkdir.c b/source4/torture/raw/mkdir.c
index a81aacdaa4..c109ee7cf7 100644
--- a/source4/torture/raw/mkdir.c
+++ b/source4/torture/raw/mkdir.c
@@ -18,9 +18,7 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
-#include "libcli/raw/raw_proto.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
 
diff --git a/source4/torture/raw/mux.c b/source4/torture/raw/mux.c
index 19cb4ce422..b0764ff69c 100644
--- a/source4/torture/raw/mux.c
+++ b/source4/torture/raw/mux.c
@@ -18,7 +18,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.h"
diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c
index 8be7e06dff..257cf9daf6 100644
--- a/source4/torture/raw/notify.c
+++ b/source4/torture/raw/notify.c
@@ -18,7 +18,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.h"
 #include "libcli/libcli.h"
diff --git a/source4/torture/raw/offline.c b/source4/torture/raw/offline.c
index 5322f471a2..de72c88b5c 100644
--- a/source4/torture/raw/offline.c
+++ b/source4/torture/raw/offline.c
@@ -22,17 +22,13 @@
  */
 
 #include "includes.h"
-#include "torture/torture.h"
-#include "libcli/raw/libcliraw.h"
 #include "system/time.h"
 #include "system/filesys.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
 #include "lib/events/events.h"
-#include "lib/cmdline/popt_common.h"
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
-#include "libcli/resolve/resolve.h"
 
 #define BASEDIR "\\testoffline"
 
diff --git a/source4/torture/raw/open.c b/source4/torture/raw/open.c
index 73f9c3f839..adec6a99da 100644
--- a/source4/torture/raw/open.c
+++ b/source4/torture/raw/open.c
@@ -18,17 +18,12 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
-#include "libcli/raw/raw_proto.h"
 #include "system/time.h"
 #include "system/filesys.h"
-#include "librpc/gen_ndr/security.h"
 #include "lib/events/events.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
-#include "auth/credentials/credentials.h"
-#include "lib/cmdline/popt_common.h"
 
 /* enum for whether reads/writes are possible on a file */
 enum rdwr_mode {RDWR_NONE, RDWR_RDONLY, RDWR_WRONLY, RDWR_RDWR};
diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index 1b9d8e95c9..63f5ee5f28 100644
--- a/source4/torture/raw/oplock.c
+++ b/source4/torture/raw/oplock.c
@@ -18,13 +18,8 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
-#include "torture/smbtorture.h"
-#include "librpc/gen_ndr/security.h"
-#include "librpc/gen_ndr/ndr_security.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.h"
-#include "libcli/security/security.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
 #include "lib/events/events.h"
diff --git a/source4/torture/raw/pingpong.c b/source4/torture/raw/pingpong.c
index a19b330dbd..f620c4854d 100755..100644
--- a/source4/torture/raw/pingpong.c
+++ b/source4/torture/raw/pingpong.c
@@ -44,8 +44,6 @@
 
 */
 #include "includes.h"
-#include "torture/torture.h"
-#include "libcli/raw/libcliraw.h"
 #include "system/time.h"
 #include "system/filesys.h"
 #include "libcli/libcli.h"
diff --git a/source4/torture/raw/qfileinfo.c b/source4/torture/raw/qfileinfo.c
index c7673be526..d21d1dc776 100644
--- a/source4/torture/raw/qfileinfo.c
+++ b/source4/torture/raw/qfileinfo.c
@@ -19,14 +19,11 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
-#include "librpc/rpc/dcerpc.h"
 #include "torture/rpc/rpc.h"
-#include "torture/raw/proto.h"
 #include "param/param.h"
 
 static struct {
diff --git a/source4/torture/raw/qfsinfo.c b/source4/torture/raw/qfsinfo.c
index c1c77edba9..e4492a5312 100644
--- a/source4/torture/raw/qfsinfo.c
+++ b/source4/torture/raw/qfsinfo.c
@@ -18,8 +18,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
-#include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
 
diff --git a/source4/torture/raw/read.c b/source4/torture/raw/read.c
index ea1fc125a7..3b48aac848 100644
--- a/source4/torture/raw/read.c
+++ b/source4/torture/raw/read.c
@@ -18,9 +18,7 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
-#include "libcli/raw/raw_proto.h"
 #include "system/time.h"
 #include "system/filesys.h"
 #include "libcli/libcli.h"
diff --git a/source4/torture/raw/rename.c b/source4/torture/raw/rename.c
index cf04769764..28def7bd85 100644
--- a/source4/torture/raw/rename.c
+++ b/source4/torture/raw/rename.c
@@ -18,8 +18,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
-#include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
 
diff --git a/source4/torture/raw/samba3hide.c b/source4/torture/raw/samba3hide.c
index 1f1501045c..4f9e2ecf8f 100644
--- a/source4/torture/raw/samba3hide.c
+++ b/source4/torture/raw/samba3hide.c
@@ -18,8 +18,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
-#include "libcli/raw/libcliraw.h"
 #include "system/time.h"
 #include "system/filesys.h"
 #include "libcli/libcli.h"
diff --git a/source4/torture/raw/search.c b/source4/torture/raw/search.c
index 8a3168dcc4..3aee7fbdfe 100644
--- a/source4/torture/raw/search.c
+++ b/source4/torture/raw/search.c
@@ -18,7 +18,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.h"
diff --git a/source4/torture/raw/seek.c b/source4/torture/raw/seek.c
index 3ba022feef..458a45308f 100644
--- a/source4/torture/raw/seek.c
+++ b/source4/torture/raw/seek.c
@@ -18,9 +18,7 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "system/filesys.h"
-#include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
 
diff --git a/source4/torture/raw/setfileinfo.c b/source4/torture/raw/setfileinfo.c
index 10eaa6710d..31c753300c 100644
--- a/source4/torture/raw/setfileinfo.c
+++ b/source4/torture/raw/setfileinfo.c
@@ -18,13 +18,10 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "system/time.h"
 #include "libcli/raw/libcliraw.h"
-#include "libcli/raw/raw_proto.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
-#include "torture/raw/proto.h"
 
 #define BASEDIR "\\testsfileinfo"
 
diff --git a/source4/torture/raw/write.c b/source4/torture/raw/write.c
index 5d3628ca86..cd1b078dbf 100644
--- a/source4/torture/raw/write.c
+++ b/source4/torture/raw/write.c
@@ -19,9 +19,7 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
-#include "libcli/raw/raw_proto.h"
 #include "system/time.h"
 #include "system/filesys.h"
 #include "libcli/libcli.h"
diff --git a/source4/torture/rpc/alter_context.c b/source4/torture/rpc/alter_context.c
index 7843713074..cfd56f78e5 100644
--- a/source4/torture/rpc/alter_context.c
+++ b/source4/torture/rpc/alter_context.c
@@ -20,10 +20,8 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_dssetup.h"
-#include "librpc/rpc/dcerpc.h"
 #include "torture/rpc/rpc.h"
 
 bool torture_rpc_alter_context(struct torture_context *torture)
diff --git a/source4/torture/rpc/async_bind.c b/source4/torture/rpc/async_bind.c
index 0ebbef1ce6..6669aa27c1 100644
--- a/source4/torture/rpc/async_bind.c
+++ b/source4/torture/rpc/async_bind.c
@@ -21,12 +21,8 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
-#include "lib/events/events.h"
-#include "libcli/composite/composite.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "lib/cmdline/popt_common.h"
-#include "librpc/rpc/dcerpc.h"
 #include "torture/rpc/rpc.h"
 
 /*
diff --git a/source4/torture/rpc/atsvc.c b/source4/torture/rpc/atsvc.c
index 23d76ae502..5b35797f63 100644
--- a/source4/torture/rpc/atsvc.c
+++ b/source4/torture/rpc/atsvc.c
@@ -19,7 +19,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_atsvc_c.h"
 #include "torture/rpc/rpc.h"
 
diff --git a/source4/torture/rpc/autoidl.c b/source4/torture/rpc/autoidl.c
index 6345712133..1b53b781e6 100644
--- a/source4/torture/rpc/autoidl.c
+++ b/source4/torture/rpc/autoidl.c
@@ -20,12 +20,9 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_drsuapi_c.h"
-#include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/ndr/ndr_table.h"
 #include "torture/rpc/rpc.h"
-#include "librpc/rpc/dcerpc_proto.h"
 
 
 #if 1
diff --git a/source4/torture/rpc/bench.c b/source4/torture/rpc/bench.c
index 6fa3815516..0c7477c454 100644
--- a/source4/torture/rpc/bench.c
+++ b/source4/torture/rpc/bench.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_srvsvc_c.h"
 #include "torture/rpc/rpc.h"
 
diff --git a/source4/torture/rpc/bind.c b/source4/torture/rpc/bind.c
index 55c9d3686d..73978e4cec 100644
--- a/source4/torture/rpc/bind.c
+++ b/source4/torture/rpc/bind.c
@@ -21,15 +21,9 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
-#include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
 #include "lib/cmdline/popt_common.h"
-#include "librpc/rpc/dcerpc.h"
 #include "torture/rpc/rpc.h"
-#include "libcli/libcli.h"
-#include "libcli/composite/composite.h"
-#include "libcli/smb_composite/smb_composite.h"
 
 /*
   This test is 'bogus' in that it doesn't actually perform to the
diff --git a/source4/torture/rpc/browser.c b/source4/torture/rpc/browser.c
index 32b552acc8..c9bb9d7ff0 100644
--- a/source4/torture/rpc/browser.c
+++ b/source4/torture/rpc/browser.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_browser_c.h"
 #include "torture/rpc/rpc.h"
 
diff --git a/source4/torture/rpc/countcalls.c b/source4/torture/rpc/countcalls.c
index 4914ae1e50..3a4bbd99f0 100644
--- a/source4/torture/rpc/countcalls.c
+++ b/source4/torture/rpc/countcalls.c
@@ -21,12 +21,10 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "librpc/ndr/libndr.h"
 #include "librpc/ndr/ndr_table.h"
 #include "torture/rpc/rpc.h"
 #include "param/param.h"
-#include "librpc/rpc/dcerpc_proto.h"
 
 
 	
diff --git a/source4/torture/rpc/dfs.c b/source4/torture/rpc/dfs.c
index 3ba52e6f34..fca1c54fdb 100644
--- a/source4/torture/rpc/dfs.c
+++ b/source4/torture/rpc/dfs.c
@@ -20,12 +20,9 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "torture/rpc/rpc.h"
 #include "librpc/gen_ndr/ndr_dfs_c.h"
-#include "librpc/gen_ndr/ndr_srvsvc_c.h"
 #include "libnet/libnet.h"
-#include "libcli/raw/libcliraw.h"
 #include "torture/util.h"
 #include "libcli/libcli.h"
 #include "lib/cmdline/popt_common.h"
diff --git a/source4/torture/rpc/drsuapi.c b/source4/torture/rpc/drsuapi.c
index 8f6bbb163b..5f23995c8c 100644
--- a/source4/torture/rpc/drsuapi.c
+++ b/source4/torture/rpc/drsuapi.c
@@ -22,7 +22,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_drsuapi_c.h"
 #include "torture/rpc/rpc.h"
 #include "param/param.h"
diff --git a/source4/torture/rpc/drsuapi_cracknames.c b/source4/torture/rpc/drsuapi_cracknames.c
index c14776b255..dad0d918ca 100644
--- a/source4/torture/rpc/drsuapi_cracknames.c
+++ b/source4/torture/rpc/drsuapi_cracknames.c
@@ -22,7 +22,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_drsuapi_c.h"
 #include "torture/rpc/rpc.h"
 #include "ldb/include/ldb.h"
diff --git a/source4/torture/rpc/dssetup.c b/source4/torture/rpc/dssetup.c
index aa5f12eb92..f52aa9fb90 100644
--- a/source4/torture/rpc/dssetup.c
+++ b/source4/torture/rpc/dssetup.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_dssetup_c.h"
 #include "torture/rpc/rpc.h"
 
diff --git a/source4/torture/rpc/dssync.c b/source4/torture/rpc/dssync.c
index a9341d569b..50cae5aab7 100644
--- a/source4/torture/rpc/dssync.c
+++ b/source4/torture/rpc/dssync.c
@@ -28,11 +28,7 @@
 #include "libcli/ldap/ldap_client.h"
 #include "torture/torture.h"
 #include "torture/ldap/proto.h"
-#include "libcli/auth/libcli_auth.h"
-#include "../lib/crypto/crypto.h"
 #include "../libcli/drsuapi/drsuapi.h"
-#include "auth/credentials/credentials.h"
-#include "libcli/auth/libcli_auth.h"
 #include "auth/gensec/gensec.h"
 #include "param/param.h"
 #include "dsdb/samdb/samdb.h"
diff --git a/source4/torture/rpc/echo.c b/source4/torture/rpc/echo.c
index 8696b99b24..4fd2694926 100644
--- a/source4/torture/rpc/echo.c
+++ b/source4/torture/rpc/echo.c
@@ -21,7 +21,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "torture/rpc/rpc.h"
 #include "lib/events/events.h"
 #include "librpc/gen_ndr/ndr_echo_c.h"
diff --git a/source4/torture/rpc/epmapper.c b/source4/torture/rpc/epmapper.c
index e99b3b1354..37a55d1523 100644
--- a/source4/torture/rpc/epmapper.c
+++ b/source4/torture/rpc/epmapper.c
@@ -19,7 +19,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_epmapper_c.h"
 #include "librpc/ndr/ndr_table.h"
 #include "librpc/rpc/dcerpc_proto.h"
diff --git a/source4/torture/rpc/eventlog.c b/source4/torture/rpc/eventlog.c
index eac96adbf1..7a1eba8667 100644
--- a/source4/torture/rpc/eventlog.c
+++ b/source4/torture/rpc/eventlog.c
@@ -21,10 +21,8 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_eventlog.h"
 #include "librpc/gen_ndr/ndr_eventlog_c.h"
-#include "librpc/gen_ndr/ndr_lsa.h"
 #include "torture/rpc/rpc.h"
 #include "param/param.h"
 
diff --git a/source4/torture/rpc/frsapi.c b/source4/torture/rpc/frsapi.c
index 24d769a310..78347775d0 100644
--- a/source4/torture/rpc/frsapi.c
+++ b/source4/torture/rpc/frsapi.c
@@ -20,10 +20,8 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "torture/rpc/rpc.h"
 #include "librpc/gen_ndr/ndr_frsapi_c.h"
-#include "torture/util.h"
 #include "param/param.h"
 
 static bool test_GetDsPollingIntervalW(struct torture_context *tctx,
diff --git a/source4/torture/rpc/handles.c b/source4/torture/rpc/handles.c
index caca6b9e0a..bbd0415544 100644
--- a/source4/torture/rpc/handles.c
+++ b/source4/torture/rpc/handles.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
 #include "librpc/gen_ndr/ndr_drsuapi_c.h"
diff --git a/source4/torture/rpc/initshutdown.c b/source4/torture/rpc/initshutdown.c
index 149fae6c26..22ba3f2812 100644
--- a/source4/torture/rpc/initshutdown.c
+++ b/source4/torture/rpc/initshutdown.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_initshutdown_c.h"
 #include "torture/rpc/rpc.h"
 
diff --git a/source4/torture/rpc/join.c b/source4/torture/rpc/join.c
index b0c122c1b6..1d08c60915 100644
--- a/source4/torture/rpc/join.c
+++ b/source4/torture/rpc/join.c
@@ -1,8 +1,6 @@
 #include "includes.h"
-#include "libnet/libnet.h"
 #include "libcli/libcli.h"
 
-#include "auth/credentials/credentials.h"
 #include "torture/rpc/rpc.h"
 
 #include "libcli/resolve/resolve.h"
diff --git a/source4/torture/rpc/lsa_lookup.c b/source4/torture/rpc/lsa_lookup.c
index b1a348ce8a..5f80117a68 100644
--- a/source4/torture/rpc/lsa_lookup.c
+++ b/source4/torture/rpc/lsa_lookup.c
@@ -19,9 +19,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
-#include "lib/events/events.h"
-#include "libnet/libnet_join.h"
 #include "torture/rpc/rpc.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
 #include "libcli/security/security.h"
diff --git a/source4/torture/rpc/mgmt.c b/source4/torture/rpc/mgmt.c
index 7f618ab776..95c13c0ca6 100644
--- a/source4/torture/rpc/mgmt.c
+++ b/source4/torture/rpc/mgmt.c
@@ -19,13 +19,11 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_mgmt_c.h"
 #include "auth/gensec/gensec.h"
 #include "librpc/ndr/ndr_table.h"
 #include "torture/rpc/rpc.h"
 #include "param/param.h"
-#include "librpc/rpc/dcerpc_proto.h"
 
 
 /*
diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index f57c47b115..1ef58fd3f7 100644
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -23,18 +23,12 @@
 */
 
 #include "includes.h"
-#include "version.h"
-#include "torture/torture.h"
 #include "lib/events/events.h"
-#include "auth/auth.h"
-#include "auth/gensec/gensec.h"
 #include "lib/cmdline/popt_common.h"
 #include "torture/rpc/rpc.h"
-#include "torture/rpc/netlogon.h"
 #include "../lib/crypto/crypto.h"
 #include "libcli/auth/libcli_auth.h"
 #include "librpc/gen_ndr/ndr_netlogon_c.h"
-#include "librpc/gen_ndr/ndr_netlogon.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
 #include "param/param.h"
 #include "libcli/security/security.h"
diff --git a/source4/torture/rpc/ntsvcs.c b/source4/torture/rpc/ntsvcs.c
index 04494b3223..d985244f98 100644
--- a/source4/torture/rpc/ntsvcs.c
+++ b/source4/torture/rpc/ntsvcs.c
@@ -20,11 +20,8 @@
 */
 
 #include "includes.h"
-#include "lib/torture/torture.h"
 #include "torture/rpc/rpc.h"
 #include "librpc/gen_ndr/ndr_ntsvcs_c.h"
-#include "torture/util.h"
-#include "param/param.h"
 
 static bool test_PNP_GetVersion(struct torture_context *tctx,
 				struct dcerpc_pipe *p)
diff --git a/source4/torture/rpc/object_uuid.c b/source4/torture/rpc/object_uuid.c
index 53d03a3ce9..43c8713452 100644
--- a/source4/torture/rpc/object_uuid.c
+++ b/source4/torture/rpc/object_uuid.c
@@ -20,11 +20,8 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_dssetup.h"
-#include "librpc/gen_ndr/ndr_dssetup_c.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
-#include "librpc/gen_ndr/ndr_lsa_c.h"
 #include "torture/rpc/rpc.h"
 
 /*
diff --git a/source4/torture/rpc/oxidresolve.c b/source4/torture/rpc/oxidresolve.c
index 8e334f4539..0008d9d9db 100644
--- a/source4/torture/rpc/oxidresolve.c
+++ b/source4/torture/rpc/oxidresolve.c
@@ -19,7 +19,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_oxidresolver_c.h"
 #include "librpc/gen_ndr/ndr_remact_c.h"
 #include "librpc/gen_ndr/epmapper.h"
diff --git a/source4/torture/rpc/remact.c b/source4/torture/rpc/remact.c
index 0c5ac09977..12132faa26 100644
--- a/source4/torture/rpc/remact.c
+++ b/source4/torture/rpc/remact.c
@@ -19,7 +19,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_remact_c.h"
 #include "librpc/gen_ndr/ndr_epmapper_c.h"
 #include "torture/rpc/rpc.h"
diff --git a/source4/torture/rpc/remote_pac.c b/source4/torture/rpc/remote_pac.c
index cae98d9b6f..f51bdf518b 100644
--- a/source4/torture/rpc/remote_pac.c
+++ b/source4/torture/rpc/remote_pac.c
@@ -20,19 +20,13 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
-#include "lib/events/events.h"
 #include "auth/auth.h"
 #include "auth/gensec/gensec.h"
 #include "lib/cmdline/popt_common.h"
 #include "torture/rpc/rpc.h"
-#include "torture/rpc/netlogon.h"
 #include "libcli/auth/libcli_auth.h"
 #include "librpc/gen_ndr/ndr_netlogon_c.h"
-#include "librpc/gen_ndr/ndr_krb5pac.h"
 #include "param/param.h"
-#include "lib/messaging/irpc.h"
-#include "cluster/cluster.h"
 
 #define TEST_MACHINE_NAME "torturepactest"
 
diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c
index 6e9d37b923..c8968503f5 100644
--- a/source4/torture/rpc/rpc.c
+++ b/source4/torture/rpc/rpc.c
@@ -19,9 +19,7 @@
 */
 
 #include "includes.h"
-#include "auth/credentials/credentials.h"
 #include "lib/cmdline/popt_common.h"
-#include "librpc/rpc/dcerpc.h"
 #include "torture/rpc/rpc.h"
 #include "torture/smbtorture.h"
 #include "librpc/ndr/ndr_table.h"
diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
index 4a529d38f6..d439e1ff1d 100644
--- a/source4/torture/rpc/samba3rpc.c
+++ b/source4/torture/rpc/samba3rpc.c
@@ -23,32 +23,21 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.h"
 #include "libcli/rap/rap.h"
-#include "torture/torture.h"
 #include "torture/util.h"
 #include "torture/rap/proto.h"
-#include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
-#include "librpc/gen_ndr/ndr_samr.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
-#include "librpc/gen_ndr/ndr_netlogon.h"
 #include "librpc/gen_ndr/ndr_netlogon_c.h"
-#include "librpc/gen_ndr/ndr_srvsvc.h"
 #include "librpc/gen_ndr/ndr_srvsvc_c.h"
-#include "librpc/gen_ndr/ndr_spoolss.h"
 #include "librpc/gen_ndr/ndr_spoolss_c.h"
-#include "librpc/gen_ndr/ndr_winreg.h"
 #include "librpc/gen_ndr/ndr_winreg_c.h"
-#include "librpc/gen_ndr/ndr_wkssvc.h"
 #include "librpc/gen_ndr/ndr_wkssvc_c.h"
 #include "lib/cmdline/popt_common.h"
-#include "librpc/rpc/dcerpc.h"
 #include "torture/rpc/rpc.h"
 #include "libcli/libcli.h"
-#include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
 #include "libcli/auth/libcli_auth.h"
 #include "../lib/crypto/crypto.h"
-#include "auth/ntlmssp/ntlmssp.h"
 #include "libcli/security/security.h"
 #include "param/param.h"
 #include "lib/registry/registry.h"
diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c
index 8e6c88425c..bdded6ce8c 100644
--- a/source4/torture/rpc/samlogon.c
+++ b/source4/torture/rpc/samlogon.c
@@ -25,11 +25,9 @@
 #include "librpc/gen_ndr/ndr_netlogon.h"
 #include "librpc/gen_ndr/ndr_netlogon_c.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
-#include "auth/auth.h"
 #include "../lib/crypto/crypto.h"
 #include "lib/cmdline/popt_common.h"
 #include "torture/rpc/rpc.h"
-#include "../libcli/auth/schannel.h"
 #include "auth/gensec/gensec.h"
 #include "libcli/auth/libcli_auth.h"
 #include "param/param.h"
diff --git a/source4/torture/rpc/samr_accessmask.c b/source4/torture/rpc/samr_accessmask.c
index 1af9fac672..ebfc069521 100644
--- a/source4/torture/rpc/samr_accessmask.c
+++ b/source4/torture/rpc/samr_accessmask.c
@@ -20,12 +20,10 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 #include "torture/rpc/rpc.h"
 #include "param/param.h"
 #include "libcli/security/security.h"
-#include "librpc/gen_ndr/ndr_security.h"
 
 
 /* test user created to test the ACLs associated to SAMR objects */
diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index 3845b6cb44..52df4eb6b9 100644
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -22,13 +22,10 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
-#include "auth/auth.h"
 #include "../lib/util/dlinklist.h"
 #include "../lib/crypto/crypto.h"
 #include "system/time.h"
 #include "torture/rpc/rpc.h"
-#include "../libcli/auth/schannel.h"
 #include "auth/gensec/gensec.h"
 #include "libcli/auth/libcli_auth.h"
 #include "libcli/samsync/samsync.h"
diff --git a/source4/torture/rpc/scanner.c b/source4/torture/rpc/scanner.c
index 8e5016be6c..9acc789ee9 100644
--- a/source4/torture/rpc/scanner.c
+++ b/source4/torture/rpc/scanner.c
@@ -20,12 +20,10 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_mgmt_c.h"
 #include "librpc/ndr/ndr_table.h"
 #include "torture/rpc/rpc.h"
 #include "param/param.h"
-#include "librpc/rpc/dcerpc_proto.h"
 
 /*
   work out how many calls there are for an interface
diff --git a/source4/torture/rpc/session_key.c b/source4/torture/rpc/session_key.c
index 1d3199944d..efedf7e7ef 100644
--- a/source4/torture/rpc/session_key.c
+++ b/source4/torture/rpc/session_key.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
 
 #include "libcli/auth/libcli_auth.h"
diff --git a/source4/torture/rpc/spoolss_notify.c b/source4/torture/rpc/spoolss_notify.c
index 60f1175f27..2dbed89019 100644
--- a/source4/torture/rpc/spoolss_notify.c
+++ b/source4/torture/rpc/spoolss_notify.c
@@ -21,17 +21,13 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "torture/torture.h"
 #include "torture/rpc/rpc.h"
 #include "librpc/gen_ndr/ndr_spoolss_c.h"
 #include "rpc_server/dcerpc_server.h"
 #include "rpc_server/service_rpc.h"
-#include "lib/events/events.h"
 #include "smbd/process_model.h"
 #include "smb_server/smb_server.h"
-#include "librpc/rpc/dcerpc_proto.h"
 #include "lib/socket/netif.h"
-#include "../lib/util/dlinklist.h"
 #include "ntvfs/ntvfs.h"
 #include "param/param.h"
 
diff --git a/source4/torture/rpc/spoolss_win.c b/source4/torture/rpc/spoolss_win.c
index 719d8e26d2..2e8113991e 100644
--- a/source4/torture/rpc/spoolss_win.c
+++ b/source4/torture/rpc/spoolss_win.c
@@ -19,12 +19,9 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "torture/rpc/rpc.h"
 #include "librpc/gen_ndr/ndr_spoolss_c.h"
-#include "rpc_server/dcerpc_server.h"
 #include "ntvfs/ntvfs.h"
-#include "param/param.h"
 
 struct test_spoolss_win_context {
 	/* EnumPrinters */
diff --git a/source4/torture/rpc/srvsvc.c b/source4/torture/rpc/srvsvc.c
index 82a8a67854..1e5b44c43f 100644
--- a/source4/torture/rpc/srvsvc.c
+++ b/source4/torture/rpc/srvsvc.c
@@ -19,8 +19,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
-#include "librpc/gen_ndr/ndr_srvsvc.h"
 #include "librpc/gen_ndr/ndr_srvsvc_c.h"
 #include "torture/rpc/rpc.h"
 
diff --git a/source4/torture/rpc/svcctl.c b/source4/torture/rpc/svcctl.c
index ad27060659..ce6a0853ab 100644
--- a/source4/torture/rpc/svcctl.c
+++ b/source4/torture/rpc/svcctl.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_svcctl_c.h"
 #include "librpc/gen_ndr/ndr_svcctl.h"
 #include "torture/rpc/rpc.h"
diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c
index c93358015c..454912287e 100644
--- a/source4/torture/rpc/testjoin.c
+++ b/source4/torture/rpc/testjoin.c
@@ -25,12 +25,10 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "system/time.h"
 #include "../lib/crypto/crypto.h"
 #include "libnet/libnet.h"
 #include "lib/cmdline/popt_common.h"
-#include "lib/ldb/include/ldb.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 
 #include "libcli/auth/libcli_auth.h"
diff --git a/source4/torture/rpc/unixinfo.c b/source4/torture/rpc/unixinfo.c
index cbe8cf0ff1..6f18f24a6d 100644
--- a/source4/torture/rpc/unixinfo.c
+++ b/source4/torture/rpc/unixinfo.c
@@ -19,7 +19,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "torture/rpc/rpc.h"
 #include "librpc/gen_ndr/ndr_unixinfo_c.h"
 #include "libcli/security/security.h"
diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index b85dac7bf1..93be45d25f 100644
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -21,7 +21,6 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_winreg_c.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "libcli/security/security.h"
diff --git a/source4/torture/smb2/compound.c b/source4/torture/smb2/compound.c
index e9b5ee9408..4e58949765 100644
--- a/source4/torture/smb2/compound.c
+++ b/source4/torture/smb2/compound.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/security.h"
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
 #include "torture/torture.h"
diff --git a/source4/torture/smb2/connect.c b/source4/torture/smb2/connect.c
index fd32b52111..1b69c18a55 100644
--- a/source4/torture/smb2/connect.c
+++ b/source4/torture/smb2/connect.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/security.h"
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
 #include "torture/torture.h"
diff --git a/source4/torture/smb2/durable_open.c b/source4/torture/smb2/durable_open.c
index 1b86f2c46e..1b1494657b 100644
--- a/source4/torture/smb2/durable_open.c
+++ b/source4/torture/smb2/durable_open.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/security.h"
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
 #include "torture/torture.h"
diff --git a/source4/torture/smb2/lease.c b/source4/torture/smb2/lease.c
index 87526e3f78..63285d40e0 100644
--- a/source4/torture/smb2/lease.c
+++ b/source4/torture/smb2/lease.c
@@ -20,8 +20,6 @@
 */
 
 #include "includes.h"
-#include "lib/events/events.h"
-#include "librpc/gen_ndr/security.h"
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
 #include "torture/torture.h"
diff --git a/source4/torture/smb2/lock.c b/source4/torture/smb2/lock.c
index b97233ef66..033e12f1fc 100644
--- a/source4/torture/smb2/lock.c
+++ b/source4/torture/smb2/lock.c
@@ -26,7 +26,6 @@
 #include "torture/torture.h"
 #include "torture/smb2/proto.h"
 
-#include "librpc/gen_ndr/ndr_security.h"
 
 #define TARGET_IS_WINDOWS(_tctx) (torture_setting_bool(_tctx, "win7", false) || torture_setting_bool(torture, "windows", false))
 #define TARGET_IS_WIN7(_tctx) (torture_setting_bool(_tctx, "win7", false))
diff --git a/source4/torture/smb2/notify.c b/source4/torture/smb2/notify.c
index f8def193b2..5cf580a95e 100644
--- a/source4/torture/smb2/notify.c
+++ b/source4/torture/smb2/notify.c
@@ -26,7 +26,6 @@
 #include "torture/torture.h"
 #include "torture/smb2/proto.h"
 
-#include "libcli/raw/libcliraw.h"
 #include "lib/events/events.h"
 
 #define CHECK_STATUS(status, correct) do { \
diff --git a/source4/torture/smb2/read.c b/source4/torture/smb2/read.c
index 548bd1ce61..cbd59d8b66 100644
--- a/source4/torture/smb2/read.c
+++ b/source4/torture/smb2/read.c
@@ -26,7 +26,6 @@
 #include "torture/torture.h"
 #include "torture/smb2/proto.h"
 
-#include "librpc/gen_ndr/ndr_security.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \
diff --git a/source4/torture/smb2/scan.c b/source4/torture/smb2/scan.c
index a5e682c111..a173c6debb 100644
--- a/source4/torture/smb2/scan.c
+++ b/source4/torture/smb2/scan.c
@@ -23,7 +23,6 @@
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
 #include "lib/cmdline/popt_common.h"
-#include "lib/events/events.h"
 #include "torture/torture.h"
 #include "param/param.h"
 #include "libcli/resolve/resolve.h"
diff --git a/source4/torture/smb2/smb2.c b/source4/torture/smb2/smb2.c
index f1d8fbb814..f61a6857b5 100644
--- a/source4/torture/smb2/smb2.c
+++ b/source4/torture/smb2/smb2.c
@@ -19,7 +19,6 @@
 
 #include "includes.h"
 #include "libcli/smb2/smb2.h"
-#include "libcli/smb2/smb2_calls.h"
 
 #include "torture/smbtorture.h"
 #include "torture/smb2/proto.h"
diff --git a/source4/torture/smb2/streams.c b/source4/torture/smb2/streams.c
index 4029ec88b5..8065cbf2e1 100644
--- a/source4/torture/smb2/streams.c
+++ b/source4/torture/smb2/streams.c
@@ -22,14 +22,9 @@
 #include "includes.h"
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
-#include "libcli/smb_composite/smb_composite.h"
-#include "libcli/raw/libcliraw.h"
-#include "libcli/raw/raw_proto.h"
-#include "libcli/libcli.h"
 
 #include "torture/torture.h"
 #include "torture/smb2/proto.h"
-#include "torture/util.h"
 
 #include "system/filesys.h"
 #include "system/locale.h"
diff --git a/source4/torture/smb2/util.c b/source4/torture/smb2/util.c
index b17dc246e3..e7ac4db980 100644
--- a/source4/torture/smb2/util.c
+++ b/source4/torture/smb2/util.c
@@ -22,16 +22,13 @@
 #include "includes.h"
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
-#include "libcli/smb_composite/smb_composite.h"
 #include "lib/cmdline/popt_common.h"
-#include "lib/events/events.h"
 #include "system/time.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "param/param.h"
 #include "libcli/resolve/resolve.h"
 
 #include "torture/torture.h"
-#include "torture/smb2/proto.h"
 
 
 /*
diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c
index 08c5748a40..2899c87698 100644
--- a/source4/torture/smbtorture.c
+++ b/source4/torture/smbtorture.c
@@ -26,17 +26,13 @@
 #include "system/readline.h"
 #include "lib/smbreadline/smbreadline.h"
 #include "libcli/libcli.h"
-#include "lib/ldb/include/ldb.h"
 #include "lib/events/events.h"
-#include "dynconfig/dynconfig.h"
 
 #include "torture/smbtorture.h"
-#include "../lib/util/dlinklist.h"
 #include "librpc/rpc/dcerpc.h"
 #include "auth/gensec/gensec.h"
 #include "param/param.h"
 
-#include "auth/credentials/credentials.h"
 
 static bool run_matching(struct torture_context *torture,
 						 const char *prefix, 
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index 774681dac3..49a6a8c33d 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -20,8 +20,6 @@
 
 #include "includes.h"
 #include "system/time.h"
-#include "torture/torture.h"
-#include "../lib/util/dlinklist.h"
 #include "param/param.h"
 #include "lib/cmdline/popt_common.h"
 #include "torture/smbtorture.h"
diff --git a/source4/torture/unix/unix_info2.c b/source4/torture/unix/unix_info2.c
index 30fe912234..2068d5d97c 100644
--- a/source4/torture/unix/unix_info2.c
+++ b/source4/torture/unix/unix_info2.c
@@ -19,13 +19,8 @@
 
 #include "includes.h"
 #include "libcli/libcli.h"
-#include "libcli/raw/interfaces.h"
-#include "libcli/raw/raw_proto.h"
-#include "torture/torture.h"
 #include "torture/util.h"
-#include "torture/basic/proto.h"
 #include "lib/cmdline/popt_common.h"
-#include "auth/credentials/credentials.h"
 #include "libcli/resolve/resolve.h"
 #include "param/param.h"
 
diff --git a/source4/torture/unix/whoami.c b/source4/torture/unix/whoami.c
index b72b9fcb09..f07c619b30 100644
--- a/source4/torture/unix/whoami.c
+++ b/source4/torture/unix/whoami.c
@@ -19,10 +19,8 @@
 
 #include "includes.h"
 #include "libcli/libcli.h"
-#include "libcli/raw/interfaces.h"
 #include "libcli/raw/raw_proto.h"
 #include "torture/torture.h"
-#include "torture/basic/proto.h"
 #include "lib/cmdline/popt_common.h"
 #include "auth/credentials/credentials.h"
 #include "param/param.h"
diff --git a/source4/torture/util_smb.c b/source4/torture/util_smb.c
index b6f2bee635..967faaead2 100644
--- a/source4/torture/util_smb.c
+++ b/source4/torture/util_smb.c
@@ -30,7 +30,6 @@
 #include "system/time.h"
 #include "torture/torture.h"
 #include "../lib/util/dlinklist.h"
-#include "auth/credentials/credentials.h"
 #include "libcli/resolve/resolve.h"
 #include "param/param.h"
 #include "libcli/security/security.h"
diff --git a/source4/torture/winbind/struct_based.c b/source4/torture/winbind/struct_based.c
index 676b85e467..de1507a67c 100644
--- a/source4/torture/winbind/struct_based.c
+++ b/source4/torture/winbind/struct_based.c
@@ -20,7 +20,6 @@
 
 #include "includes.h"
 #include "torture/torture.h"
-#include "torture/winbind/proto.h"
 #include "nsswitch/winbind_client.h"
 #include "libcli/security/security.h"
 #include "librpc/gen_ndr/netlogon.h"