r12608: Remove some unused #include lines.

(This used to be commit 70e7449318aa0e9d2639c76730a7d1683b2f4981)

61 files changed, 0 insertions, 82 deletions

diff --git a/source4/torture/auth/pac.c b/source4/torture/auth/pac.c
index 7cf2c390c4..0ea31a24d1 100644
--- a/source4/torture/auth/pac.c
+++ b/source4/torture/auth/pac.c
@@ -26,7 +26,6 @@
 #include "auth/auth.h"
 #include "auth/kerberos/kerberos.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
-#include "librpc/gen_ndr/ndr_samr.h"
 
 static BOOL torture_pac_self_check(void) 
 {
diff --git a/source4/torture/basic/attr.c b/source4/torture/basic/attr.c
index daa0f98d60..c37cb2596c 100644
--- a/source4/torture/basic/attr.c
+++ b/source4/torture/basic/attr.c
@@ -21,7 +21,6 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_security.h"
 
 extern int torture_failures;
 
diff --git a/source4/torture/basic/charset.c b/source4/torture/basic/charset.c
index a216ebc05a..2b49690d51 100644
--- a/source4/torture/basic/charset.c
+++ b/source4/torture/basic/charset.c
@@ -21,7 +21,6 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_security.h"
 #include "libcli/raw/libcliraw.h"
 
 #define BASEDIR "\\chartest\\"
diff --git a/source4/torture/basic/delete.c b/source4/torture/basic/delete.c
index d1ee98941c..81c3f3f1d1 100644
--- a/source4/torture/basic/delete.c
+++ b/source4/torture/basic/delete.c
@@ -22,7 +22,6 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "librpc/gen_ndr/ndr_security.h"
 #include "libcli/raw/libcliraw.h"
 
 static BOOL check_delete_on_close(struct smbcli_state *cli, int fnum,
diff --git a/source4/torture/basic/denytest.c b/source4/torture/basic/denytest.c
index 9f559b7c76..1963f866e3 100644
--- a/source4/torture/basic/denytest.c
+++ b/source4/torture/basic/denytest.c
@@ -21,7 +21,6 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
-#include "librpc/gen_ndr/ndr_security.h"
 
 extern BOOL torture_showall;
 extern int torture_failures;
diff --git a/source4/torture/basic/dir.c b/source4/torture/basic/dir.c
index 59cd21f06d..f98c0732e7 100644
--- a/source4/torture/basic/dir.c
+++ b/source4/torture/basic/dir.c
@@ -22,7 +22,6 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "librpc/gen_ndr/ndr_security.h"
 
 static void list_fn(struct clilist_file_info *finfo, const char *name, void *state)
 {
diff --git a/source4/torture/basic/disconnect.c b/source4/torture/basic/disconnect.c
index 423135008e..b585b40bc4 100644
--- a/source4/torture/basic/disconnect.c
+++ b/source4/torture/basic/disconnect.c
@@ -23,7 +23,6 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
-#include "librpc/gen_ndr/ndr_security.h"
 
 #define BASEDIR "\\test_disconnect"
 
diff --git a/source4/torture/basic/rename.c b/source4/torture/basic/rename.c
index 3f7be04a8e..219dd72b6d 100644
--- a/source4/torture/basic/rename.c
+++ b/source4/torture/basic/rename.c
@@ -21,7 +21,6 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_security.h"
 
 /*
   Test rename on files open with share delete and no share delete.
diff --git a/source4/torture/basic/scanner.c b/source4/torture/basic/scanner.c
index 06dff7e72c..6d78464ef1 100644
--- a/source4/torture/basic/scanner.c
+++ b/source4/torture/basic/scanner.c
@@ -21,7 +21,6 @@
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
 #include "system/filesys.h"
-#include "librpc/gen_ndr/ndr_security.h"
 #include "pstring.h"
 
 #define VERBOSE 0
diff --git a/source4/torture/basic/secleak.c b/source4/torture/basic/secleak.c
index f77b399874..5eae519211 100644
--- a/source4/torture/basic/secleak.c
+++ b/source4/torture/basic/secleak.c
@@ -23,7 +23,6 @@
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
-#include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
 
 static BOOL try_failed_login(struct smbcli_state *cli)
diff --git a/source4/torture/basic/unlink.c b/source4/torture/basic/unlink.c
index 40a486f93f..f046d68b6e 100644
--- a/source4/torture/basic/unlink.c
+++ b/source4/torture/basic/unlink.c
@@ -23,7 +23,6 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
-#include "librpc/gen_ndr/ndr_security.h"
 
 #define BASEDIR "\\unlinktest"
 
diff --git a/source4/torture/basic/utable.c b/source4/torture/basic/utable.c
index cf3b07886a..ebe9cd9156 100644
--- a/source4/torture/basic/utable.c
+++ b/source4/torture/basic/utable.c
@@ -21,7 +21,6 @@
 #include "includes.h"
 #include "system/iconv.h"
 #include "system/filesys.h"
-#include "librpc/gen_ndr/ndr_security.h"
 #include "pstring.h"
 
 BOOL torture_utable(void)
diff --git a/source4/torture/ldap/basic.c b/source4/torture/ldap/basic.c
index 7dfc81b692..64c4dbfdf0 100644
--- a/source4/torture/ldap/basic.c
+++ b/source4/torture/ldap/basic.c
@@ -22,8 +22,6 @@
 */
 
 #include "includes.h"
-#include "lib/ldb/include/ldb.h"
-#include "libcli/ldap/ldap.h"
 #include "libcli/ldap/ldap_client.h"
 #include "lib/cmdline/popt_common.h"
 
diff --git a/source4/torture/ldap/cldap.c b/source4/torture/ldap/cldap.c
index d6c56dbd34..e6952174f6 100644
--- a/source4/torture/ldap/cldap.c
+++ b/source4/torture/ldap/cldap.c
@@ -23,8 +23,6 @@
 
 #include "includes.h"
 #include "libcli/cldap/cldap.h"
-#include "libcli/ldap/ldap.h"
-#include "lib/events/events.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \
diff --git a/source4/torture/ldap/common.c b/source4/torture/ldap/common.c
index 55356b2447..58944b2768 100644
--- a/source4/torture/ldap/common.c
+++ b/source4/torture/ldap/common.c
@@ -22,7 +22,6 @@
 */
 
 #include "includes.h"
-#include "asn_1.h"
 #include "libcli/ldap/ldap.h"
 
 NTSTATUS torture_ldap_bind(struct ldap_connection *conn, const char *userdn, const char *password)
diff --git a/source4/torture/libnet/domain.c b/source4/torture/libnet/domain.c
index de1dfad6ff..98fb610110 100644
--- a/source4/torture/libnet/domain.c
+++ b/source4/torture/libnet/domain.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_samr.h"
 #include "libnet/composite.h"
 #include "libnet/libnet.h"
 
diff --git a/source4/torture/libnet/libnet_lookup.c b/source4/torture/libnet/libnet_lookup.c
index b0cdc8c93e..b6f23fd58c 100644
--- a/source4/torture/libnet/libnet_lookup.c
+++ b/source4/torture/libnet/libnet_lookup.c
@@ -22,8 +22,6 @@
 #include "includes.h"
 #include "lib/cmdline/popt_common.h"
 #include "libnet/libnet.h"
-#include "libnet/composite.h"
-#include "librpc/gen_ndr/ndr_nbt.h"
 
 
 BOOL torture_lookup(void)
diff --git a/source4/torture/libnet/libnet_rpc.c b/source4/torture/libnet/libnet_rpc.c
index 071fe99004..9c43fef24a 100644
--- a/source4/torture/libnet/libnet_rpc.c
+++ b/source4/torture/libnet/libnet_rpc.c
@@ -22,7 +22,6 @@
 #include "includes.h"
 #include "lib/cmdline/popt_common.h"
 #include "libnet/libnet.h"
-#include "libnet/composite.h"
 
 
 BOOL test_lsa_connect(struct libnet_context *ctx)
diff --git a/source4/torture/libnet/libnet_user.c b/source4/torture/libnet/libnet_user.c
index 60c8bce935..207645c6d5 100644
--- a/source4/torture/libnet/libnet_user.c
+++ b/source4/torture/libnet/libnet_user.c
@@ -20,10 +20,8 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_samr.h"
 #include "lib/cmdline/popt_common.h"
 #include "libnet/libnet.h"
-#include "libnet/composite.h"
 
 
 #define TEST_USERNAME  "libnetusertest"
diff --git a/source4/torture/libnet/userinfo.c b/source4/torture/libnet/userinfo.c
index 1334763c12..3791cfbda7 100644
--- a/source4/torture/libnet/userinfo.c
+++ b/source4/torture/libnet/userinfo.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_samr.h"
 #include "libnet/libnet.h"
 #include "libnet/composite.h"
 #include "libnet/userinfo.h"
diff --git a/source4/torture/libnet/userman.c b/source4/torture/libnet/userman.c
index 6a450e8b78..1b5960c301 100644
--- a/source4/torture/libnet/userman.c
+++ b/source4/torture/libnet/userman.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_samr.h"
 #include "libnet/composite.h"
 #include "libnet/userman.h"
 #include "libnet/libnet.h"
diff --git a/source4/torture/local/messaging.c b/source4/torture/local/messaging.c
index c9aef1b01d..faba8304d7 100644
--- a/source4/torture/local/messaging.c
+++ b/source4/torture/local/messaging.c
@@ -21,7 +21,6 @@
 */
 
 #include "includes.h"
-#include "system/filesys.h"
 #include "lib/events/events.h"
 #include "lib/messaging/irpc.h"
 
diff --git a/source4/torture/local/registry.c b/source4/torture/local/registry.c
index 21b42d6129..b1582a4e9e 100644
--- a/source4/torture/local/registry.c
+++ b/source4/torture/local/registry.c
@@ -21,8 +21,6 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/security.h"
-#include "librpc/gen_ndr/ndr_epmapper.h"
 #include "lib/registry/registry.h"
 
 static BOOL test_hive(TALLOC_CTX *mem_ctx, const char *backend, const char *location)
diff --git a/source4/torture/local/resolve.c b/source4/torture/local/resolve.c
index 9087f42a72..f86b4b726b 100644
--- a/source4/torture/local/resolve.c
+++ b/source4/torture/local/resolve.c
@@ -22,7 +22,6 @@
 
 #include "includes.h"
 #include "lib/events/events.h"
-#include "librpc/gen_ndr/nbt.h"
 
 static BOOL test_async_resolve(TALLOC_CTX *mem_ctx)
 {
diff --git a/source4/torture/local/sddl.c b/source4/torture/local/sddl.c
index 01f4d839d9..30ce424741 100644
--- a/source4/torture/local/sddl.c
+++ b/source4/torture/local/sddl.c
@@ -21,7 +21,6 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_security.h"
 
 
 /*
diff --git a/source4/torture/nbench/nbio.c b/source4/torture/nbench/nbio.c
index 540f709211..f12fbbcb6f 100644
--- a/source4/torture/nbench/nbio.c
+++ b/source4/torture/nbench/nbio.c
@@ -24,7 +24,6 @@
 #include "system/time.h"
 #include "system/filesys.h"
 #include "dlinklist.h"
-#include "librpc/gen_ndr/ndr_security.h"
 #include "libcli/raw/libcliraw.h"
 
 #define MAX_FILES 100
diff --git a/source4/torture/nbt/dgram.c b/source4/torture/nbt/dgram.c
index 82cb62dd74..64d4825edc 100644
--- a/source4/torture/nbt/dgram.c
+++ b/source4/torture/nbt/dgram.c
@@ -21,9 +21,7 @@
 */
 
 #include "includes.h"
-#include "libcli/nbt/libnbt.h"
 #include "libcli/dgram/libdgram.h"
-#include "librpc/gen_ndr/ndr_nbt.h"
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "lib/socket/socket.h"
 #include "lib/events/events.h"
diff --git a/source4/torture/nbt/query.c b/source4/torture/nbt/query.c
index f0522d52ae..fbb4224b28 100644
--- a/source4/torture/nbt/query.c
+++ b/source4/torture/nbt/query.c
@@ -22,8 +22,6 @@
 
 #include "includes.h"
 #include "lib/events/events.h"
-#include "libcli/nbt/libnbt.h"
-#include "librpc/gen_ndr/ndr_nbt.h"
 
 struct result_struct {
 	int num_pass;
diff --git a/source4/torture/nbt/register.c b/source4/torture/nbt/register.c
index 4b5931d341..8cbceb8e30 100644
--- a/source4/torture/nbt/register.c
+++ b/source4/torture/nbt/register.c
@@ -21,8 +21,6 @@
 */
 
 #include "includes.h"
-#include "libcli/nbt/libnbt.h"
-#include "librpc/gen_ndr/ndr_nbt.h"
 #include "lib/socket/socket.h"
 
 #define CHECK_VALUE(v, correct) do { \
diff --git a/source4/torture/nbt/wins.c b/source4/torture/nbt/wins.c
index 8eb8d48f9f..76f26ac1c0 100644
--- a/source4/torture/nbt/wins.c
+++ b/source4/torture/nbt/wins.c
@@ -21,8 +21,6 @@
 */
 
 #include "includes.h"
-#include "libcli/nbt/libnbt.h"
-#include "librpc/gen_ndr/ndr_nbt.h"
 #include "lib/socket/socket.h"
 
 #define CHECK_VALUE(v, correct) do { \
diff --git a/source4/torture/nbt/winsbench.c b/source4/torture/nbt/winsbench.c
index 1bfc6f196c..65f494184f 100644
--- a/source4/torture/nbt/winsbench.c
+++ b/source4/torture/nbt/winsbench.c
@@ -22,8 +22,6 @@
 
 #include "includes.h"
 #include "lib/events/events.h"
-#include "libcli/nbt/libnbt.h"
-#include "librpc/gen_ndr/ndr_nbt.h"
 #include "lib/socket/socket.h"
 
 struct wins_state {
diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c
index 2f024878d6..f7f9665a6d 100644
--- a/source4/torture/nbt/winsreplication.c
+++ b/source4/torture/nbt/winsreplication.c
@@ -22,11 +22,9 @@
 */
 
 #include "includes.h"
-#include "libcli/nbt/libnbt.h"
 #include "libcli/wrepl/winsrepl.h"
 #include "lib/events/events.h"
 #include "lib/socket/socket.h"
-#include "system/time.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \
diff --git a/source4/torture/raw/acls.c b/source4/torture/raw/acls.c
index 2a43503968..fe939f6b63 100644
--- a/source4/torture/raw/acls.c
+++ b/source4/torture/raw/acls.c
@@ -21,9 +21,7 @@
 */
 
 #include "includes.h"
-#include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
-#include "librpc/gen_ndr/ndr_security.h"
 
 #define BASEDIR "\\testsd"
 
diff --git a/source4/torture/raw/chkpath.c b/source4/torture/raw/chkpath.c
index 44dbe97e00..a4cf1ae071 100644
--- a/source4/torture/raw/chkpath.c
+++ b/source4/torture/raw/chkpath.c
@@ -19,7 +19,6 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_security.h"
 #include "libcli/raw/libcliraw.h"
 
 #define BASEDIR "\\rawchkpath"
diff --git a/source4/torture/raw/context.c b/source4/torture/raw/context.c
index 0fe2c894af..7fb697ea36 100644
--- a/source4/torture/raw/context.c
+++ b/source4/torture/raw/context.c
@@ -20,7 +20,6 @@
 
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
-#include "librpc/gen_ndr/ndr_security.h"
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
 #include "lib/cmdline/popt_common.h"
diff --git a/source4/torture/raw/eas.c b/source4/torture/raw/eas.c
index 14f00599d9..5616d7554e 100644
--- a/source4/torture/raw/eas.c
+++ b/source4/torture/raw/eas.c
@@ -23,7 +23,6 @@
 
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
-#include "librpc/gen_ndr/ndr_security.h"
 
 #define BASEDIR "\\testeas"
 
diff --git a/source4/torture/raw/mux.c b/source4/torture/raw/mux.c
index 379e455b2b..13a54c326f 100644
--- a/source4/torture/raw/mux.c
+++ b/source4/torture/raw/mux.c
@@ -21,7 +21,6 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
-#include "librpc/gen_ndr/ndr_security.h"
 
 #define BASEDIR "\\test_mux"
 
diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c
index 6f115adc9e..77c7cb30d2 100644
--- a/source4/torture/raw/notify.c
+++ b/source4/torture/raw/notify.c
@@ -19,7 +19,6 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_security.h"
 #include "libcli/raw/libcliraw.h"
 
 #define BASEDIR "\\test_notify"
diff --git a/source4/torture/raw/qfileinfo.c b/source4/torture/raw/qfileinfo.c
index 5f628fd9c8..eb4066f685 100644
--- a/source4/torture/raw/qfileinfo.c
+++ b/source4/torture/raw/qfileinfo.c
@@ -20,7 +20,6 @@
 
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
-#include "librpc/gen_ndr/ndr_security.h"
 
 static struct {
 	const char *name;
diff --git a/source4/torture/raw/rename.c b/source4/torture/raw/rename.c
index 921e7f574f..f599e1a6c7 100644
--- a/source4/torture/raw/rename.c
+++ b/source4/torture/raw/rename.c
@@ -19,7 +19,6 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_security.h"
 #include "libcli/raw/libcliraw.h"
 
 #define CHECK_STATUS(status, correct) do { \
diff --git a/source4/torture/raw/streams.c b/source4/torture/raw/streams.c
index 2e80c438b0..7958df00d1 100644
--- a/source4/torture/raw/streams.c
+++ b/source4/torture/raw/streams.c
@@ -22,7 +22,6 @@
 
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
-#include "librpc/gen_ndr/ndr_security.h"
 #include "system/filesys.h"
 
 #define BASEDIR "\\teststreams"
diff --git a/source4/torture/raw/unlink.c b/source4/torture/raw/unlink.c
index 9ff9496cd4..5a501e6a72 100644
--- a/source4/torture/raw/unlink.c
+++ b/source4/torture/raw/unlink.c
@@ -20,7 +20,6 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "librpc/gen_ndr/ndr_security.h"
 #include "libcli/raw/libcliraw.h"
 
 #define CHECK_STATUS(status, correct) do { \
diff --git a/source4/torture/rpc/dcom.c b/source4/torture/rpc/dcom.c
index 92559b95bf..6328d3bd7f 100644
--- a/source4/torture/rpc/dcom.c
+++ b/source4/torture/rpc/dcom.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_dcom.h"
 #include "librpc/gen_ndr/ndr_oxidresolver.h"
 
 BOOL torture_rpc_dcom(void)
diff --git a/source4/torture/rpc/dssync.c b/source4/torture/rpc/dssync.c
index e28ff798a8..4079afba15 100644
--- a/source4/torture/rpc/dssync.c
+++ b/source4/torture/rpc/dssync.c
@@ -23,12 +23,8 @@
 
 #include "includes.h"
 #include "lib/cmdline/popt_common.h"
-#include "libnet/libnet.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"
-#include "librpc/gen_ndr/ndr_samr.h"
-#include "libcli/ldap/ldap.h"
 #include "libcli/cldap/cldap.h"
-#include "ads.h"
 
 struct DsSyncBindInfo {
 	struct dcerpc_pipe *pipe;
diff --git a/source4/torture/rpc/epmapper.c b/source4/torture/rpc/epmapper.c
index 0085751cb7..bb4fbb41bc 100644
--- a/source4/torture/rpc/epmapper.c
+++ b/source4/torture/rpc/epmapper.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "system/network.h"
 #include "librpc/gen_ndr/ndr_epmapper.h"
 
 
diff --git a/source4/torture/rpc/join.c b/source4/torture/rpc/join.c
index 7aed76abf4..8ea94279be 100644
--- a/source4/torture/rpc/join.c
+++ b/source4/torture/rpc/join.c
@@ -1,7 +1,5 @@
 #include "includes.h"
-#include "lib/cmdline/popt_common.h"
 #include "libnet/libnet.h"
-#include "lib/ldb/include/ldb.h"
 
 #define TORTURE_NETBIOS_NAME "smbtorturejoin"
 
diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 1958b9cdfd..7893661e83 100644
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -24,7 +24,6 @@
 
 #include "includes.h"
 #include "lib/events/events.h"
-#include "librpc/gen_ndr/ndr_netlogon.h"
 #include "auth/auth.h"
 #include "lib/cmdline/popt_common.h"
 
diff --git a/source4/torture/rpc/oxidresolve.c b/source4/torture/rpc/oxidresolve.c
index fbdd9ad265..ffc7307482 100644
--- a/source4/torture/rpc/oxidresolve.c
+++ b/source4/torture/rpc/oxidresolve.c
@@ -23,7 +23,6 @@
 #include "librpc/gen_ndr/ndr_oxidresolver.h"
 #include "librpc/gen_ndr/ndr_remact.h"
 #include "librpc/gen_ndr/ndr_epmapper.h"
-#include "librpc/gen_ndr/com_dcom.h"
 
 #define CLSID_IMAGEDOC "02B01C80-E03D-101A-B294-00DD010F2BF9"
 
diff --git a/source4/torture/rpc/remact.c b/source4/torture/rpc/remact.c
index 84d0a2e35c..1d1eeae53e 100644
--- a/source4/torture/rpc/remact.c
+++ b/source4/torture/rpc/remact.c
@@ -22,7 +22,6 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_remact.h"
 #include "librpc/gen_ndr/ndr_epmapper.h"
-#include "librpc/gen_ndr/com_dcom.h"
 
 #define CLSID_IMAGEDOC "02B01C80-E03D-101A-B294-00DD010F2BF9"
 
diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index 98fea05a1d..afcd17555a 100644
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -23,7 +23,6 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_netlogon.h"
 #include "auth/auth.h"
 #include "dlinklist.h"
 #include "lib/crypto/crypto.h"
diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c
index 97761b6b0e..bab0ffc4e8 100644
--- a/source4/torture/rpc/schannel.c
+++ b/source4/torture/rpc/schannel.c
@@ -21,9 +21,7 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_samr.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
-#include "lib/cmdline/popt_common.h"
 
 #define TEST_MACHINE_NAME "schannel"
 
diff --git a/source4/torture/rpc/svcctl.c b/source4/torture/rpc/svcctl.c
index 102e3bad91..fc582e7cc9 100644
--- a/source4/torture/rpc/svcctl.c
+++ b/source4/torture/rpc/svcctl.c
@@ -21,7 +21,6 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_svcctl.h"
-#include "librpc/gen_ndr/ndr_security.h"
 
 static BOOL test_EnumServicesStatus(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct policy_handle *h)
 {
diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c
index 80342fa8bc..198f4fdb5b 100644
--- a/source4/torture/rpc/testjoin.c
+++ b/source4/torture/rpc/testjoin.c
@@ -26,7 +26,6 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_samr.h"
 #include "system/time.h"
 #include "lib/crypto/crypto.h"
 #include "libnet/libnet.h"
diff --git a/source4/torture/rpc/unixinfo.c b/source4/torture/rpc/unixinfo.c
index 24d6a30d55..4403079862 100644
--- a/source4/torture/rpc/unixinfo.c
+++ b/source4/torture/rpc/unixinfo.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "lib/events/events.h"
 #include "librpc/gen_ndr/ndr_unixinfo.h"
 
 
diff --git a/source4/torture/smb2/connect.c b/source4/torture/smb2/connect.c
index fe5febdf07..2077bb0227 100644
--- a/source4/torture/smb2/connect.c
+++ b/source4/torture/smb2/connect.c
@@ -21,11 +21,8 @@
 */
 
 #include "includes.h"
-#include "libcli/raw/libcliraw.h"
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
-#include "lib/cmdline/popt_common.h"
-#include "lib/events/events.h"
 
 /*
   send a close
diff --git a/source4/torture/smb2/find.c b/source4/torture/smb2/find.c
index 37e8db65bf..aae8f8042f 100644
--- a/source4/torture/smb2/find.c
+++ b/source4/torture/smb2/find.c
@@ -23,7 +23,6 @@
 #include "includes.h"
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
-#include "librpc/gen_ndr/security.h"
 
 static struct {
 	const char *name;
diff --git a/source4/torture/smb2/getinfo.c b/source4/torture/smb2/getinfo.c
index 209c220e60..faf889f8ff 100644
--- a/source4/torture/smb2/getinfo.c
+++ b/source4/torture/smb2/getinfo.c
@@ -23,7 +23,6 @@
 #include "includes.h"
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
-#include "librpc/gen_ndr/security.h"
 
 static struct {
 	const char *name;
diff --git a/source4/torture/smb2/scan.c b/source4/torture/smb2/scan.c
index 03aa6dca49..646f790e18 100644
--- a/source4/torture/smb2/scan.c
+++ b/source4/torture/smb2/scan.c
@@ -21,7 +21,6 @@
 */
 
 #include "includes.h"
-#include "libcli/raw/libcliraw.h"
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
 #include "lib/cmdline/popt_common.h"
diff --git a/source4/torture/smb2/util.c b/source4/torture/smb2/util.c
index a3d6ed8d66..953ef448d9 100644
--- a/source4/torture/smb2/util.c
+++ b/source4/torture/smb2/util.c
@@ -21,7 +21,6 @@
 */
 
 #include "includes.h"
-#include "libcli/raw/libcliraw.h"
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
 #include "lib/cmdline/popt_common.h"
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index 61a0af34f5..149ee78065 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -19,16 +19,13 @@
 */
 
 #include "includes.h"
-#include "clilist.h"
 #include "lib/cmdline/popt_common.h"
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
 #include "system/wait.h"
 #include "system/filesys.h"
 #include "ioctl.h"
-#include "librpc/gen_ndr/ndr_security.h"
 #include "smb_build.h"
-#include "libcli/nbt/libnbt.h"
 
 int torture_nprocs=4;
 int torture_numops=10;
diff --git a/source4/torture/torture_util.c b/source4/torture/torture_util.c
index cdc0155ecc..ce457582d3 100644
--- a/source4/torture/torture_util.c
+++ b/source4/torture/torture_util.c
@@ -22,7 +22,6 @@
 #include "libcli/raw/libcliraw.h"
 #include "system/shmem.h"
 #include "system/time.h"
-#include "librpc/gen_ndr/ndr_security.h"
 
 
 /*