From: Volker Lendecke <vl@samba.org>
Date: Tue, 13 May 2025 14:25:07 +0000 (+0200)
Subject: libsmb: Remove "source3/libsmb/libsmb.h"
X-Git-Tag: tevent-0.17.0~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d0ab4b80651ccde8e98ed8917c0ec7c59dc7628;p=thirdparty%2Fsamba.git

libsmb: Remove "source3/libsmb/libsmb.h"

libsmb.h added ads_status.h and cli_smb2_fnum.h. Only few users need
either.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/lib/fuzzing/fuzz_nmblib_parse_packet.c b/lib/fuzzing/fuzz_nmblib_parse_packet.c
index c8a2d035ef7..7c0de12b9f4 100644
--- a/lib/fuzzing/fuzz_nmblib_parse_packet.c
+++ b/lib/fuzzing/fuzz_nmblib_parse_packet.c
@@ -17,7 +17,7 @@
 */
 
 #include "../../source3/include/includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/proto.h"
 #include "libsmb/nmblib.h"
 #include "fuzzing/fuzzing.h"
 
diff --git a/libgpo/gpo_fetch.c b/libgpo/gpo_fetch.c
index 31d510db2a2..2449ae4bcb6 100644
--- a/libgpo/gpo_fetch.c
+++ b/libgpo/gpo_fetch.c
@@ -23,7 +23,6 @@
 #include "../libgpo/gpo_ini.h"
 
 #include "libgpo/gpo_proto.h"
-#include "libsmb/libsmb.h"
 
 /****************************************************************
  explode the GPO CIFS URI into their components
diff --git a/libgpo/gpo_filesync.c b/libgpo/gpo_filesync.c
index b0d1447bd85..07234dc37a4 100644
--- a/libgpo/gpo_filesync.c
+++ b/libgpo/gpo_filesync.c
@@ -19,7 +19,8 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "../libgpo/gpo.h"
 #include "libgpo/gpo_proto.h"
 #include "lib/util/string_wrappers.h"
diff --git a/source3/client/client.c b/source3/client/client.c
index e448ded6b6e..7857f7e56f5 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -32,7 +32,8 @@
 #include "../libcli/smbreadline/smbreadline.h"
 #include "../libcli/security/security.h"
 #include "system/select.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmb/smbsock_connect.h"
 #include "libsmb/clirap.h"
 #include "trans2.h"
diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index 2a1efdaf37b..28745d7da44 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -70,7 +70,8 @@
 #include "system/filesys.h"
 #include "client/client_proto.h"
 #include "client/clitar_proto.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "lib/util/util_file.h"
 
 #ifdef HAVE_LIBARCHIVE
diff --git a/source3/client/smbspool.c b/source3/client/smbspool.c
index 56661b98336..c056cc76996 100644
--- a/source3/client/smbspool.c
+++ b/source3/client/smbspool.c
@@ -26,7 +26,8 @@
 #include "system/filesys.h"
 #include "system/passwd.h"
 #include "system/kerberos.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmb/smbsock_connect.h"
 #include "lib/param/param.h"
 #include "lib/krb5_wrap/krb5_samba.h"
diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c
index c7a3a0873d6..db3e2d23891 100644
--- a/source3/lib/netapi/cm.c
+++ b/source3/lib/netapi/cm.c
@@ -21,7 +21,8 @@
 
 #include "lib/netapi/netapi.h"
 #include "lib/netapi/netapi_private.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "rpc_client/cli_pipe.h"
 #include "../libcli/smb/smbXcli_base.h"
 
diff --git a/source3/lib/util_sd.c b/source3/lib/util_sd.c
index 23f37b7e734..86e375cb0dd 100644
--- a/source3/lib/util_sd.c
+++ b/source3/lib/util_sd.c
@@ -22,7 +22,8 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "util_sd.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "../libcli/security/security.h"
diff --git a/source3/libads/trusts_util.c b/source3/libads/trusts_util.c
index 6a39f32f350..9bea87990b6 100644
--- a/source3/libads/trusts_util.c
+++ b/source3/libads/trusts_util.c
@@ -29,7 +29,6 @@
 #include "secrets.h"
 #include "ads.h"
 #include "passdb.h"
-#include "libsmb/libsmb.h"
 #include "source3/include/messages.h"
 #include "source3/include/g_lock.h"
 #include "lib/util/util_tdb.h"
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 439bd2c01a9..c33724494aa 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -19,6 +19,8 @@
  */
 
 #include "includes.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "ads.h"
 #include "libsmb/namequery.h"
 #include "librpc/gen_ndr/ndr_libnet_join.h"
@@ -35,10 +37,10 @@
 #include "../libds/common/flags.h"
 #include "secrets.h"
 #include "rpc_client/init_lsa.h"
+
 #include "rpc_client/cli_pipe.h"
 #include "../libcli/security/security.h"
 #include "passdb.h"
-#include "libsmb/libsmb.h"
 #include "../libcli/smb/smbXcli_base.h"
 #include "lib/param/loadparm.h"
 #include "libcli/auth/netlogon_creds_cli.h"
diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index 3e626d1cc8c..8c8003c5641 100644
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -18,7 +18,7 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
 #include "../libcli/smb/smbXcli_base.h"
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index d83a820f9e1..9dfdb8aefae 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -21,7 +21,9 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
+#include "libads/ads_status.h"
 #include "libsmb/namequery.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "auth/credentials/credentials.h"
diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index cafb1b421a6..cb0d8a88ecc 100644
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -20,7 +20,8 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmb/clirap.h"
 #include "msdfs.h"
 #include "trans2.h"
diff --git a/source3/libsmb/clidgram.c b/source3/libsmb/clidgram.c
index c87c870345f..719da9d5c50 100644
--- a/source3/libsmb/clidgram.c
+++ b/source3/libsmb/clidgram.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "libsmb/clidgram.h"
 #include "libsmb/nmblib.h"
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index d699f035847..f9d756fcd5f 100644
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -19,7 +19,8 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "../libcli/smb/smb_signing.h"
 #include "../libcli/smb/smb_seal.h"
diff --git a/source3/libsmb/clierror.c b/source3/libsmb/clierror.c
index 3a024ea22e3..d443cf7255b 100644
--- a/source3/libsmb/clierror.c
+++ b/source3/libsmb/clierror.c
@@ -20,7 +20,8 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "../libcli/smb/smbXcli_base.h"
 
 int cli_status_to_errno(NTSTATUS status)
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index c079f84049e..981829c0e37 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -20,7 +20,9 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
+#include "source3/libsmb/cli_smb2_fnum.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
 #include "libsmb/clirap.h"
diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c
index 4b82a0bd1e9..ded07f21a9a 100644
--- a/source3/libsmb/clifsinfo.c
+++ b/source3/libsmb/clifsinfo.c
@@ -20,7 +20,9 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
+#include "source3/libsmb/cli_smb2_fnum.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
 #include "trans2.h"
diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c
index d8951482bac..f954405ba10 100644
--- a/source3/libsmb/clilist.c
+++ b/source3/libsmb/clilist.c
@@ -18,7 +18,9 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
+#include "source3/libsmb/cli_smb2_fnum.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
 #include "trans2.h"
