diff --git a/source/auth/credentials/credentials_files.c b/source/auth/credentials/credentials_files.c
index 8d84e8cdb57..219869cf3ae 100644
--- a/source/auth/credentials/credentials_files.c
+++ b/source/auth/credentials/credentials_files.c
@@ -25,7 +25,7 @@
 #include "includes.h"
 #include "lib/ldb/include/ldb.h"
 #include "librpc/gen_ndr/ndr_samr.h" /* for struct samrPassword */
-#include "include/secrets.h"
+#include "passdb/secrets.h"
 #include "system/filesys.h"
 
 /**
diff --git a/source/auth/gensec/spnego_parse.c b/source/auth/gensec/spnego_parse.c
index 59b09b1969c..8dde78da484 100644
--- a/source/auth/gensec/spnego_parse.c
+++ b/source/auth/gensec/spnego_parse.c
@@ -23,7 +23,7 @@
 
 #include "includes.h"
 #include "auth/auth.h"
-#include "asn_1.h"
+#include "libcli/util/asn_1.h"
 
 static BOOL read_negTokenInit(struct asn1_data *asn1, struct spnego_negTokenInit *token)
 {
diff --git a/source/auth/kerberos/gssapi_parse.c b/source/auth/kerberos/gssapi_parse.c
index a48179cc1a2..5226d77a2b7 100644
--- a/source/auth/kerberos/gssapi_parse.c
+++ b/source/auth/kerberos/gssapi_parse.c
@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
-#include "asn_1.h"
+#include "libcli/util/asn_1.h"
 #include "auth/gensec/gensec.h"
 
 /*
diff --git a/source/auth/ntlmssp/ntlmssp_parse.c b/source/auth/ntlmssp/ntlmssp_parse.c
index 42546cb1308..e8c08bf650d 100644
--- a/source/auth/ntlmssp/ntlmssp_parse.c
+++ b/source/auth/ntlmssp/ntlmssp_parse.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "smb.h"
 #include "pstring.h"
 
 /*
diff --git a/source/client/client.c b/source/client/client.c
index 712a5261fa7..afaa3139281 100644
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -23,7 +23,7 @@
 
 #include "includes.h"
 #include "version.h"
-#include "clilist.h"
+#include "libcli/libcli.h"
 #include "lib/cmdline/popt_common.h"
 #include "librpc/gen_ndr/ndr_srvsvc.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
diff --git a/source/include/clilist.h b/source/include/clilist.h
deleted file mode 100644
index d0319877680..00000000000
--- a/source/include/clilist.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-
-   Copyright (C) Andrew Tridgell 2004
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-struct clilist_file_info {
-	uint64_t size;
-	uint16_t attrib;
-	time_t mtime;
-	const char *name;
-	const char *short_name;
-};
-
diff --git a/source/include/enums.h b/source/include/enums.h
index 4e8e7b04a0f..6003dfc7a00 100644
--- a/source/include/enums.h
+++ b/source/include/enums.h
@@ -28,3 +28,11 @@ enum protocol_types {PROTOCOL_NONE,PROTOCOL_CORE,PROTOCOL_COREPLUS,PROTOCOL_LANM
 
 /* security levels */
 enum security_types {SEC_SHARE,SEC_USER};
