From: Günther Deschner <gd@samba.org>
Date: Tue, 22 Mar 2011 15:57:01 +0000 (+0100)
Subject: s3: include smbd/smbd.h where needed.
X-Git-Tag: ldb-1.1.0~407
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=8c24ebf371d8aff4742a2ba063a8789e20eaaabc;p=samba.git

s3: include smbd/smbd.h where needed.

Guenther
---

diff --git a/source3/lib/filename_util.c b/source3/lib/filename_util.c
index aad8a08e2b5..f12ca2d781b 100644
--- a/source3/lib/filename_util.c
+++ b/source3/lib/filename_util.c
@@ -17,6 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "includes.h"
+#include "smbd/smbd.h"
 
 /**
  * XXX: This is temporary and there should be no callers of this outside of
diff --git a/source3/printing/printspoolss.c b/source3/printing/printspoolss.c
index d7ce9713f96..01137df7efc 100644
--- a/source3/printing/printspoolss.c
+++ b/source3/printing/printspoolss.c
@@ -21,6 +21,7 @@
 #include "printing.h"
 #include "../librpc/gen_ndr/ndr_spoolss_c.h"
 #include "rpc_server/rpc_ncacn_np.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/security/security.h"
 
diff --git a/source3/smbd/aio.c b/source3/smbd/aio.c
index eb8ed6799f1..682d042806a 100644
--- a/source3/smbd/aio.c
+++ b/source3/smbd/aio.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 
 #if defined(WITH_AIO)
diff --git a/source3/smbd/avahi_register.c b/source3/smbd/avahi_register.c
index 1903b0ef964..05bd6038f46 100644
--- a/source3/smbd/avahi_register.c
+++ b/source3/smbd/avahi_register.c
@@ -19,6 +19,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 
 #include <avahi-client/client.h>
 #include <avahi-client/publish.h>
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index dd99666034c..548a3f08451 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "librpc/gen_ndr/messaging.h"
 
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index b71f6c7dff8..72d2736b68d 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -23,6 +23,7 @@
 #include "system/filesys.h"
 #include "printing.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "fake_file.h"
 #include "transfer_file.h"
diff --git a/source3/smbd/conn.c b/source3/smbd/conn.c
index 8de8ce2e11a..16a0ee053e9 100644
--- a/source3/smbd/conn.c
+++ b/source3/smbd/conn.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 
 /* The connections bitmap is expanded in increments of BITMAP_BLOCK_SZ. The
diff --git a/source3/smbd/connection.c b/source3/smbd/connection.c
index cfbc80ef9f2..7ac24c809a4 100644
--- a/source3/smbd/connection.c
+++ b/source3/smbd/connection.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "dbwrap.h"
 
diff --git a/source3/smbd/dfree.c b/source3/smbd/dfree.c
index dc5719a4a50..63c287cd417 100644
--- a/source3/smbd/dfree.c
+++ b/source3/smbd/dfree.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 
 /****************************************************************************
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index c1ba6764fcd..5fc87a608fd 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "libcli/security/security.h"
 
diff --git a/source3/smbd/dmapi.c b/source3/smbd/dmapi.c
index 7a0a2fc1f58..2869b6d781c 100644
--- a/source3/smbd/dmapi.c
+++ b/source3/smbd/dmapi.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 
 #undef DBGC_CLASS
diff --git a/source3/smbd/dnsregister.c b/source3/smbd/dnsregister.c
index 2fd95f9fb7a..df189001a09 100644
--- a/source3/smbd/dnsregister.c
+++ b/source3/smbd/dnsregister.c
@@ -18,6 +18,7 @@
 */
 
 #include <includes.h>
+#include "smbd/smbd.h"
 
 /* Uses DNS service discovery (libdns_sd) to
  * register the SMB service. SMB service is registered
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index 49ddf161ad2..0e45e88d8dd 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -22,6 +22,7 @@
 #include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_xattr.h"
 #include "../libcli/security/security.h"
+#include "smbd/smbd.h"
 
 static uint32_t filter_mode_by_protocol(uint32_t mode)
 {
diff --git a/source3/smbd/error.c b/source3/smbd/error.c
index 252eb77416e..6655a6fb082 100644
--- a/source3/smbd/error.c
+++ b/source3/smbd/error.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 
 /* From lib/error.c */
