From 78c50015bb8bd5a1d831a6e7ec796b3367c73145 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 3 Jan 2006 15:40:05 +0000
Subject: r12694: Move some headers to the directory of the subsystem they
 belong to. (This used to be commit c722f665c90103f3ed57621c460e32ad33e7a8a3)

---
 source4/torture/basic/aliases.c     | 1 +
 source4/torture/basic/attr.c        | 1 +
 source4/torture/basic/charset.c     | 1 +
 source4/torture/basic/delaywrite.c  | 1 +
 source4/torture/basic/delete.c      | 1 +
 source4/torture/basic/denytest.c    | 1 +
 source4/torture/basic/dir.c         | 1 +
 source4/torture/basic/disconnect.c  | 1 +
 source4/torture/basic/locking.c     | 1 +
 source4/torture/basic/mangle_test.c | 1 +
 source4/torture/basic/properties.c  | 1 +
 source4/torture/basic/rename.c      | 1 +
 source4/torture/basic/scanner.c     | 1 +
 source4/torture/basic/secleak.c     | 1 +
 source4/torture/basic/unlink.c      | 1 +
 source4/torture/basic/utable.c      | 1 +
 source4/torture/gentest.c           | 1 +
 source4/torture/locktest.c          | 1 +
 source4/torture/masktest.c          | 2 +-
 source4/torture/nbench/nbench.c     | 1 +
 source4/torture/nbench/nbio.c       | 1 +
 source4/torture/rap/rap.c           | 1 +
 source4/torture/raw/acls.c          | 1 +
 source4/torture/raw/chkpath.c       | 1 +
 source4/torture/raw/close.c         | 1 +
 source4/torture/raw/composite.c     | 1 +
 source4/torture/raw/context.c       | 1 +
 source4/torture/raw/eas.c           | 1 +
 source4/torture/raw/ioctl.c         | 1 +
 source4/torture/raw/lock.c          | 1 +
 source4/torture/raw/mkdir.c         | 1 +
 source4/torture/raw/mux.c           | 1 +
 source4/torture/raw/notify.c        | 1 +
 source4/torture/raw/open.c          | 1 +
 source4/torture/raw/oplock.c        | 1 +
 source4/torture/raw/qfileinfo.c     | 1 +
 source4/torture/raw/qfsinfo.c       | 1 +
 source4/torture/raw/read.c          | 1 +
 source4/torture/raw/rename.c        | 1 +
 source4/torture/raw/search.c        | 1 +
 source4/torture/raw/seek.c          | 1 +
 source4/torture/raw/setfileinfo.c   | 1 +
 source4/torture/raw/streams.c       | 1 +
 source4/torture/raw/unlink.c        | 1 +
 source4/torture/raw/write.c         | 1 +
 source4/torture/rpc/netlogon.c      | 1 +
 source4/torture/rpc/samr.c          | 1 +
 source4/torture/rpc/testjoin.c      | 1 +
 source4/torture/smb2/connect.c      | 1 +
 source4/torture/torture.c           | 1 +
 source4/torture/torture_util.c      | 1 +
 51 files changed, 51 insertions(+), 1 deletion(-)

(limited to 'source4/torture')

diff --git a/source4/torture/basic/aliases.c b/source4/torture/basic/aliases.c
index a693d18ce3..104fdc1933 100644
--- a/source4/torture/basic/aliases.c
+++ b/source4/torture/basic/aliases.c
@@ -22,6 +22,7 @@
 #include "torture/torture.h"
 #include "dlinklist.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 int create_complex_file(struct smbcli_state *cli, TALLOC_CTX *mem_ctx, const char *fname);
 
diff --git a/source4/torture/basic/attr.c b/source4/torture/basic/attr.c
index 5d13a5f689..e321993749 100644
--- a/source4/torture/basic/attr.c
+++ b/source4/torture/basic/attr.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "torture/torture.h"
+#include "libcli/libcli.h"
 
 extern int torture_failures;
 