diff --git a/source3/libsmb/climessage.c b/source3/libsmb/climessage.c
index 856361589f5..2f6a1848955 100644
--- a/source3/libsmb/climessage.c
+++ b/source3/libsmb/climessage.c
@@ -20,7 +20,8 @@
 #include "includes.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "../libcli/smb/smbXcli_base.h"
 
 struct cli_message_start_state {
diff --git a/source3/libsmb/clioplock.c b/source3/libsmb/clioplock.c
index aee09da41ec..0ff91045201 100644
--- a/source3/libsmb/clioplock.c
+++ b/source3/libsmb/clioplock.c
@@ -20,7 +20,8 @@
 #include "includes.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "../libcli/smb/smbXcli_base.h"
 
 struct cli_smb_oplock_break_waiter_state {
diff --git a/source3/libsmb/cliprint.c b/source3/libsmb/cliprint.c
index 3808811cccd..728b7da2904 100644
--- a/source3/libsmb/cliprint.c
+++ b/source3/libsmb/cliprint.c
@@ -18,7 +18,8 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmb/clirap.h"
 #include "../libcli/smb/smbXcli_base.h"
 #include "lib/util/string_wrappers.h"
diff --git a/source3/libsmb/cliquota.c b/source3/libsmb/cliquota.c
index 0c41272f21a..865a41ff618 100644
--- a/source3/libsmb/cliquota.c
+++ b/source3/libsmb/cliquota.c
@@ -18,7 +18,9 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
+#include "source3/libsmb/cli_smb2_fnum.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "fake_file.h"
 #include "../libcli/security/security.h"
diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c
index 758d6ccbb1e..99762443cb5 100644
--- a/source3/libsmb/clirap.c
+++ b/source3/libsmb/clirap.c
@@ -24,7 +24,8 @@
 #include "../librpc/gen_ndr/rap.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmb/clirap.h"
 #include "trans2.h"
 #include "../libcli/smb/smbXcli_base.h"
diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
index 0dfcd479cc0..a7bef4497e5 100644
--- a/source3/libsmb/clireadwrite.c
+++ b/source3/libsmb/clireadwrite.c
@@ -18,7 +18,9 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
+#include "source3/libsmb/cli_smb2_fnum.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
 #include "trans2.h"
diff --git a/source3/libsmb/clisecdesc.c b/source3/libsmb/clisecdesc.c
index 853e46a0f0a..32558c148c9 100644
--- a/source3/libsmb/clisecdesc.c
+++ b/source3/libsmb/clisecdesc.c
@@ -18,7 +18,9 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
+#include "source3/libsmb/cli_smb2_fnum.h"
 #include "../libcli/security/secdesc.h"
 #include "../libcli/smb/smbXcli_base.h"
 #include "lib/util/tevent_ntstatus.h"
diff --git a/source3/libsmb/clisymlink.c b/source3/libsmb/clisymlink.c
index d7ecf545761..c8632cde848 100644
--- a/source3/libsmb/clisymlink.c
+++ b/source3/libsmb/clisymlink.c
@@ -19,7 +19,8 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
 #include "libsmb/clirap.h"
diff --git a/source3/libsmb/clitrans.c b/source3/libsmb/clitrans.c
index 2cd75d2a800..5a53f762200 100644
--- a/source3/libsmb/clitrans.c
+++ b/source3/libsmb/clitrans.c
@@ -18,7 +18,8 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
 #include "../libcli/smb/smbXcli_base.h"
diff --git a/source3/libsmb/libsmb.h b/source3/libsmb/libsmb.h
deleted file mode 100644
index 6df06aef4d8..00000000000
--- a/source3/libsmb/libsmb.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-
-   Copyright (C) Andrew Tridgell 1992-1998,2001
-   Copyright (C) Jeremy Allison 1998
-   Copyright (C) Remus Koos 2001
-   Copyright (C) Andrew Bartlett 2001
-
-   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 3 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, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _LIBSMB_LIBSMB_H
-#define _LIBSMB_LIBSMB_H
-
-#include "client.h"
-#include "libads/ads_status.h"
-#include "libsmb/proto.h"
-#include "libsmb/cli_smb2_fnum.h"
-
-#endif /* _LIBSMB_LIBSMB_H */
diff --git a/source3/libsmb/libsmb_cache.c b/source3/libsmb/libsmb_cache.c
index 91292b1b3e2..227f876655c 100644
--- a/source3/libsmb/libsmb_cache.c
+++ b/source3/libsmb/libsmb_cache.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/libsmb/proto.h"
 #include "libsmbclient.h"
 #include "libsmb_internal.h"
 
diff --git a/source3/libsmb/libsmb_context.c b/source3/libsmb/libsmb_context.c
index 55847f6b970..25052f84da3 100644
--- a/source3/libsmb/libsmb_context.c
+++ b/source3/libsmb/libsmb_context.c
@@ -23,7 +23,8 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmbclient.h"
 #include "libsmb_internal.h"
 #include "secrets.h"
diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c
index 1d2743df56b..8f98da1b28a 100644
--- a/source3/libsmb/libsmb_dir.c
+++ b/source3/libsmb/libsmb_dir.c
@@ -24,7 +24,8 @@
 
 #include "includes.h"
 #include "libsmb/namequery.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmbclient.h"
 #include "libsmb_internal.h"
 #include "rpc_client/cli_pipe.h"
diff --git a/source3/libsmb/libsmb_file.c b/source3/libsmb/libsmb_file.c
index f329763edd5..2b29287200f 100644
--- a/source3/libsmb/libsmb_file.c
+++ b/source3/libsmb/libsmb_file.c
@@ -23,7 +23,8 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmbclient.h"
 #include "libsmb_internal.h"
 #include "../libcli/smb/smbXcli_base.h"
diff --git a/source3/libsmb/libsmb_misc.c b/source3/libsmb/libsmb_misc.c
index 450989567fc..e17f2bae99c 100644
--- a/source3/libsmb/libsmb_misc.c
+++ b/source3/libsmb/libsmb_misc.c
@@ -23,7 +23,6 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
 #include "libsmbclient.h"
 #include "libsmb_internal.h"
 
diff --git a/source3/libsmb/libsmb_printjob.c b/source3/libsmb/libsmb_printjob.c
index 2b05dd077cf..62955d32ce3 100644
--- a/source3/libsmb/libsmb_printjob.c
+++ b/source3/libsmb/libsmb_printjob.c
@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/libsmb/proto.h"
 #include "libsmbclient.h"
 #include "libsmb_internal.h"
 
diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
index c27f85d72dc..f9b52e1f05a 100644
--- a/source3/libsmb/libsmb_server.c
+++ b/source3/libsmb/libsmb_server.c
@@ -24,7 +24,8 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmbclient.h"
 #include "libsmb_internal.h"
 #include "../librpc/gen_ndr/ndr_lsa.h"
diff --git a/source3/libsmb/libsmb_stat.c b/source3/libsmb/libsmb_stat.c
index 1e886fc9920..56192b61333 100644
--- a/source3/libsmb/libsmb_stat.c
+++ b/source3/libsmb/libsmb_stat.c
@@ -23,7 +23,8 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmbclient.h"
 #include "libsmb_internal.h"
 #include "../libcli/smb/smbXcli_base.h"
diff --git a/source3/libsmb/libsmb_xattr.c b/source3/libsmb/libsmb_xattr.c
index 8ebddec96bb..79555e5923e 100644
--- a/source3/libsmb/libsmb_xattr.c
+++ b/source3/libsmb/libsmb_xattr.c
@@ -23,7 +23,8 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmbclient.h"
 #include "libsmb_internal.h"
 #include "../librpc/gen_ndr/ndr_lsa.h"
diff --git a/source3/libsmb/passchange.c b/source3/libsmb/passchange.c
index eafad9a0423..bd57349b574 100644
--- a/source3/libsmb/passchange.c
+++ b/source3/libsmb/passchange.c
@@ -21,7 +21,8 @@
 #include "../librpc/gen_ndr/ndr_samr.h"
 #include "rpc_client/cli_pipe.h"
 #include "rpc_client/cli_samr.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmb/clirap.h"
 #include "libsmb/nmblib.h"
 #include "../libcli/smb/smbXcli_base.h"
diff --git a/source3/libsmb/pylibsmb.c b/source3/libsmb/pylibsmb.c
index 87dc460c0fe..67872d8e3b1 100644
--- a/source3/libsmb/pylibsmb.c
+++ b/source3/libsmb/pylibsmb.c
@@ -53,7 +53,9 @@ c = libsmb.Conn("127.0.0.1",
 #include "libcli/smb/smbXcli_base.h"
 #include "libcli/smb/smb2_negotiate_context.h"
 #include "libcli/smb/reparse.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
+#include "source3/libsmb/cli_smb2_fnum.h"
 #include "libcli/security/security.h"
 #include "system/select.h"
 #include "source4/libcli/util/pyerrors.h"
diff --git a/source3/nmbd/nmbd_packets.c b/source3/nmbd/nmbd_packets.c
index 1da365762e6..d2f410e8cce 100644
--- a/source3/nmbd/nmbd_packets.c
+++ b/source3/nmbd/nmbd_packets.c
@@ -23,7 +23,6 @@
 #include "nmbd/nmbd.h"
 #include "../lib/util/select.h"
 #include "system/select.h"
-#include "libsmb/libsmb.h"
 #include "libsmb/unexpected.h"
 #include "lib/util/string_wrappers.h"
 
diff --git a/source3/nmbd/nmbd_synclists.c b/source3/nmbd/nmbd_synclists.c
index 0523a902af2..623db9f47ca 100644
--- a/source3/nmbd/nmbd_synclists.c
+++ b/source3/nmbd/nmbd_synclists.c
@@ -29,7 +29,8 @@
 #include "system/filesys.h"
 #include "../librpc/gen_ndr/svcctl.h"
 #include "nmbd/nmbd.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmb/clirap.h"
 #include "../libcli/smb/smbXcli_base.h"
 #include "lib/util/string_wrappers.h"
diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c
index 2c2053ef910..15ca6227a37 100644
--- a/source3/rpc_client/cli_netlogon.c
+++ b/source3/rpc_client/cli_netlogon.c
@@ -22,7 +22,6 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "libsmb/libsmb.h"
 #include "rpc_client/rpc_client.h"
 #include "rpc_client/cli_pipe.h"
 #include "../libcli/auth/libcli_auth.h"
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 23adbbc62fa..e3f48526492 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -37,7 +37,8 @@
 #include "librpc/rpc/dcerpc_util.h"
 #include "rpc_dce.h"
 #include "cli_pipe.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "auth/gensec/gensec.h"
 #include "auth/credentials/credentials.h"
 #include "auth/auth_util.h"
diff --git a/source3/rpc_client/cli_pipe_schannel.c b/source3/rpc_client/cli_pipe_schannel.c
index 23d3ba486af..b688b614686 100644
--- a/source3/rpc_client/cli_pipe_schannel.c
+++ b/source3/rpc_client/cli_pipe_schannel.c
@@ -25,7 +25,6 @@
 #include "rpc_client/cli_pipe.h"
 #include "librpc/rpc/dcerpc.h"
 #include "passdb.h"
-#include "libsmb/libsmb.h"
 #include "../libcli/smb/smbXcli_base.h"
 #include "libcli/auth/netlogon_creds_cli.h"
 #include "auth/gensec/gensec.h"
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index fa82ba41034..696259a87bf 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -54,7 +54,8 @@
 #include "messages.h"
 #include "rpc_server/spoolss/srv_spoolss_nt.h"
 #include "util_tdb.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "printing/printer_list.h"
 #include "../lib/tsocket/tsocket.h"
 #include "rpc_client/cli_winreg_spoolss.h"
diff --git a/source3/rpcclient/cmd_iremotewinspool.c b/source3/rpcclient/cmd_iremotewinspool.c
index 7162605696f..9782f711938 100644
--- a/source3/rpcclient/cmd_iremotewinspool.c
+++ b/source3/rpcclient/cmd_iremotewinspool.c
@@ -21,7 +21,6 @@
 #include "includes.h"
 #include "rpcclient.h"
 #include "../librpc/gen_ndr/ndr_winspool.h"
-#include "libsmb/libsmb.h"
 #include "auth/gensec/gensec.h"
 #include "auth/credentials/credentials.h"
 #include "rpc_client/init_spoolss.h"
diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index 8d98fc27809..53636608ef5 100644
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -32,7 +32,8 @@
 #include "../libcli/security/display_sec.h"
 #include "../libcli/security/security_descriptor.h"
 #include "../libcli/registry/util_reg.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "lib/util/smb_strtox.h"
 #include "lib/util/string_wrappers.h"
 #include "lib/cmdline/cmdline.h"
diff --git a/source3/rpcclient/cmd_spotlight.c b/source3/rpcclient/cmd_spotlight.c
index ba3f61fd4b0..df837f78f45 100644
--- a/source3/rpcclient/cmd_spotlight.c
+++ b/source3/rpcclient/cmd_spotlight.c
@@ -20,7 +20,6 @@
 
 #include "includes.h"
 #include "rpcclient.h"
-#include "libsmb/libsmb.h"
 #include "../librpc/gen_ndr/ndr_mdssvc_c.h"
 #include "../rpc_server/mdssvc/mdssvc.h"
 #include "../rpc_server/mdssvc/dalloc.h"
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 37b78b8ffef..2ce8cc0ad54 100644
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -30,7 +30,8 @@
 #include "../libcli/smbreadline/smbreadline.h"
 #include "../libcli/security/security.h"
 #include "passdb.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmb/smbsock_connect.h"
 #include "auth/gensec/gensec.h"
 #include "../libcli/smb/smbXcli_base.h"
diff --git a/source3/smbd/ntquotas.c b/source3/smbd/ntquotas.c
index 5705a4f13ad..dbbd2f7842c 100644
--- a/source3/smbd/ntquotas.c
+++ b/source3/smbd/ntquotas.c
@@ -22,7 +22,8 @@
 #include "../lib/util/util_pw.h"
 #include "system/passwd.h"
 #include "passdb/lookup_sid.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libcli/security/dom_sid.h"
 
 #undef DBGC_CLASS
diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c
index 0f1ceaf4044..958cbcaa6aa 100644
--- a/source3/smbd/seal.c
+++ b/source3/smbd/seal.c
@@ -22,7 +22,6 @@
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_seal.h"
 #include "auth.h"
-#include "libsmb/libsmb.h"
 #include "../lib/tsocket/tsocket.h"
 #include "auth/gensec/gensec.h"
 
diff --git a/source3/smbd/smb1_nttrans.c b/source3/smbd/smb1_nttrans.c
index 1d2bae76f89..61f9c82f185 100644
--- a/source3/smbd/smb1_nttrans.c
+++ b/source3/smbd/smb1_nttrans.c
@@ -28,7 +28,6 @@
 #include "passdb/lookup_sid.h"
 #include "auth.h"
 #include "smbprofile.h"
-#include "libsmb/libsmb.h"
 #include "lib/util_ea.h"
 #include "librpc/gen_ndr/ndr_quota.h"
 #include "librpc/gen_ndr/ndr_security.h"
diff --git a/source3/smbd/smb2_nttrans.c b/source3/smbd/smb2_nttrans.c
index 19e78ab1394..06eb04c8a07 100644
--- a/source3/smbd/smb2_nttrans.c
+++ b/source3/smbd/smb2_nttrans.c
@@ -28,7 +28,7 @@
 #include "passdb/lookup_sid.h"
 #include "auth.h"
 #include "smbprofile.h"
-#include "libsmb/libsmb.h"
+#include "source3/libsmb/proto.h"
 #include "lib/util_ea.h"
 #include "librpc/gen_ndr/ndr_quota.h"
 #include "librpc/gen_ndr/ndr_security.h"
diff --git a/source3/torture/denytest.c b/source3/torture/denytest.c
index 34497c3b9bb..ed35bcbdf09 100644
--- a/source3/torture/denytest.c
+++ b/source3/torture/denytest.c
@@ -20,7 +20,6 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "torture/proto.h"
-#include "libsmb/libsmb.h"
 
 extern bool torture_showall;
 
diff --git a/source3/torture/locktest2.c b/source3/torture/locktest2.c
index 35b40c12d8b..36c6479e584 100644
--- a/source3/torture/locktest2.c
+++ b/source3/torture/locktest2.c
@@ -18,7 +18,8 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "system/filesys.h"
 #include "locking/share_mode_lock.h"
 #include "locking/proto.h"
diff --git a/source3/torture/mangle_test.c b/source3/torture/mangle_test.c
index 92754b9eeb6..b6cd08358e0 100644
--- a/source3/torture/mangle_test.c
+++ b/source3/torture/mangle_test.c
@@ -20,7 +20,6 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "torture/proto.h"
-#include "libsmb/libsmb.h"
 #include "libsmb/clirap.h"
 #include "util_tdb.h"
 #include "lib/util/string_wrappers.h"
diff --git a/source3/torture/nbench.c b/source3/torture/nbench.c
index 8646d7a9b7c..64ee117a40d 100644
--- a/source3/torture/nbench.c
+++ b/source3/torture/nbench.c
@@ -19,7 +19,6 @@
 
 #include "includes.h"
 #include "torture/proto.h"
-#include "libsmb/libsmb.h"
 #include "libsmb/clirap.h"
 #include "../lib/util/tevent_ntstatus.h"
 
diff --git a/source3/torture/nbio.c b/source3/torture/nbio.c
index 4fedfc59912..820cb07c564 100644
--- a/source3/torture/nbio.c
+++ b/source3/torture/nbio.c
@@ -22,7 +22,6 @@
 #include "includes.h"
 #include "torture/proto.h"
 #include "../libcli/security/security.h"
-#include "libsmb/libsmb.h"
 #include "libsmb/clirap.h"
 
 #define MAX_FILES 1000
diff --git a/source3/torture/proto.h b/source3/torture/proto.h
index 26b51209639..8783776a2c3 100644
--- a/source3/torture/proto.h
+++ b/source3/torture/proto.h
@@ -23,7 +23,8 @@
 #ifndef __TORTURE_H__
 #define __TORTURE_H__
 
-struct cli_state;
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 
 /* The following definitions come from torture/denytest.c  */
 
diff --git a/source3/torture/scanner.c b/source3/torture/scanner.c
index ad44f33dd9c..161e04cdaeb 100644
--- a/source3/torture/scanner.c
+++ b/source3/torture/scanner.c
@@ -20,7 +20,6 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "torture/proto.h"
-#include "libsmb/libsmb.h"
 #include "../libcli/smb/smbXcli_base.h"
 
 #define VERBOSE 0
diff --git a/source3/torture/test_async_echo.c b/source3/torture/test_async_echo.c
index f21daa4485c..fab9267a935 100644
--- a/source3/torture/test_async_echo.c
+++ b/source3/torture/test_async_echo.c
@@ -19,7 +19,6 @@
 
 #include "includes.h"
 #include "torture/proto.h"
-#include "libsmb/libsmb.h"
 #include "rpc_client/cli_pipe.h"
 #include "librpc/gen_ndr/ndr_echo_c.h"
 
diff --git a/source3/torture/test_buffersize.c b/source3/torture/test_buffersize.c
index 217b1486efa..731c2195cbe 100644
--- a/source3/torture/test_buffersize.c
+++ b/source3/torture/test_buffersize.c
@@ -19,7 +19,6 @@
 
 #include "includes.h"
 #include "torture/proto.h"
-#include "libsmb/libsmb.h"
 #include "libcli/security/dom_sid.h"
 #include "libcli/security/secdesc.h"
 #include "libcli/security/security.h"
diff --git a/source3/torture/test_case_insensitive.c b/source3/torture/test_case_insensitive.c
index 04e2dce2a79..8921b15ea56 100644
--- a/source3/torture/test_case_insensitive.c
+++ b/source3/torture/test_case_insensitive.c
@@ -20,7 +20,6 @@
 #include "includes.h"
 #include "torture/proto.h"
 #include "system/filesys.h"
-#include "libsmb/libsmb.h"
 
 /*
  * Regression test file creates on case insensitive file systems (e.g. OS/X)
diff --git a/source3/torture/test_chain3.c b/source3/torture/test_chain3.c
index 5320ef898f0..f4b056e8e4a 100644
--- a/source3/torture/test_chain3.c
+++ b/source3/torture/test_chain3.c
@@ -20,7 +20,6 @@
 
 #include "includes.h"
 #include "torture/proto.h"
-#include "libsmb/libsmb.h"
 #include "system/filesys.h"
 #include "async_smb.h"
 #include "lib/util/tevent_ntstatus.h"
diff --git a/source3/torture/test_cleanup.c b/source3/torture/test_cleanup.c
index 2ff5cf6f31f..ff62870e227 100644
--- a/source3/torture/test_cleanup.c
+++ b/source3/torture/test_cleanup.c
@@ -22,7 +22,6 @@
 #include "torture/proto.h"
 #include "system/filesys.h"
 #include "system/select.h"
-#include "libsmb/libsmb.h"
 #include "libcli/smb/smbXcli_base.h"
 #include "libcli/security/security.h"
 #include "librpc/gen_ndr/open_files.h"
diff --git a/source3/torture/test_hidenewfiles.c b/source3/torture/test_hidenewfiles.c
index 6d6811c7684..82a66a76f54 100644
--- a/source3/torture/test_hidenewfiles.c
+++ b/source3/torture/test_hidenewfiles.c
@@ -19,7 +19,6 @@
 
 #include "includes.h"
 #include "torture/proto.h"
-#include "libsmb/libsmb.h"
 #include "libcli/security/security.h"
 
 static NTSTATUS servertime(
diff --git a/source3/torture/test_notify.c b/source3/torture/test_notify.c
index b265845f822..6fc4c6f642b 100644
--- a/source3/torture/test_notify.c
+++ b/source3/torture/test_notify.c
@@ -19,7 +19,6 @@
 
 #include "includes.h"
 #include "torture/proto.h"
-#include "libsmb/libsmb.h"
 #include "lib/util/tevent_ntstatus.h"
 #include "libcli/security/security.h"
 #include "lib/tevent_barrier.h"
diff --git a/source3/torture/test_notify_online.c b/source3/torture/test_notify_online.c
index d8a5d37e33f..d3c9f44d25c 100644
--- a/source3/torture/test_notify_online.c
+++ b/source3/torture/test_notify_online.c
@@ -21,7 +21,6 @@
 #include "torture/proto.h"
 #include "libcli/security/security.h"
 #include "lib/util/tevent_ntstatus.h"
-#include "libsmb/libsmb.h"
 
 extern char *test_filename;
 
diff --git a/source3/torture/test_nttrans_create.c b/source3/torture/test_nttrans_create.c
index 5e7ce7e16c3..143c728bd75 100644
--- a/source3/torture/test_nttrans_create.c
+++ b/source3/torture/test_nttrans_create.c
@@ -19,7 +19,6 @@
 
 #include "includes.h"
 #include "torture/proto.h"
-#include "libsmb/libsmb.h"
 #include "libcli/security/dom_sid.h"
 #include "libcli/security/secdesc.h"
 #include "libcli/security/security.h"
diff --git a/source3/torture/test_nttrans_fsctl.c b/source3/torture/test_nttrans_fsctl.c
index aea80c5431d..401f9b05112 100644
--- a/source3/torture/test_nttrans_fsctl.c
+++ b/source3/torture/test_nttrans_fsctl.c
@@ -20,7 +20,6 @@
 
 #include "includes.h"
 #include "torture/proto.h"
-#include "libsmb/libsmb.h"
 #include "libcli/security/security.h"
 
 bool run_nttrans_fsctl(int dummy)
diff --git a/source3/torture/test_oplock_cancel.c b/source3/torture/test_oplock_cancel.c
index 86ce5b76d77..403c03c979e 100644
--- a/source3/torture/test_oplock_cancel.c
+++ b/source3/torture/test_oplock_cancel.c
@@ -22,7 +22,6 @@
 #include "torture/proto.h"
 #include "system/filesys.h"
 #include "system/select.h"
-#include "libsmb/libsmb.h"
 #include "libcli/smb/smbXcli_base.h"
 #include "libcli/security/security.h"
 #include "lib/util/tevent_ntstatus.h"
diff --git a/source3/torture/test_posix.c b/source3/torture/test_posix.c
index 07185615dd5..00d87e94a7e 100644
--- a/source3/torture/test_posix.c
+++ b/source3/torture/test_posix.c
@@ -19,7 +19,6 @@
 #include "includes.h"
 #include "torture/proto.h"
 #include "libcli/security/security.h"
-#include "libsmb/libsmb.h"
 #include "libsmb/clirap.h"
 #include "libsmb/proto.h"
 #include "../libcli/smb/smbXcli_base.h"
diff --git a/source3/torture/test_posix_append.c b/source3/torture/test_posix_append.c
index 3abd448ab7b..cc61941736a 100644
--- a/source3/torture/test_posix_append.c
+++ b/source3/torture/test_posix_append.c
@@ -20,7 +20,6 @@
 #include "includes.h"
 #include "torture/proto.h"
 #include "../libcli/security/security.h"
-#include "libsmb/libsmb.h"
 #include "libsmb/clirap.h"
 
 /*
diff --git a/source3/torture/test_readdir_timestamp.c b/source3/torture/test_readdir_timestamp.c
index 0eba415c8b4..0468fc2aac8 100644
--- a/source3/torture/test_readdir_timestamp.c
+++ b/source3/torture/test_readdir_timestamp.c
@@ -18,7 +18,6 @@
 
 #include "includes.h"
 #include "torture/proto.h"
-#include "libsmb/libsmb.h"
 #include "libsmb/clirap.h"
 #include "lib/util/tevent_ntstatus.h"
 #include "lib/util/smb_strtox.h"
diff --git a/source3/torture/test_rpc_scale.c b/source3/torture/test_rpc_scale.c
index 6ef26f37a99..3445bed3ecb 100644
--- a/source3/torture/test_rpc_scale.c
+++ b/source3/torture/test_rpc_scale.c
@@ -17,7 +17,6 @@
 
 #include "source3/include/includes.h"
 #include "source3/torture/proto.h"
-#include "source3/libsmb/libsmb.h"
 #include "librpc/gen_ndr/ndr_spoolss_c.h"
 #include "lib/util/tevent_ntstatus.h"
 #include "source3/rpc_client/rpc_client.h"
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 4864535ebd1..3c2effcfa82 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -35,7 +35,8 @@
 #include "dbwrap/dbwrap_open.h"
 #include "dbwrap/dbwrap_rbt.h"
 #include "async_smb.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmb/clirap.h"
 #include "trans2.h"
 #include "libsmb/nmblib.h"
diff --git a/source3/torture/utable.c b/source3/torture/utable.c
index 059cae9edd1..87905a642ee 100644
--- a/source3/torture/utable.c
+++ b/source3/torture/utable.c
@@ -21,7 +21,6 @@
 #include "system/filesys.h"
 #include "torture/proto.h"
 #include "../libcli/security/security.h"
-#include "libsmb/libsmb.h"
 #include "libsmb/clirap.h"
 #include "lib/util/string_wrappers.h"
 
diff --git a/source3/utils/clirap2.c b/source3/utils/clirap2.c
index dff54985e26..61f46980fff 100644
--- a/source3/utils/clirap2.c
+++ b/source3/utils/clirap2.c
@@ -76,7 +76,8 @@
 /*****************************************************/
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "../librpc/gen_ndr/rap.h"
 #include "../librpc/gen_ndr/svcctl.h"
 #include "clirap2.h"
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 6c3ebae2e75..b39f0d2739a 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -36,7 +36,8 @@
 #include "smb_krb5.h"
 #include "secrets.h"
 #include "../libcli/security/security.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "lib/param/loadparm.h"
 #include "utils/net_dns.h"
 #include "auth/kerberos/pac_utils.h"
diff --git a/source3/utils/net_dom.c b/source3/utils/net_dom.c
index 4342990eaa1..4469b646c0c 100644
--- a/source3/utils/net_dom.c
+++ b/source3/utils/net_dom.c
@@ -23,7 +23,8 @@
 #include "../librpc/gen_ndr/ndr_winreg.h"
 #include "lib/netapi/netapi.h"
 #include "lib/netapi/netapi_net.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 
 int net_dom_usage(struct net_context *c, int argc, const char **argv)
 {
diff --git a/source3/utils/net_rap.c b/source3/utils/net_rap.c
index 31e33840aa2..3f62affe746 100644
--- a/source3/utils/net_rap.c
+++ b/source3/utils/net_rap.c
@@ -26,7 +26,8 @@
 #include "../librpc/gen_ndr/rap.h"
 #include "../librpc/gen_ndr/svcctl.h"
 #include "utils/net.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "clirap2.h"
 #include "../libcli/smb/smbXcli_base.h"
 
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index e2bf574f250..20aa01da90f 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -42,7 +42,8 @@
 #include "libnet/libnet_join.h"
 #include "rpc_client/init_lsa.h"
 #include "../libcli/security/security.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "clirap2.h"
 #include "nsswitch/libwbclient/wbclient.h"
 #include "passdb.h"
diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c
index 5434c5628f5..ea6faa331b1 100644
--- a/source3/utils/net_rpc_printer.c
+++ b/source3/utils/net_rpc_printer.c
@@ -27,7 +27,8 @@
 #include "registry.h"
 #include "../libcli/security/security.h"
 #include "../libcli/registry/util_reg.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmb/clirap.h"
 #include "../libcli/smb/smbXcli_base.h"
 #include "auth/gensec/gensec.h"
diff --git a/source3/utils/net_rpc_shell.c b/source3/utils/net_rpc_shell.c
index 4e872d8b58b..f50233146b9 100644
--- a/source3/utils/net_rpc_shell.c
+++ b/source3/utils/net_rpc_shell.c
@@ -25,7 +25,8 @@
 #include "lib/netapi/netapi.h"
 #include "lib/netapi/netapi_net.h"
 #include "../libcli/smbreadline/smbreadline.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libcli/security/dom_sid.h"
 
 #include <popt.h>
diff --git a/source3/utils/net_rpc_trust.c b/source3/utils/net_rpc_trust.c
index 5f89689068a..ef10bb4c078 100644
--- a/source3/utils/net_rpc_trust.c
+++ b/source3/utils/net_rpc_trust.c
@@ -24,7 +24,8 @@
 #include "librpc/gen_ndr/ndr_drsblobs.h"
 #include "../librpc/gen_ndr/ndr_lsa_c.h"
 #include "../libcli/security/dom_sid.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 
 #include "lib/crypto/gnutls_helpers.h"
 #include <gnutls/gnutls.h>
diff --git a/source3/utils/net_time.c b/source3/utils/net_time.c
index 5923c78cd29..a8fa824ba30 100644
--- a/source3/utils/net_time.c
+++ b/source3/utils/net_time.c
@@ -20,7 +20,8 @@
 #include "utils/net.h"
 #include "libsmb/nmblib.h"
 #include "libsmb/namequery.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "../libcli/smb/smbXcli_base.h"
 
 /*
diff --git a/source3/utils/net_util.c b/source3/utils/net_util.c
index f4f60ab71d4..eb6457073d8 100644
--- a/source3/utils/net_util.c
+++ b/source3/utils/net_util.c
@@ -28,7 +28,8 @@
 #include "../librpc/gen_ndr/ndr_dssetup_c.h"
 #include "secrets.h"
 #include "../libcli/security/security.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmb/smbsock_connect.h"
 #include "lib/param/param.h"
 #include "auth/gensec/gensec.h"
diff --git a/source3/utils/netlookup.c b/source3/utils/netlookup.c
index 6b99acca595..78b3eec22f3 100644
--- a/source3/utils/netlookup.c
+++ b/source3/utils/netlookup.c
@@ -24,7 +24,8 @@
 #include "rpc_client/cli_pipe.h"
 #include "../librpc/gen_ndr/ndr_lsa.h"
 #include "rpc_client/cli_lsarpc.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 
 /********************************************************
  Connection cachine struct. Goes away when ctx destroyed.
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 430ee0b5974..9044eb3cee3 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -28,7 +28,8 @@
 #include "../librpc/gen_ndr/ndr_lsa.h"
 #include "rpc_client/cli_lsarpc.h"
 #include "../libcli/security/security.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmb/clirap.h"
 #include "passdb/machine_sid.h"
 #include "../librpc/gen_ndr/ndr_lsa_c.h"
diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c
index 4d0b8f43ae7..b9bbb0f0185 100644
--- a/source3/utils/smbcquotas.c
+++ b/source3/utils/smbcquotas.c
@@ -28,7 +28,8 @@
 #include "rpc_client/cli_lsarpc.h"
 #include "fake_file.h"
 #include "../libcli/security/security.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "lib/param/param.h"
 
 static char *server;
diff --git a/source3/utils/smbtree.c b/source3/utils/smbtree.c
index 80dfa0a5944..26363fd58ed 100644
--- a/source3/utils/smbtree.c
+++ b/source3/utils/smbtree.c
@@ -23,7 +23,6 @@
 #include "lib/cmdline/cmdline.h"
 #include "rpc_client/cli_pipe.h"
 #include "../librpc/gen_ndr/ndr_srvsvc_c.h"
-#include "libsmb/libsmb.h"
 #include "libsmb/namequery.h"
 #include "libsmb/clirap.h"
 #include "../libcli/smb/smbXcli_base.h"
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 9231a818407..d4a7312dbd4 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -70,7 +70,8 @@
 #include "rpc_client/cli_lsarpc.h"
 #include "../librpc/gen_ndr/ndr_dssetup_c.h"
 #include "libads/sitename_cache.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmb/clidgram.h"
 #include "ads.h"
 #include "secrets.h"