diff --git a/source3/smbd/fake_file.c b/source3/smbd/fake_file.c
index 0c796faf450..801bf268b92 100644
--- a/source3/smbd/fake_file.c
+++ b/source3/smbd/fake_file.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "fake_file.h"
 
 struct fake_file_type {
diff --git a/source3/smbd/file_access.c b/source3/smbd/file_access.c
index 5fb0e924c50..960dcb703a5 100644
--- a/source3/smbd/file_access.c
+++ b/source3/smbd/file_access.c
@@ -22,6 +22,7 @@
 #include "system/filesys.h"
 #include "../libcli/security/security.h"
 #include "../librpc/gen_ndr/ndr_security.h"
+#include "smbd/smbd.h"
 
 #undef  DBGC_CLASS
 #define DBGC_CLASS DBGC_ACLS
diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c
index da40013bc5b..460eeac33a5 100644
--- a/source3/smbd/fileio.c
+++ b/source3/smbd/fileio.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "printing.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 
 static bool setup_write_cache(files_struct *, SMB_OFF_T);
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index 4238e58d106..0fda8879da7 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -27,6 +27,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "fake_file.h"
+#include "smbd/smbd.h"
 
 static NTSTATUS build_stream_path(TALLOC_CTX *mem_ctx,
 				  connection_struct *conn,
diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index f01da2c8a21..b9063ccbb89 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "libcli/security/security.h"
 
diff --git a/source3/smbd/globals.c b/source3/smbd/globals.c
index b1a0d7eb19b..8a736993fbd 100644
--- a/source3/smbd/globals.c
+++ b/source3/smbd/globals.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "memcache.h"
 
diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index 5dd0e5627e2..3fd42954f9f 100644
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -25,6 +25,7 @@
    */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 
 #define NERR_notsupported 50
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index 99b7d185441..c435cd8e341 100644
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -26,6 +26,7 @@
    */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../librpc/gen_ndr/ndr_samr_c.h"
 #include "../librpc/gen_ndr/ndr_spoolss_c.h"
diff --git a/source3/smbd/mangle.c b/source3/smbd/mangle.c
index ca1b1314cba..49599c1ee1c 100644
--- a/source3/smbd/mangle.c
+++ b/source3/smbd/mangle.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "mangle.h"
 
diff --git a/source3/smbd/mangle_hash.c b/source3/smbd/mangle_hash.c
index 89df10a7571..86d84ca68c6 100644
--- a/source3/smbd/mangle_hash.c
+++ b/source3/smbd/mangle_hash.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "mangle.h"
 
diff --git a/source3/smbd/mangle_hash2.c b/source3/smbd/mangle_hash2.c
index f93deab9db7..367c21688ac 100644
--- a/source3/smbd/mangle_hash2.c
+++ b/source3/smbd/mangle_hash2.c
@@ -64,6 +64,7 @@
 
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "memcache.h"
 #include "mangle.h"
diff --git a/source3/smbd/message.c b/source3/smbd/message.c
index f2ca420bf9e..1a6e9c8b13c 100644
--- a/source3/smbd/message.c
+++ b/source3/smbd/message.c
@@ -23,6 +23,7 @@
 
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 
 extern userdom_struct current_user_info;
diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
index 17caa36d5d1..df574ffa7c1 100644
--- a/source3/smbd/msdfs.c
+++ b/source3/smbd/msdfs.c
@@ -23,6 +23,7 @@
 #define DBGC_CLASS DBGC_MSDFS
 #include "includes.h"
 #include "system/filesys.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "msdfs.h"
 
diff --git a/source3/smbd/msg_idmap.c b/source3/smbd/msg_idmap.c
index 5c6d40023b3..6819a6eb0e7 100644
--- a/source3/smbd/msg_idmap.c
+++ b/source3/smbd/msg_idmap.c
@@ -26,6 +26,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "memcache.h"
 #include "globals.h"
 #include "../libcli/security/dom_sid.h"
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index f128396173f..ce4b834409f 100644
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/auth/spnego.h"
 #include "serverid.h"
diff --git a/source3/smbd/noquotas.c b/source3/smbd/noquotas.c
index 392b32437a2..6b67bb15e13 100644
--- a/source3/smbd/noquotas.c
+++ b/source3/smbd/noquotas.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 
 /*
  * Needed for auto generation of proto.h.
diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c
index 011f38fb7e5..24385c94a0d 100644
--- a/source3/smbd/notify.c
+++ b/source3/smbd/notify.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../librpc/gen_ndr/ndr_notify.h"
 
diff --git a/source3/smbd/notify_inotify.c b/source3/smbd/notify_inotify.c
index fe6436d28c0..bccd093be4c 100644
--- a/source3/smbd/notify_inotify.c
+++ b/source3/smbd/notify_inotify.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "../librpc/gen_ndr/notify.h"
+#include "smbd/smbd.h"
 
 #ifdef HAVE_INOTIFY
 
diff --git a/source3/smbd/notify_internal.c b/source3/smbd/notify_internal.c
index 3b481cdef9f..2fa6c76d485 100644
--- a/source3/smbd/notify_internal.c
+++ b/source3/smbd/notify_internal.c
@@ -28,6 +28,7 @@
 #include "librpc/gen_ndr/ndr_notify.h"
 #include "librpc/gen_ndr/messaging.h"
 #include "dbwrap.h"
+#include "smbd/smbd.h"
 
 struct notify_context {
 	struct db_context *db_recursive;
diff --git a/source3/smbd/ntquotas.c b/source3/smbd/ntquotas.c
index f639b25dfcd..d0056756ac0 100644
--- a/source3/smbd/ntquotas.c
+++ b/source3/smbd/ntquotas.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "../lib/util/util_pw.h"
 #include "system/passwd.h"
 #include "passdb/lookup_sid.h"
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index bff8246ddc8..0676db743ea 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "fake_file.h"
 #include "../libcli/security/security.h"
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 3c91d8485e7..64660c0b04b 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "printing.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "fake_file.h"
 #include "librpc/gen_ndr/messaging.h"
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 4e5237e61f2..e43ed6b9a6a 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -21,6 +21,7 @@
 
 #define DBGC_CLASS DBGC_LOCKING
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "librpc/gen_ndr/messaging.h"
 
diff --git a/source3/smbd/oplock_irix.c b/source3/smbd/oplock_irix.c
index 518ea7e63c7..d1be2efa2e9 100644
--- a/source3/smbd/oplock_irix.c
+++ b/source3/smbd/oplock_irix.c
@@ -19,6 +19,7 @@
 
 #define DBGC_CLASS DBGC_LOCKING
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 
 #if HAVE_KERNEL_OPLOCKS_IRIX
diff --git a/source3/smbd/oplock_linux.c b/source3/smbd/oplock_linux.c
index efc8c70d398..4f243e2e9ff 100644
--- a/source3/smbd/oplock_linux.c
+++ b/source3/smbd/oplock_linux.c
@@ -20,6 +20,7 @@
 #define DBGC_CLASS DBGC_LOCKING
 #include "includes.h"
 #include "system/filesys.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 
 #if HAVE_KERNEL_OPLOCKS_LINUX
diff --git a/source3/smbd/oplock_onefs.c b/source3/smbd/oplock_onefs.c
index 9c6287ba342..dbf465ca63a 100644
--- a/source3/smbd/oplock_onefs.c
+++ b/source3/smbd/oplock_onefs.c
@@ -25,6 +25,7 @@
 
 #if HAVE_ONEFS
 #include "oplock_onefs.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 
 #include <ifs/ifs_syscalls.h>
diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index a7b0dd3e134..647168bc7b4 100644
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "system/passwd.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../librpc/gen_ndr/netlogon.h"
 
diff --git a/source3/smbd/perfcount.c b/source3/smbd/perfcount.c
index 434bdca4268..3bc83b98d5f 100644
--- a/source3/smbd/perfcount.c
+++ b/source3/smbd/perfcount.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 
 static struct smb_perfcount_handlers *g_smb_perfcount_handlers = NULL;
 
diff --git a/source3/smbd/pipes.c b/source3/smbd/pipes.c
index 73398abcd81..89d6c8dfca1 100644
--- a/source3/smbd/pipes.c
+++ b/source3/smbd/pipes.c
@@ -26,6 +26,7 @@
 
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "libcli/security/security.h"
 
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 38ad86bbd34..1544ca88b57 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "system/filesys.h"
 #include "../libcli/security/security.h"
 #include "trans2.h"
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index f92c0cc811f..1d6396d46bd 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "librpc/gen_ndr/netlogon.h"
 #include "librpc/gen_ndr/messaging.h"
diff --git a/source3/smbd/quotas.c b/source3/smbd/quotas.c
index ad3973f754e..c9f85b6ad09 100644
--- a/source3/smbd/quotas.c
+++ b/source3/smbd/quotas.c
@@ -25,6 +25,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_QUOTA
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 7562ca18050..977b65675db 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -27,6 +27,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "printing.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "fake_file.h"
 #include "../librpc/gen_ndr/ndr_spoolss_c.h"
diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c
index 78ec3b2e65c..6b3f30f00bc 100644
--- a/source3/smbd/seal.c
+++ b/source3/smbd/seal.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/auth/spnego.h"
 #include "../libcli/auth/ntlmssp.h"
diff --git a/source3/smbd/sec_ctx.c b/source3/smbd/sec_ctx.c
index 9eed0bd0090..d2f09790cb5 100644
--- a/source3/smbd/sec_ctx.c
+++ b/source3/smbd/sec_ctx.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "libcli/security/security_token.h"
 
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 1fb2b6bc2e8..3e2e1c3a8c8 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "popt_common.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "librpc/gen_ndr/messaging.h"
 #include "registry.h"
diff --git a/source3/smbd/server_exit.c b/source3/smbd/server_exit.c
index 71f5094261e..d1ff7417dec 100644
--- a/source3/smbd/server_exit.c
+++ b/source3/smbd/server_exit.c
@@ -23,6 +23,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "librpc/gen_ndr/messaging.h"
 
diff --git a/source3/smbd/server_reload.c b/source3/smbd/server_reload.c
index e4b039d1892..eab11d45362 100644
--- a/source3/smbd/server_reload.c
+++ b/source3/smbd/server_reload.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "librpc/gen_ndr/messaging.h"
 #include "nt_printing.h"
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index ea549f6a78b..430a1e46fef 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../librpc/gen_ndr/netlogon.h"
 #include "../libcli/security/security.h"
diff --git a/source3/smbd/session.c b/source3/smbd/session.c
index 1b391f3b8be..7ac2c1b806e 100644
--- a/source3/smbd/session.c
+++ b/source3/smbd/session.c
@@ -27,6 +27,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "dbwrap.h"
 #include "session.h"
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 6c67f3ea40d..3ac4af2a2fa 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -23,6 +23,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/auth/spnego.h"
 #include "../libcli/auth/ntlmssp.h"
diff --git a/source3/smbd/share_access.c b/source3/smbd/share_access.c
index 0c368aae795..de56fc784ee 100644
--- a/source3/smbd/share_access.c
+++ b/source3/smbd/share_access.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/security/security.h"
 #include "passdb/lookup_sid.h"
diff --git a/source3/smbd/signing.c b/source3/smbd/signing.c
index 8945cd3ec1c..bea24098839 100644
--- a/source3/smbd/signing.c
+++ b/source3/smbd/signing.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "smb_signing.h"
 
diff --git a/source3/smbd/smb2_break.c b/source3/smbd/smb2_break.c
index 79b06b18764..925384c3bfe 100644
--- a/source3/smbd/smb2_break.c
+++ b/source3/smbd/smb2_break.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 
diff --git a/source3/smbd/smb2_close.c b/source3/smbd/smb2_close.c
index 8ef9dfa8208..93ce5baf023 100644
--- a/source3/smbd/smb2_close.c
+++ b/source3/smbd/smb2_close.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 
diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index 70f0dba404d..6e292468f9e 100644
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "printing.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 #include "../librpc/gen_ndr/ndr_security.h"
diff --git a/source3/smbd/smb2_find.c b/source3/smbd/smb2_find.c
index 4c779f92e77..3ac573c2137 100644
--- a/source3/smbd/smb2_find.c
+++ b/source3/smbd/smb2_find.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 #include "trans2.h"
diff --git a/source3/smbd/smb2_flush.c b/source3/smbd/smb2_flush.c
index 108f3bd488f..93955929077 100644
--- a/source3/smbd/smb2_flush.c
+++ b/source3/smbd/smb2_flush.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 
diff --git a/source3/smbd/smb2_getinfo.c b/source3/smbd/smb2_getinfo.c
index 70225f18d2d..1d6b862d6ae 100644
--- a/source3/smbd/smb2_getinfo.c
+++ b/source3/smbd/smb2_getinfo.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 #include "trans2.h"
diff --git a/source3/smbd/smb2_glue.c b/source3/smbd/smb2_glue.c
index a4b34e4a5cc..360a73a40b1 100644
--- a/source3/smbd/smb2_glue.c
+++ b/source3/smbd/smb2_glue.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 
diff --git a/source3/smbd/smb2_ioctl.c b/source3/smbd/smb2_ioctl.c
index 5a42d59e9a6..6ee9318212e 100644
--- a/source3/smbd/smb2_ioctl.c
+++ b/source3/smbd/smb2_ioctl.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 
diff --git a/source3/smbd/smb2_keepalive.c b/source3/smbd/smb2_keepalive.c
index 6645a00dad8..a830260b240 100644
--- a/source3/smbd/smb2_keepalive.c
+++ b/source3/smbd/smb2_keepalive.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 
diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index 80ce2bc8c12..a2742b8e294 100644
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 #include "librpc/gen_ndr/messaging.h"
diff --git a/source3/smbd/smb2_negprot.c b/source3/smbd/smb2_negprot.c
index db392f40756..1e02c88d3dc 100644
--- a/source3/smbd/smb2_negprot.c
+++ b/source3/smbd/smb2_negprot.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 
diff --git a/source3/smbd/smb2_notify.c b/source3/smbd/smb2_notify.c
index 44dfce66579..d52b2878eca 100644
--- a/source3/smbd/smb2_notify.c
+++ b/source3/smbd/smb2_notify.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 
diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c
index ce3955b53ab..bffda890106 100644
--- a/source3/smbd/smb2_read.c
+++ b/source3/smbd/smb2_read.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 #include "libcli/security/security.h"
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index fc2af475f2d..50505e77302 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 #include "../lib/tsocket/tsocket.h"
diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c
index 3b33af8fe29..2b7a860b017 100644
--- a/source3/smbd/smb2_sesssetup.c
+++ b/source3/smbd/smb2_sesssetup.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 #include "../libcli/auth/spnego.h"
diff --git a/source3/smbd/smb2_setinfo.c b/source3/smbd/smb2_setinfo.c
index ba06fb3db71..39b7aee76b5 100644
--- a/source3/smbd/smb2_setinfo.c
+++ b/source3/smbd/smb2_setinfo.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 #include "trans2.h"
diff --git a/source3/smbd/smb2_signing.c b/source3/smbd/smb2_signing.c
index a7d2605318a..1c0dd5ef68d 100644
--- a/source3/smbd/smb2_signing.c
+++ b/source3/smbd/smb2_signing.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 #include "../lib/crypto/crypto.h"
diff --git a/source3/smbd/smb2_tcon.c b/source3/smbd/smb2_tcon.c
index 39b8eb1ae7d..fb5897257eb 100644
--- a/source3/smbd/smb2_tcon.c
+++ b/source3/smbd/smb2_tcon.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 #include "../libcli/security/security.h"
diff --git a/source3/smbd/smb2_write.c b/source3/smbd/smb2_write.c
index 7db0e7e6a56..413fe0c7d17 100644
--- a/source3/smbd/smb2_write.c
+++ b/source3/smbd/smb2_write.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 
diff --git a/source3/smbd/srvstr.c b/source3/smbd/srvstr.c
index 4fd533fcafa..050de599a57 100644
--- a/source3/smbd/srvstr.c
+++ b/source3/smbd/srvstr.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 
 /* Make sure we can't write a string past the end of the buffer */
diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c
index ecadbdcdd40..c21213f23b3 100644
--- a/source3/smbd/statcache.c
+++ b/source3/smbd/statcache.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/messaging.h"
 #include "memcache.h"
+#include "smbd/smbd.h"
 
 /****************************************************************************
  Stat cache code used in unix_convert.
diff --git a/source3/smbd/statvfs.c b/source3/smbd/statvfs.c
index 55469f5d083..2de015a2df6 100644
--- a/source3/smbd/statvfs.c
+++ b/source3/smbd/statvfs.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "smbd/smbd.h"
 
 #if defined(LINUX) && defined(HAVE_FSID_INT)
 static int linux_statvfs(const char *path, vfs_statvfs_struct *statbuf)
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 5e8c0c80d89..04a97cdfe44 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -26,6 +26,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "version.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/xattr.h"
diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c
index 53a9c7cc611..7a2359d7c7e 100644
--- a/source3/smbd/uid.c
+++ b/source3/smbd/uid.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "system/passwd.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../librpc/gen_ndr/netlogon.h"
 #include "libcli/security/security.h"
diff --git a/source3/smbd/utmp.c b/source3/smbd/utmp.c
index 74774054e85..2d6beab4da1 100644
--- a/source3/smbd/utmp.c
+++ b/source3/smbd/utmp.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 
 /****************************************************************************
 Reflect connection status in utmp/wtmp files.
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index cc4ee22400a..bbe6e7ef1ed 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -25,6 +25,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "memcache.h"
 #include "transfer_file.h"