diff --git a/source4/torture/basic/charset.c b/source4/torture/basic/charset.c
index 7becdcd8e5..186b265e19 100644
--- a/source4/torture/basic/charset.c
+++ b/source4/torture/basic/charset.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 #define BASEDIR "\\chartest\\"
 
diff --git a/source4/torture/basic/delaywrite.c b/source4/torture/basic/delaywrite.c
index 5523e1bb41..2c26f21ddc 100644
--- a/source4/torture/basic/delaywrite.c
+++ b/source4/torture/basic/delaywrite.c
@@ -27,6 +27,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
 #include "system/filesys.h"
+#include "libcli/libcli.h"
 
 #define BASEDIR "\\delaywrite"
 
diff --git a/source4/torture/basic/delete.c b/source4/torture/basic/delete.c
index 3138f48d0f..c6ddd4bd70 100644
--- a/source4/torture/basic/delete.c
+++ b/source4/torture/basic/delete.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "libcli/libcli.h"
 #include "torture/torture.h"
 #include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
diff --git a/source4/torture/basic/denytest.c b/source4/torture/basic/denytest.c
index f633f843ff..2e68efa4eb 100644
--- a/source4/torture/basic/denytest.c
+++ b/source4/torture/basic/denytest.c
@@ -22,6 +22,7 @@
 #include "torture/torture.h"
 #include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 extern BOOL torture_showall;
 extern int torture_failures;
diff --git a/source4/torture/basic/dir.c b/source4/torture/basic/dir.c
index 49efff8d2e..9dd62f3aa1 100644
--- a/source4/torture/basic/dir.c
+++ b/source4/torture/basic/dir.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "libcli/libcli.h"
 #include "torture/torture.h"
 #include "system/filesys.h"
 
diff --git a/source4/torture/basic/disconnect.c b/source4/torture/basic/disconnect.c
index fca5d1968a..61b1750b92 100644
--- a/source4/torture/basic/disconnect.c
+++ b/source4/torture/basic/disconnect.c
@@ -24,6 +24,7 @@
 #include "torture/torture.h"
 #include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 #define BASEDIR "\\test_disconnect"
 
diff --git a/source4/torture/basic/locking.c b/source4/torture/basic/locking.c
index e07d0648a7..307bb0fafc 100644
--- a/source4/torture/basic/locking.c
+++ b/source4/torture/basic/locking.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.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 29bb4fcd18..8317a4ee18 100644
--- a/source4/torture/basic/mangle_test.c
+++ b/source4/torture/basic/mangle_test.c
@@ -22,6 +22,7 @@
 #include "torture/torture.h"
 #include "system/filesys.h"
 #include "lib/tdb/include/tdbutil.h"
+#include "libcli/libcli.h"
 #include "pstring.h"
 
 static TDB_CONTEXT *tdb;
