9 files changed, 9 insertions, 12 deletions
diff --git a/source4/torture/basic/secleak.c b/source4/torture/basic/secleak.c
index 005eb5f213..f77b399874 100644
--- a/source4/torture/basic/secleak.c
+++ b/source4/torture/basic/secleak.c
@@ -24,6 +24,7 @@
 #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/libnet/domain.c b/source4/torture/libnet/domain.c
index 7edbd5742d..98c44cd942 100644
--- a/source4/torture/libnet/domain.c
+++ b/source4/torture/libnet/domain.c
@@ -22,7 +22,6 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "libnet/composite.h"
-#include "libcli/composite/monitor.h"
 
 static BOOL test_domainopen(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 			    struct lsa_String *domname,
diff --git a/source4/torture/libnet/libnet_lookup.c b/source4/torture/libnet/libnet_lookup.c
index 320b3c11cc..b0cdc8c93e 100644
--- a/source4/torture/libnet/libnet_lookup.c
+++ b/source4/torture/libnet/libnet_lookup.c
@@ -23,7 +23,6 @@
 #include "lib/cmdline/popt_common.h"
 #include "libnet/libnet.h"
 #include "libnet/composite.h"
-#include "libcli/composite/monitor.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 
 
diff --git a/source4/torture/libnet/libnet_rpc.c b/source4/torture/libnet/libnet_rpc.c
index ee51ac15a2..4cd04ecb42 100644
--- a/source4/torture/libnet/libnet_rpc.c
+++ b/source4/torture/libnet/libnet_rpc.c
@@ -23,7 +23,6 @@
 #include "lib/cmdline/popt_common.h"
 #include "libnet/libnet.h"
 #include "libnet/composite.h"
-#include "libcli/composite/monitor.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 4db0028481..60c8bce935 100644
--- a/source4/torture/libnet/libnet_user.c
+++ b/source4/torture/libnet/libnet_user.c
@@ -24,7 +24,6 @@
 #include "lib/cmdline/popt_common.h"
 #include "libnet/libnet.h"
 #include "libnet/composite.h"
-#include "libcli/composite/monitor.h"
 
 
 #define TEST_USERNAME  "libnetusertest"
diff --git a/source4/torture/libnet/userinfo.c b/source4/torture/libnet/userinfo.c
index aa1e64301a..63724bc8b1 100644
--- a/source4/torture/libnet/userinfo.c
+++ b/source4/torture/libnet/userinfo.c
@@ -23,7 +23,6 @@
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "libnet/composite.h"
 #include "libnet/userinfo.h"
-#include "libcli/composite/monitor.h"
 
 #define TEST_USERNAME  "libnetuserinfotest"
 
diff --git a/source4/torture/libnet/userman.c b/source4/torture/libnet/userman.c
index 8ddd956608..fc2a32c913 100644
--- a/source4/torture/libnet/userman.c
+++ b/source4/torture/libnet/userman.c
@@ -23,7 +23,6 @@
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "libnet/composite.h"
 #include "libnet/userman.h"
-#include "libcli/composite/monitor.h"
 
 #define TEST_USERNAME  "libnetusermantest"
 
@@ -412,7 +411,7 @@ BOOL torture_usermod(void)
 	struct dcerpc_pipe *p;
 	struct policy_handle h;
 	struct lsa_String domain_name;
-	char *name = TEST_USERNAME;
+	const char *name = TEST_USERNAME;
 	TALLOC_CTX *mem_ctx;
 	BOOL ret = True;
 	int i;
diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c
index 457bcea7f9..fafdb90ec3 100644
--- a/source4/torture/raw/composite.c
+++ b/source4/torture/raw/composite.c
@@ -24,6 +24,7 @@
 #include "lib/events/events.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
+#include "libcli/smb_composite/smb_composite.h"
 #include "lib/cmdline/popt_common.h"
 #include "librpc/gen_ndr/ndr_security.h"
 
@@ -31,7 +32,7 @@
 
 static void loadfile_complete(struct composite_context *c)
 {
-	int *count = talloc_get_type(c->async.private, int);
+	int *count = talloc_get_type(c->async.private_data, int);
 	(*count)++;
 }
 
@@ -76,7 +77,7 @@ static BOOL test_loadfile(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 	for (i=0;i<num_ops;i++) {
 		c[i] = smb_composite_loadfile_send(cli->tree, &io2);
 		c[i]->async.fn = loadfile_complete;
-		c[i]->async.private = count;
+		c[i]->async.private_data = count;
 	}
 
 	printf("waiting for completion\n");
@@ -163,7 +164,7 @@ static BOOL test_fetchfile(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 	for (i=0; i<torture_numops; i++) {
 		c[i] = smb_composite_fetchfile_send(&io2, event_ctx);
 		c[i]->async.fn = loadfile_complete;
-		c[i]->async.private = count;
+		c[i]->async.private_data = count;
 	}
 
 	printf("waiting for completion\n");
@@ -281,7 +282,7 @@ static BOOL test_appendacl(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 
 		c[i] = smb_composite_appendacl_send(cli->tree, io[i]);
 		c[i]->async.fn = loadfile_complete;
-		c[i]->async.private = count;
+		c[i]->async.private_data = count;
 	}
 
 	event_ctx = talloc_reference(mem_ctx, cli->tree->session->transport->socket->event.ctx);
@@ -346,7 +347,7 @@ static BOOL test_fsinfo(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 	for (i=0; i<torture_numops; i++) {
 		c[i] = smb_composite_fsinfo_send(cli->tree,&io1);
 		c[i]->async.fn = loadfile_complete;
-		c[i]->async.private = count;
+		c[i]->async.private_data = count;
 	}
 
 	printf("waiting for completion\n");
diff --git a/source4/torture/raw/context.c b/source4/torture/raw/context.c
index d76882d84d..0fe2c894af 100644
--- a/source4/torture/raw/context.c
+++ b/source4/torture/raw/context.c
@@ -22,6 +22,7 @@
 #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"
 #include "lib/events/events.h"