+
+/* passed to br lock code */
+enum brl_type {READ_LOCK, WRITE_LOCK, PENDING_READ_LOCK, PENDING_WRITE_LOCK};
+
+enum smb_signing_state {SMB_SIGNING_OFF, SMB_SIGNING_SUPPORTED, 
+			SMB_SIGNING_REQUIRED, SMB_SIGNING_AUTO};
+
+
diff --git a/source/include/includes.h b/source/include/includes.h
index 849850daa66..dd4f19009a9 100644
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -84,9 +84,8 @@ struct ipv4_addr {
 #include "structs.h"
 #include "trans2.h"
 #include "nterr.h"
+#include "charset/charset.h"
 #include "core.h"
-#include "smb.h"
-#include "charset.h"
 #include "debug.h"
 #include "doserr.h"
 #include "enums.h"
@@ -98,7 +97,6 @@ struct ipv4_addr {
 #include "librpc/gen_ndr/orpc.h"
 #include "librpc/rpc/dcerpc.h"
 #include "smb_interfaces.h"
-#include "cli_context.h"
 #include "auth/credentials/credentials.h"
 #include "libcli/nbt/libnbt.h"
 
diff --git a/source/include/smb.h b/source/include/smb.h
index f7a46e757d9..5297ef9e27a 100644
--- a/source/include/smb.h
+++ b/source/include/smb.h
@@ -29,9 +29,6 @@
 
 #define SMB_PORTS "445 139"
 
-enum smb_signing_state {SMB_SIGNING_OFF, SMB_SIGNING_SUPPORTED, 
-			SMB_SIGNING_REQUIRED, SMB_SIGNING_AUTO};
-
 /* deny modes */
 #define DENY_DOS 0
 #define DENY_ALL 1
@@ -557,20 +554,6 @@ enum smb_signing_state {SMB_SIGNING_OFF, SMB_SIGNING_SUPPORTED,
 
 #define DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH 14
 
-/* passed to br lock code */
-enum brl_type {READ_LOCK, WRITE_LOCK, PENDING_READ_LOCK, PENDING_WRITE_LOCK};
-
-/* string manipulation flags - see clistr.c and srvstr.c */
-#define STR_TERMINATE 1
-#define STR_UPPER 2
-#define STR_ASCII 4
-#define STR_UNICODE 8
-#define STR_NOALIGN 16
-#define STR_NO_RANGE_CHECK 32
-#define STR_LEN8BIT 64
-#define STR_TERMINATE_ASCII 128 /* only terminate if ascii */
-#define STR_LEN_NOTERM 256 /* the length field is the unterminated length */
-
 
 /*
   filesystem attribute bits
@@ -590,4 +573,10 @@ enum brl_type {READ_LOCK, WRITE_LOCK, PENDING_READ_LOCK, PENDING_WRITE_LOCK};
 #define FS_ATTR_ENCRYPTION                        0x00020000
 #define FS_ATTR_NAMED_STREAMS                     0x00040000
 
+#define smb_len(buf) (PVAL(buf,3)|(PVAL(buf,2)<<8)|(PVAL(buf,1)<<16))
+#define _smb_setlen(buf,len) do {(buf)[0] = 0; (buf)[1] = ((len)&0x10000)>>16; \
+        (buf)[2] = ((len)&0xFF00)>>8; (buf)[3] = (len)&0xFF;} while (0)
+#define _smb_setlen2(buf,len) do {(buf)[0] = 0; (buf)[1] = ((len)&0xFF0000)>>16; \
+        (buf)[2] = ((len)&0xFF00)>>8; (buf)[3] = (len)&0xFF;} while (0)
+
 #endif /* _SMB_H */
diff --git a/source/include/smb_macros.h b/source/include/smb_macros.h
index afe31e00bac..356d9680839 100644
--- a/source/include/smb_macros.h
+++ b/source/include/smb_macros.h
@@ -44,12 +44,6 @@
 	DEBUG(0,("PANIC: assert failed at %s(%d)\n", __FILE__, __LINE__)); \
 	smb_panic("assert failed"); }} while (0)
 
-#define smb_len(buf) (PVAL(buf,3)|(PVAL(buf,2)<<8)|(PVAL(buf,1)<<16))
-#define _smb_setlen(buf,len) do {(buf)[0] = 0; (buf)[1] = ((len)&0x10000)>>16; \
-        (buf)[2] = ((len)&0xFF00)>>8; (buf)[3] = (len)&0xFF;} while (0)
-#define _smb_setlen2(buf,len) do {(buf)[0] = 0; (buf)[1] = ((len)&0xFF0000)>>16; \
-        (buf)[2] = ((len)&0xFF00)>>8; (buf)[3] = (len)&0xFF;} while (0)
-
 #ifndef MIN
 #define MIN(a,b) ((a)<(b)?(a):(b))
 #endif
diff --git a/source/include/structs.h b/source/include/structs.h
index b78d9184177..83f742b30e4 100644
--- a/source/include/structs.h
+++ b/source/include/structs.h
@@ -372,3 +372,6 @@ struct registry_context;
 struct nbtd_interface;
 struct nbtd_iface_name;
 struct nbtd_server;