diff --git a/source4/torture/basic/properties.c b/source4/torture/basic/properties.c
index 25a787dead..c20edf545b 100644
--- a/source4/torture/basic/properties.c
+++ b/source4/torture/basic/properties.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 struct bitmapping {
 	const char *name;
diff --git a/source4/torture/basic/rename.c b/source4/torture/basic/rename.c
index cdb2340b76..4bdc6f2d9f 100644
--- a/source4/torture/basic/rename.c
+++ b/source4/torture/basic/rename.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "libcli/libcli.h"
 #include "torture/torture.h"
 
 /*
diff --git a/source4/torture/basic/scanner.c b/source4/torture/basic/scanner.c
index 5d48ee7124..6e79745e89 100644
--- a/source4/torture/basic/scanner.c
+++ b/source4/torture/basic/scanner.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "torture/torture.h"
+#include "libcli/libcli.h"
 #include "libcli/raw/libcliraw.h"
 #include "system/filesys.h"
 #include "pstring.h"
diff --git a/source4/torture/basic/secleak.c b/source4/torture/basic/secleak.c
index 70fd50834e..20b7e8a579 100644
--- a/source4/torture/basic/secleak.c
+++ b/source4/torture/basic/secleak.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 #include "system/time.h"
 #include "libcli/smb_composite/smb_composite.h"
 
diff --git a/source4/torture/basic/unlink.c b/source4/torture/basic/unlink.c
index ec889078aa..d99fec5ee8 100644
--- a/source4/torture/basic/unlink.c
+++ b/source4/torture/basic/unlink.c
@@ -24,6 +24,7 @@
 #include "torture/torture.h"
 #include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 #define BASEDIR "\\unlinktest"
 
diff --git a/source4/torture/basic/utable.c b/source4/torture/basic/utable.c
index f3f7429021..e76627fb03 100644
--- a/source4/torture/basic/utable.c
+++ b/source4/torture/basic/utable.c
@@ -22,6 +22,7 @@
 #include "torture/torture.h"
 #include "system/iconv.h"
 #include "system/filesys.h"
+#include "libcli/libcli.h"
 #include "pstring.h"
 
 BOOL torture_utable(void)
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index a576b57458..a82b899886 100644
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -22,6 +22,7 @@
 #include "system/time.h"
 #include "system/filesys.h"
 #include "request.h"
+#include "libcli/libcli.h"
 #include "libcli/raw/libcliraw.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "auth/gensec/gensec.h"
diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c
index be2d3022da..02bf901428 100644
--- a/source4/torture/locktest.c
+++ b/source4/torture/locktest.c
@@ -23,6 +23,7 @@
 #include "system/time.h"
 #include "pstring.h"
 #include "auth/gensec/gensec.h"
+#include "libcli/libcli.h"
 
 static int numops = 1000;
 static BOOL showall;
diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c
index ca5bdf7c21..cb88e573e2 100644
--- a/source4/torture/masktest.c
+++ b/source4/torture/masktest.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "clilist.h"
+#include "libcli/libcli.h"
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
 #include "pstring.h"
diff --git a/source4/torture/nbench/nbench.c b/source4/torture/nbench/nbench.c
index 353140a706..4357dd53a1 100644
--- a/source4/torture/nbench/nbench.c
+++ b/source4/torture/nbench/nbench.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "torture/torture.h"
+#include "libcli/libcli.h"
 #include "system/filesys.h"
 #include "pstring.h"
 
diff --git a/source4/torture/nbench/nbio.c b/source4/torture/nbench/nbio.c
index 40d9277c6e..3e4c9a0f92 100644
--- a/source4/torture/nbench/nbio.c
+++ b/source4/torture/nbench/nbio.c
@@ -24,6 +24,7 @@
 #include "system/time.h"
 #include "system/filesys.h"
 #include "dlinklist.h"
+#include "libcli/libcli.h"
 #include "libcli/raw/libcliraw.h"
 
 #define MAX_FILES 100
diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index 1b98275e93..e9cb45e3b0 100644
--- a/source4/torture/rap/rap.c
+++ b/source4/torture/rap/rap.c
@@ -23,6 +23,7 @@
 #include "torture/torture.h"
 #include "rap.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 struct rap_call {
 	uint16_t callno;
diff --git a/source4/torture/raw/acls.c b/source4/torture/raw/acls.c
index 119377731b..6450acab18 100644
--- a/source4/torture/raw/acls.c
+++ b/source4/torture/raw/acls.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 #define BASEDIR "\\testsd"
 
diff --git a/source4/torture/raw/chkpath.c b/source4/torture/raw/chkpath.c
index 92fe5dd2d5..4b19372b10 100644
--- a/source4/torture/raw/chkpath.c
+++ b/source4/torture/raw/chkpath.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 #define BASEDIR "\\rawchkpath"
 
diff --git a/source4/torture/raw/close.c b/source4/torture/raw/close.c
index 67050f30a3..e19fe0f3cb 100644
--- a/source4/torture/raw/close.c
+++ b/source4/torture/raw/close.c
@@ -22,6 +22,7 @@
 #include "torture/torture.h"
 #include "system/time.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 
 /* basic testing of all RAW_CLOSE_* calls 
diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c
index f9fe0eb83c..760d464fb5 100644
--- a/source4/torture/raw/composite.c
+++ b/source4/torture/raw/composite.c
@@ -24,6 +24,7 @@
 #include "torture/torture.h"
 #include "lib/events/events.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.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/context.c b/source4/torture/raw/context.c
index 8a8bfc85fb..43e059e23d 100644
--- a/source4/torture/raw/context.c
+++ b/source4/torture/raw/context.c
@@ -25,6 +25,7 @@
 #include "libcli/smb_composite/smb_composite.h"
 #include "lib/cmdline/popt_common.h"
 #include "lib/events/events.h"
+#include "libcli/libcli.h"
 
 #define BASEDIR "\\rawcontext"
 
diff --git a/source4/torture/raw/eas.c b/source4/torture/raw/eas.c
index a1f9bbfe52..3bc954d572 100644
--- a/source4/torture/raw/eas.c
+++ b/source4/torture/raw/eas.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 #define BASEDIR "\\testeas"
 
diff --git a/source4/torture/raw/ioctl.c b/source4/torture/raw/ioctl.c
index 5a88e336cb..0fb48c292b 100644
--- a/source4/torture/raw/ioctl.c
+++ b/source4/torture/raw/ioctl.c
@@ -23,6 +23,7 @@
 #include "torture/torture.h"
 #include "ioctl.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 #define BASEDIR "\\rawioctl"
 
diff --git a/source4/torture/raw/lock.c b/source4/torture/raw/lock.c
index da3c956afb..f18df47528 100644
--- a/source4/torture/raw/lock.c
+++ b/source4/torture/raw/lock.c
@@ -23,6 +23,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
 #include "system/filesys.h"
+#include "libcli/libcli.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \
diff --git a/source4/torture/raw/mkdir.c b/source4/torture/raw/mkdir.c
index e1cc33bf84..ac19ee1187 100644
--- a/source4/torture/raw/mkdir.c
+++ b/source4/torture/raw/mkdir.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 #define BASEDIR "\\mkdirtest"
 
diff --git a/source4/torture/raw/mux.c b/source4/torture/raw/mux.c
index d941c01f1a..97a1bf3cc4 100644
--- a/source4/torture/raw/mux.c
+++ b/source4/torture/raw/mux.c
@@ -22,6 +22,7 @@
 #include "torture/torture.h"
 #include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 #define BASEDIR "\\test_mux"
 
diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c
index e28ab3a540..9a5831d69c 100644
--- a/source4/torture/raw/notify.c
+++ b/source4/torture/raw/notify.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 #define BASEDIR "\\test_notify"
 
diff --git a/source4/torture/raw/open.c b/source4/torture/raw/open.c
index a1d17587e7..2afad96956 100644
--- a/source4/torture/raw/open.c
+++ b/source4/torture/raw/open.c
@@ -25,6 +25,7 @@
 #include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "lib/events/events.h"
+#include "libcli/libcli.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 512e42d867..64da410bd2 100644
--- a/source4/torture/raw/oplock.c
+++ b/source4/torture/raw/oplock.c
@@ -22,6 +22,7 @@
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 #define CHECK_VAL(v, correct) do { \
 	if ((v) != (correct)) { \
diff --git a/source4/torture/raw/qfileinfo.c b/source4/torture/raw/qfileinfo.c
index 57a2ac69c0..6ed57227ac 100644
--- a/source4/torture/raw/qfileinfo.c
+++ b/source4/torture/raw/qfileinfo.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 static struct {
 	const char *name;
diff --git a/source4/torture/raw/qfsinfo.c b/source4/torture/raw/qfsinfo.c
index 2edceeb2b1..26bac4c0ad 100644
--- a/source4/torture/raw/qfsinfo.c
+++ b/source4/torture/raw/qfsinfo.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 
 static struct {
diff --git a/source4/torture/raw/read.c b/source4/torture/raw/read.c
index cb400d871f..aab879a1d1 100644
--- a/source4/torture/raw/read.c
+++ b/source4/torture/raw/read.c
@@ -23,6 +23,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
 #include "system/filesys.h"
+#include "libcli/libcli.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \
diff --git a/source4/torture/raw/rename.c b/source4/torture/raw/rename.c
index 99d8116b31..c1b24f2b3a 100644
--- a/source4/torture/raw/rename.c
+++ b/source4/torture/raw/rename.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \
diff --git a/source4/torture/raw/search.c b/source4/torture/raw/search.c
index 80d1bb5b3f..5cb67b068e 100644
--- a/source4/torture/raw/search.c
+++ b/source4/torture/raw/search.c
@@ -22,6 +22,7 @@
 #include "torture/torture.h"
 #include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 
 #define BASEDIR "\\testsearch"
diff --git a/source4/torture/raw/seek.c b/source4/torture/raw/seek.c
index cf16ed2354..b0993b67cc 100644
--- a/source4/torture/raw/seek.c
+++ b/source4/torture/raw/seek.c
@@ -22,6 +22,7 @@
 #include "torture/torture.h"
 #include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \
diff --git a/source4/torture/raw/setfileinfo.c b/source4/torture/raw/setfileinfo.c
index 8055fc7575..29521980be 100644
--- a/source4/torture/raw/setfileinfo.c
+++ b/source4/torture/raw/setfileinfo.c
@@ -22,6 +22,7 @@
 #include "torture/torture.h"
 #include "system/time.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 #define BASEDIR "\\testsfileinfo"
 
diff --git a/source4/torture/raw/streams.c b/source4/torture/raw/streams.c
index 71ff9332fd..22b7d06cdd 100644
--- a/source4/torture/raw/streams.c
+++ b/source4/torture/raw/streams.c
@@ -24,6 +24,7 @@
 #include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
 #include "system/filesys.h"
+#include "libcli/libcli.h"
 
 #define BASEDIR "\\teststreams"
 
diff --git a/source4/torture/raw/unlink.c b/source4/torture/raw/unlink.c
index fc92668f38..4c91ab58ba 100644
--- a/source4/torture/raw/unlink.c
+++ b/source4/torture/raw/unlink.c
@@ -22,6 +22,7 @@
 #include "torture/torture.h"
 #include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \
diff --git a/source4/torture/raw/write.c b/source4/torture/raw/write.c
index 2628950606..4209d66892 100644
--- a/source4/torture/raw/write.c
+++ b/source4/torture/raw/write.c
@@ -24,6 +24,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
 #include "system/filesys.h"
+#include "libcli/libcli.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \
diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index bdeda05613..ab12362759 100644
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -26,6 +26,7 @@
 #include "torture/torture.h"
 #include "lib/events/events.h"
 #include "auth/auth.h"
+#include "smb.h"
 #include "lib/cmdline/popt_common.h"
 
 static const char *machine_password;
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index d373e0c817..e109bb7f30 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -24,6 +24,7 @@
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_samr.h"
+#include "smb.h"
 #include "lib/crypto/crypto.h"
 
 #define TEST_ACCOUNT_NAME "samrtorturetest"
diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c
index 622b6ac08a..f844ad8ca8 100644
--- a/source4/torture/rpc/testjoin.c
+++ b/source4/torture/rpc/testjoin.c
@@ -31,6 +31,7 @@
 #include "lib/crypto/crypto.h"
 #include "libnet/libnet.h"
 #include "lib/cmdline/popt_common.h"
+#include "smb.h"
 #include "lib/ldb/include/ldb.h"
 
 
diff --git a/source4/torture/smb2/connect.c b/source4/torture/smb2/connect.c
index 2077bb0227..d4016b8770 100644
--- a/source4/torture/smb2/connect.c
+++ b/source4/torture/smb2/connect.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "smb.h"
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
 
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index ff1a72799b..fd8fc6fd6b 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -25,6 +25,7 @@
 #include "system/wait.h"
 #include "system/filesys.h"
 #include "ioctl.h"
+#include "libcli/libcli.h"
 #include "librpc/rpc/dcerpc_table.h"
 
 int torture_nprocs=4;
diff --git a/source4/torture/torture_util.c b/source4/torture/torture_util.c
index ce457582d3..fefbfcf568 100644
--- a/source4/torture/torture_util.c
+++ b/source4/torture/torture_util.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 #include "system/shmem.h"
 #include "system/time.h"
 
-- 
cgit