+struct smbcli_session;
+struct smbcli_state;
+struct substitute_context;
diff --git a/source/ldap_server/ldap_server.c b/source/ldap_server/ldap_server.c
index 26bb2402e8d..d5736521432 100644
--- a/source/ldap_server/ldap_server.c
+++ b/source/ldap_server/ldap_server.c
@@ -26,7 +26,7 @@
 #include "lib/events/events.h"
 #include "auth/auth.h"
 #include "dlinklist.h"
-#include "asn_1.h"
+#include "libcli/util/asn_1.h"
 #include "ldap_server/ldap_server.h"
 #include "smbd/service_task.h"
 #include "smbd/service_stream.h"
diff --git a/source/include/charset.h b/source/lib/charset/charset.h
similarity index 84%
rename from source/include/charset.h
rename to source/lib/charset/charset.h
index ba1402acb3c..5ad2f431bfc 100644
--- a/source/include/charset.h
+++ b/source/lib/charset/charset.h
@@ -55,3 +55,15 @@ typedef struct {
 	void *cd_direct, *cd_pull, *cd_push;
 } *smb_iconv_t;
 
+/* string manipulation flags */
+#define STR_TERMINATE 1
+#define STR_UPPER 2
+#define STR_ASCII 4
+#define STR_UNICODE 8
+#define STR_NOALIGN 16
+#define STR_NO_RANGE_CHECK 32
+#define STR_LEN8BIT 64
+#define STR_TERMINATE_ASCII 128 /* only terminate if ascii */
+#define STR_LEN_NOTERM 256 /* the length field is the unterminated length */
+
+#include "lib/charset/charset_proto.h"
diff --git a/source/lib/charset/config.mk b/source/lib/charset/config.mk
index 4fb8ee79bf5..a69bee1ec33 100644
--- a/source/lib/charset/config.mk
+++ b/source/lib/charset/config.mk
@@ -4,6 +4,7 @@
 OBJ_FILES = \
 		iconv.o \
 		charcnv.o
+PRIVATE_PROTO_HEADER = charset_proto.h
 REQUIRED_SUBSYSTEMS = EXT_LIB_ICONV
 # End SUBSYSTEM CHARSET
 ################################################
diff --git a/source/include/db_wrap.h b/source/lib/db_wrap.h
similarity index 100%
rename from source/include/db_wrap.h
rename to source/lib/db_wrap.h
diff --git a/source/lib/messaging/messaging.c b/source/lib/messaging/messaging.c
index c7cce9c133e..ea345ff8817 100644
--- a/source/lib/messaging/messaging.c
+++ b/source/lib/messaging/messaging.c
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "lib/events/events.h"
 #include "system/filesys.h"
-#include "messages.h"
+#include "messaging/messaging.h"
 #include "dlinklist.h"
 #include "lib/socket/socket.h"
 #include "librpc/gen_ndr/ndr_irpc.h"
diff --git a/source/include/messages.h b/source/lib/messaging/messaging.h
similarity index 100%
rename from source/include/messages.h
rename to source/lib/messaging/messaging.h
diff --git a/source/lib/stream/packet.c b/source/lib/stream/packet.c
index d8ce332de68..2c053009dd4 100644
--- a/source/lib/stream/packet.c
+++ b/source/lib/stream/packet.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "smb.h"
 #include "dlinklist.h"
 #include "lib/events/events.h"
 #include "lib/socket/socket.h"
diff --git a/source/lib/util_str.c b/source/lib/util_str.c
index 56a1345e382..17c0924d680 100644
--- a/source/lib/util_str.c
+++ b/source/lib/util_str.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "system/iconv.h"
+#include "smb.h"
 #include "pstring.h"
 #include "lib/ldb/include/ldb.h"
 
diff --git a/source/libcli/auth/smbencrypt.c b/source/libcli/auth/smbencrypt.c
index b031bf48869..6bc9de2f2ba 100644
--- a/source/libcli/auth/smbencrypt.c
+++ b/source/libcli/auth/smbencrypt.c
@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "system/time.h"
+#include "smb.h"
 #include "auth/ntlmssp/ntlmssp.h"
 #include "lib/crypto/crypto.h"
 #include "pstring.h"
diff --git a/source/libcli/cldap/cldap.h b/source/libcli/cldap/cldap.h
index 632dbd1f65f..e1f59464e5e 100644
--- a/source/libcli/cldap/cldap.h
+++ b/source/libcli/cldap/cldap.h
@@ -20,7 +20,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "asn_1.h"
+#include "libcli/util/asn_1.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 
 enum cldap_request_state {CLDAP_REQUEST_SEND, 
diff --git a/source/libcli/cliconnect.c b/source/libcli/cliconnect.c
index 220b5a3898e..fe0ad9c9f5e 100644
--- a/source/libcli/cliconnect.c
+++ b/source/libcli/cliconnect.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "libcli/libcli.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/smb_composite/smb_composite.h"
 
diff --git a/source/libcli/clideltree.c b/source/libcli/clideltree.c
index 30369b977f0..0c65d993c82 100644
--- a/source/libcli/clideltree.c
+++ b/source/libcli/clideltree.c
@@ -19,7 +19,8 @@
 */
 
 #include "includes.h"
-#include "clilist.h"
+#include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 struct delete_state {
 	struct smbcli_tree *tree;
diff --git a/source/libcli/clilist.c b/source/libcli/clilist.c
index 0d69a386eb2..f18ec84db93 100644
--- a/source/libcli/clilist.c
+++ b/source/libcli/clilist.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "clilist.h"
+#include "libcli/libcli.h"
 #include "libcli/raw/libcliraw.h"
 
 struct search_private {
diff --git a/source/libcli/config.mk b/source/libcli/config.mk
index fb04c32d85d..20219be0f48 100644
--- a/source/libcli/config.mk
+++ b/source/libcli/config.mk
@@ -98,6 +98,7 @@ REQUIRED_SUBSYSTEMS = LIBCLI_RAW LIBCLI_UTILS LIBCLI_AUTH \
 
 [SUBSYSTEM::LIBSMB]
 REQUIRED_SUBSYSTEMS = LIBCLI SOCKET
+PRIVATE_PROTO_HEADER = libcli_proto.h
 OBJ_FILES = clireadwrite.o \
 		cliconnect.o \
 		clifile.o \
diff --git a/source/libcli/ldap/ldap.c b/source/libcli/ldap/ldap.c
index 3cfbe3a1e13..c699820cea3 100644
--- a/source/libcli/ldap/ldap.c
+++ b/source/libcli/ldap/ldap.c
@@ -25,7 +25,7 @@
 
 #include "includes.h"
 #include "system/iconv.h"
-#include "asn_1.h"
+#include "libcli/util/asn_1.h"
 #include "libcli/ldap/ldap.h"
 
 
diff --git a/source/libcli/ldap/ldap_client.c b/source/libcli/ldap/ldap_client.c
index 77fc7db0498..9b1a4ef9d5f 100644
--- a/source/libcli/ldap/ldap_client.c
+++ b/source/libcli/ldap/ldap_client.c
@@ -24,7 +24,7 @@
 */
 
 #include "includes.h"
-#include "asn_1.h"
+#include "libcli/util/asn_1.h"
 #include "dlinklist.h"
 #include "lib/events/events.h"
 #include "lib/socket/socket.h"
diff --git a/source/include/cli_context.h b/source/libcli/libcli.h
similarity index 86%
rename from source/include/cli_context.h
rename to source/libcli/libcli.h
index 843e8e8ca94..917ab275192 100644
--- a/source/include/cli_context.h
+++ b/source/libcli/libcli.h
@@ -19,6 +19,8 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include "smb.h"
+
 /* 
    smbcli_state: internal state used in libcli library for single-threaded callers, 
    i.e. a single session on a single socket. 
@@ -30,3 +32,14 @@ struct smbcli_state {
 	struct substitute_context *substitute;
 	struct smblsa_state *lsa;
 };
+
+struct clilist_file_info {
+	uint64_t size;
+	uint16_t attrib;
+	time_t mtime;
+	const char *name;
+	const char *short_name;
+};
+
+
+#include "libcli/libcli_proto.h"
diff --git a/source/libcli/raw/libcliraw.h b/source/libcli/raw/libcliraw.h
index b09361b5ffd..7eb0694bd25 100644
--- a/source/libcli/raw/libcliraw.h
+++ b/source/libcli/raw/libcliraw.h
@@ -21,6 +21,7 @@
 */
 
 #include "request.h"
+#include "smb.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 
 struct smbcli_tree;  /* forward declare */
diff --git a/source/libcli/raw/rawfile.c b/source/libcli/raw/rawfile.c
index 6981a768002..0cc7385ceeb 100644
--- a/source/libcli/raw/rawfile.c
+++ b/source/libcli/raw/rawfile.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "smb.h"
 #include "libcli/raw/libcliraw.h"
 
 #define SETUP_REQUEST(cmd, wct, buflen) do { \
diff --git a/source/libcli/raw/smb_signing.c b/source/libcli/raw/smb_signing.c
index df63c33cb9b..a73db78f7b7 100644
--- a/source/libcli/raw/smb_signing.c
+++ b/source/libcli/raw/smb_signing.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "smb.h"
 #include "libcli/raw/libcliraw.h"
 #include "lib/crypto/crypto.h"
 
diff --git a/source/libcli/smb2/smb2.h b/source/libcli/smb2/smb2.h
index eb7c10ed9d3..cf84f344422 100644
--- a/source/libcli/smb2/smb2.h
+++ b/source/libcli/smb2/smb2.h
@@ -20,6 +20,8 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include "smb.h"
+
 struct smb2_options {
 	uint32_t timeout;
 };
diff --git a/source/libcli/util/asn1.c b/source/libcli/util/asn1.c
index 0dceb1bba60..db3f7823fab 100644
--- a/source/libcli/util/asn1.c
+++ b/source/libcli/util/asn1.c
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
-#include "asn_1.h"
+#include "libcli/util/asn_1.h"
 
 /* free an asn1 structure */
 void asn1_free(struct asn1_data *data)
diff --git a/source/include/asn_1.h b/source/libcli/util/asn_1.h
similarity index 100%
rename from source/include/asn_1.h
rename to source/libcli/util/asn_1.h
diff --git a/source/libcli/util/clilsa.c b/source/libcli/util/clilsa.c
index 3c7850b7fd6..bf5048b02a6 100644
--- a/source/libcli/util/clilsa.c
+++ b/source/libcli/util/clilsa.c
@@ -28,6 +28,7 @@
 
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 
 struct smblsa_state {
diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c
index a1aa00c5c2e..4f566a36a89 100644
--- a/source/libnet/libnet_join.c
+++ b/source/libnet/libnet_join.c
@@ -26,7 +26,7 @@
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
 #include "libcli/cldap/cldap.h"
-#include "include/secrets.h"
+#include "passdb/secrets.h"
 #include "dsdb/samdb/samdb.h"
 
 /*
diff --git a/source/libnet/libnet_passwd.c b/source/libnet/libnet_passwd.c
index ec97eea8385..bd09e306ce2 100644
--- a/source/libnet/libnet_passwd.c
+++ b/source/libnet/libnet_passwd.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "smb.h"
 #include "libnet/libnet.h"
 #include "lib/crypto/crypto.h"
 
diff --git a/source/main.mk b/source/main.mk
index a600df1a0b7..018ab0ebbb8 100644
--- a/source/main.mk
+++ b/source/main.mk
@@ -215,6 +215,7 @@ librpc/ndr/libndr.h: librpc/ndr/libndr_proto.h librpc/gen_ndr/misc.h
 librpc/rpc/dcerpc.h: librpc/rpc/dcerpc_proto.h
 auth/credentials/credentials.h: auth/credentials/credentials_proto.h
 libcli/nbt/libnbt.h: libcli/nbt/nbt_proto.h
+lib/charset/charset.h: lib/charset/charset_proto.h
 
 include/includes.h: \
 		include/config.h \
@@ -223,7 +224,8 @@ include/includes.h: \
 		librpc/rpc/dcerpc.h \
 		auth/credentials/credentials_proto.h \
 		libcli/nbt/libnbt.h \
-		lib/basic.h
+		lib/basic.h \
+		lib/charset/charset.h
 
 clean_pch: 
 	-rm -f include/includes.h.gch
diff --git a/source/ntvfs/common/brlock.c b/source/ntvfs/common/brlock.c
index e06cb0602e8..3fc3c09316a 100644
--- a/source/ntvfs/common/brlock.c
+++ b/source/ntvfs/common/brlock.c
@@ -28,7 +28,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "lib/tdb/include/tdb.h"
-#include "messages.h"
+#include "messaging/messaging.h"
 #include "db_wrap.h"
 #include "lib/messaging/irpc.h"
 
diff --git a/source/ntvfs/common/opendb.c b/source/ntvfs/common/opendb.c
index 72e9fff1c6d..7d45f38840d 100644
--- a/source/ntvfs/common/opendb.c
+++ b/source/ntvfs/common/opendb.c
@@ -41,9 +41,10 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "lib/tdb/include/tdb.h"
-#include "messages.h"
+#include "messaging/messaging.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "db_wrap.h"
+#include "smb_server/smb_server.h"
 #include "lib/messaging/irpc.h"
 
 struct odb_context {
diff --git a/source/ntvfs/posix/pvfs_lock.c b/source/ntvfs/posix/pvfs_lock.c
index a0832723b60..5031e4cef7a 100644
--- a/source/ntvfs/posix/pvfs_lock.c
+++ b/source/ntvfs/posix/pvfs_lock.c
@@ -24,7 +24,7 @@
 #include "vfs_posix.h"
 #include "system/time.h"
 #include "dlinklist.h"
-#include "messages.h"
+#include "messaging/messaging.h"
 
 
 /*
diff --git a/source/ntvfs/posix/pvfs_open.c b/source/ntvfs/posix/pvfs_open.c
index 0e2a85bab1f..5aeb5eb7e81 100644
--- a/source/ntvfs/posix/pvfs_open.c
+++ b/source/ntvfs/posix/pvfs_open.c
@@ -25,7 +25,7 @@
 #include "system/dir.h"
 #include "system/time.h"
 #include "dlinklist.h"
-#include "messages.h"
+#include "messaging/messaging.h"
 #include "librpc/gen_ndr/ndr_xattr.h"
 
 /*
diff --git a/source/ntvfs/simple/svfs_util.c b/source/ntvfs/simple/svfs_util.c
index d332abb0910..ab1eccc5518 100644
--- a/source/ntvfs/simple/svfs_util.c
+++ b/source/ntvfs/simple/svfs_util.c
@@ -28,6 +28,7 @@
 #include "svfs.h"
 #include "system/time.h"
 #include "system/dir.h"
+#include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
 
 /*
diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index 72eb1d83cde..08abc3aa480 100644
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -53,6 +53,7 @@
  */
 
 #include "includes.h"
+#include "smb.h"
 #include "version.h"
 #include "dynconfig.h"
 #include "pstring.h"
diff --git a/source/include/secrets.h b/source/passdb/secrets.h
similarity index 100%
rename from source/include/secrets.h
rename to source/passdb/secrets.h
diff --git a/source/scripting/ejs/smbcalls_cli.c b/source/scripting/ejs/smbcalls_cli.c
index cc97282038f..e165222a984 100644
--- a/source/scripting/ejs/smbcalls_cli.c
+++ b/source/scripting/ejs/smbcalls_cli.c
@@ -26,7 +26,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
-#include "clilist.h"
+#include "libcli/libcli.h"
 
 #if 0
 
diff --git a/source/smb_server/smb_server.h b/source/smb_server/smb_server.h
index 3280706eca5..f673425dd39 100644
--- a/source/smb_server/smb_server.h
+++ b/source/smb_server/smb_server.h
@@ -20,6 +20,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include "smb.h"
 #include "request.h"
 #include "smbd/process_model.h"
 
diff --git a/source/torture/basic/aliases.c b/source/torture/basic/aliases.c
index a693d18ce3e..104fdc19333 100644
--- a/source/torture/basic/aliases.c
+++ b/source/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/source/torture/basic/attr.c b/source/torture/basic/attr.c
index 5d13a5f689c..e321993749a 100644
--- a/source/torture/basic/attr.c
+++ b/source/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/source/torture/basic/charset.c b/source/torture/basic/charset.c
index 7becdcd8e5c..186b265e193 100644
--- a/source/torture/basic/charset.c
+++ b/source/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/source/torture/basic/delaywrite.c b/source/torture/basic/delaywrite.c
index 5523e1bb41e..2c26f21ddc9 100644
--- a/source/torture/basic/delaywrite.c
+++ b/source/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/source/torture/basic/delete.c b/source/torture/basic/delete.c
index 3138f48d0fc..c6ddd4bd700 100644
--- a/source/torture/basic/delete.c
+++ b/source/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/source/torture/basic/denytest.c b/source/torture/basic/denytest.c
index f633f843ffa..2e68efa4eb1 100644
--- a/source/torture/basic/denytest.c
+++ b/source/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/source/torture/basic/dir.c b/source/torture/basic/dir.c
index 49efff8d2e4..9dd62f3aa12 100644
--- a/source/torture/basic/dir.c
+++ b/source/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/source/torture/basic/disconnect.c b/source/torture/basic/disconnect.c
index fca5d1968a4..61b1750b92e 100644
--- a/source/torture/basic/disconnect.c
+++ b/source/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/source/torture/basic/locking.c b/source/torture/basic/locking.c
index e07d0648a7c..307bb0fafc0 100644
--- a/source/torture/basic/locking.c
+++ b/source/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/source/torture/basic/mangle_test.c b/source/torture/basic/mangle_test.c
index 29bb4fcd18f..8317a4ee180 100644
--- a/source/torture/basic/mangle_test.c
+++ b/source/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/source/torture/basic/properties.c b/source/torture/basic/properties.c
index 25a787deadb..c20edf545b6 100644
--- a/source/torture/basic/properties.c
+++ b/source/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/source/torture/basic/rename.c b/source/torture/basic/rename.c
index cdb2340b76c..4bdc6f2d9f3 100644
--- a/source/torture/basic/rename.c
+++ b/source/torture/basic/rename.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "libcli/libcli.h"
 #include "torture/torture.h"
 
 /*
diff --git a/source/torture/basic/scanner.c b/source/torture/basic/scanner.c
index 5d48ee71248..6e79745e890 100644
--- a/source/torture/basic/scanner.c
+++ b/source/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/source/torture/basic/secleak.c b/source/torture/basic/secleak.c
index 70fd50834e2..20b7e8a5791 100644
--- a/source/torture/basic/secleak.c
+++ b/source/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/source/torture/basic/unlink.c b/source/torture/basic/unlink.c
index ec889078aa3..d99fec5ee80 100644
--- a/source/torture/basic/unlink.c
+++ b/source/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/source/torture/basic/utable.c b/source/torture/basic/utable.c
index f3f7429021c..e76627fb03d 100644
--- a/source/torture/basic/utable.c
+++ b/source/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/source/torture/gentest.c b/source/torture/gentest.c
index a576b574585..a82b8998864 100644
--- a/source/torture/gentest.c
+++ b/source/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/source/torture/locktest.c b/source/torture/locktest.c
index be2d3022da5..02bf901428b 100644
--- a/source/torture/locktest.c
+++ b/source/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/source/torture/masktest.c b/source/torture/masktest.c
index ca5bdf7c21e..cb88e573e26 100644
--- a/source/torture/masktest.c
+++ b/source/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/source/torture/nbench/nbench.c b/source/torture/nbench/nbench.c
index 353140a7063..4357dd53a10 100644
--- a/source/torture/nbench/nbench.c
+++ b/source/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/source/torture/nbench/nbio.c b/source/torture/nbench/nbio.c
index 40d9277c6ed..3e4c9a0f924 100644
--- a/source/torture/nbench/nbio.c
+++ b/source/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/source/torture/rap/rap.c b/source/torture/rap/rap.c
index 1b98275e93f..e9cb45e3b01 100644
--- a/source/torture/rap/rap.c
+++ b/source/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/source/torture/raw/acls.c b/source/torture/raw/acls.c
index 119377731be..6450acab18a 100644
--- a/source/torture/raw/acls.c
+++ b/source/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/source/torture/raw/chkpath.c b/source/torture/raw/chkpath.c
index 92fe5dd2d51..4b19372b105 100644
--- a/source/torture/raw/chkpath.c
+++ b/source/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/source/torture/raw/close.c b/source/torture/raw/close.c
index 67050f30a3a..e19fe0f3cb4 100644
--- a/source/torture/raw/close.c
+++ b/source/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/source/torture/raw/composite.c b/source/torture/raw/composite.c
index f9fe0eb83c6..760d464fb53 100644
--- a/source/torture/raw/composite.c
+++ b/source/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/source/torture/raw/context.c b/source/torture/raw/context.c
index 8a8bfc85fb6..43e059e23d7 100644
--- a/source/torture/raw/context.c
+++ b/source/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/source/torture/raw/eas.c b/source/torture/raw/eas.c
index a1f9bbfe521..3bc954d5729 100644
--- a/source/torture/raw/eas.c
+++ b/source/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/source/torture/raw/ioctl.c b/source/torture/raw/ioctl.c
index 5a88e336cbb..0fb48c292b3 100644
--- a/source/torture/raw/ioctl.c
+++ b/source/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/source/torture/raw/lock.c b/source/torture/raw/lock.c
index da3c956afb1..f18df475281 100644
--- a/source/torture/raw/lock.c
+++ b/source/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/source/torture/raw/mkdir.c b/source/torture/raw/mkdir.c
index e1cc33bf84d..ac19ee1187f 100644
--- a/source/torture/raw/mkdir.c
+++ b/source/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/source/torture/raw/mux.c b/source/torture/raw/mux.c
index d941c01f1a7..97a1bf3cc4a 100644
--- a/source/torture/raw/mux.c
+++ b/source/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/source/torture/raw/notify.c b/source/torture/raw/notify.c
index e28ab3a5405..9a5831d69c8 100644
--- a/source/torture/raw/notify.c
+++ b/source/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/source/torture/raw/open.c b/source/torture/raw/open.c
index a1d17587e78..2afad96956b 100644
--- a/source/torture/raw/open.c
+++ b/source/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/source/torture/raw/oplock.c b/source/torture/raw/oplock.c
index 512e42d8671..64da410bd27 100644
--- a/source/torture/raw/oplock.c
+++ b/source/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/source/torture/raw/qfileinfo.c b/source/torture/raw/qfileinfo.c
index 57a2ac69c04..6ed57227ac1 100644
--- a/source/torture/raw/qfileinfo.c
+++ b/source/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/source/torture/raw/qfsinfo.c b/source/torture/raw/qfsinfo.c
index 2edceeb2b16..26bac4c0ad0 100644
--- a/source/torture/raw/qfsinfo.c
+++ b/source/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/source/torture/raw/read.c b/source/torture/raw/read.c
index cb400d871fd..aab879a1d1a 100644
--- a/source/torture/raw/read.c
+++ b/source/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/source/torture/raw/rename.c b/source/torture/raw/rename.c
index 99d8116b319..c1b24f2b3ad 100644
--- a/source/torture/raw/rename.c
+++ b/source/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/source/torture/raw/search.c b/source/torture/raw/search.c
index 80d1bb5b3f5..5cb67b068ee 100644
--- a/source/torture/raw/search.c
+++ b/source/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/source/torture/raw/seek.c b/source/torture/raw/seek.c
index cf16ed2354a..b0993b67cc3 100644
--- a/source/torture/raw/seek.c
+++ b/source/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/source/torture/raw/setfileinfo.c b/source/torture/raw/setfileinfo.c
index 8055fc7575f..29521980bef 100644
--- a/source/torture/raw/setfileinfo.c
+++ b/source/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/source/torture/raw/streams.c b/source/torture/raw/streams.c
index 71ff9332fd7..22b7d06cdda 100644
--- a/source/torture/raw/streams.c
+++ b/source/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/source/torture/raw/unlink.c b/source/torture/raw/unlink.c
index fc92668f385..4c91ab58ba3 100644
--- a/source/torture/raw/unlink.c
+++ b/source/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/source/torture/raw/write.c b/source/torture/raw/write.c
index 26289506064..4209d668920 100644
--- a/source/torture/raw/write.c
+++ b/source/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/source/torture/rpc/netlogon.c b/source/torture/rpc/netlogon.c
index bdeda056138..ab123627596 100644
--- a/source/torture/rpc/netlogon.c
+++ b/source/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/source/torture/rpc/samr.c b/source/torture/rpc/samr.c
index d373e0c817d..e109bb7f302 100644
--- a/source/torture/rpc/samr.c
+++ b/source/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/source/torture/rpc/testjoin.c b/source/torture/rpc/testjoin.c
index 622b6ac08ad..f844ad8ca85 100644
--- a/source/torture/rpc/testjoin.c
+++ b/source/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/source/torture/smb2/connect.c b/source/torture/smb2/connect.c
index 2077bb02276..d4016b87703 100644
--- a/source/torture/smb2/connect.c
+++ b/source/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/source/torture/torture.c b/source/torture/torture.c
index ff1a72799b3..fd8fc6fd6b0 100644
--- a/source/torture/torture.c
+++ b/source/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/source/torture/torture_util.c b/source/torture/torture_util.c
index ce457582d3e..fefbfcf5681 100644
--- a/source/torture/torture_util.c
+++ b/source/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"