s3-vfs: include smbd/smbd.h in vfs modules.

Guenther

64 files changed, 65 insertions, 0 deletions

diff --git a/source3/modules/gpfs.c b/source3/modules/gpfs.c
index 493e1fbb43..ef77099548 100644
--- a/source3/modules/gpfs.c
+++ b/source3/modules/gpfs.c
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 
 #ifdef HAVE_GPFS
 
diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index b7509c85d2..14d464451f 100644
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "nfs4_acls.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "../libcli/security/dom_sid.h"
diff --git a/source3/modules/onefs_acl.c b/source3/modules/onefs_acl.c
index 7080f6c660..e986b2a978 100644
--- a/source3/modules/onefs_acl.c
+++ b/source3/modules/onefs_acl.c
@@ -20,6 +20,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "onefs.h"
 #include "onefs_config.h"
 
diff --git a/source3/modules/onefs_cbrl.c b/source3/modules/onefs_cbrl.c
index 203710ec5a..5c69bec566 100644
--- a/source3/modules/onefs_cbrl.c
+++ b/source3/modules/onefs_cbrl.c
@@ -19,6 +19,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "onefs.h"
 
 #include <ifs/ifs_syscalls.h>
diff --git a/source3/modules/onefs_config.c b/source3/modules/onefs_config.c
index aa0d99e81a..8b34d7cd45 100644
--- a/source3/modules/onefs_config.c
+++ b/source3/modules/onefs_config.c
@@ -20,6 +20,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "onefs_config.h"
 
 #include <ifs/ifs_syscalls.h>
diff --git a/source3/modules/onefs_dir.c b/source3/modules/onefs_dir.c
index 2ab8b86771..d49042e06b 100644
--- a/source3/modules/onefs_dir.c
+++ b/source3/modules/onefs_dir.c
@@ -20,6 +20,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "onefs.h"
 #include "onefs_config.h"
 
diff --git a/source3/modules/onefs_notify.c b/source3/modules/onefs_notify.c
index 0447d0c03e..bbdade6015 100644
--- a/source3/modules/onefs_notify.c
+++ b/source3/modules/onefs_notify.c
@@ -34,6 +34,7 @@
  * events back to the proper SMB requests */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "onefs.h"
 
 #include <ifs/ifs_types.h>
diff --git a/source3/modules/onefs_open.c b/source3/modules/onefs_open.c
index c9372e57de..19b2ea0736 100644
--- a/source3/modules/onefs_open.c
+++ b/source3/modules/onefs_open.c
@@ -33,6 +33,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "onefs.h"
 #include "onefs_config.h"
 #include "oplock_onefs.h"
diff --git a/source3/modules/onefs_shadow_copy.c b/source3/modules/onefs_shadow_copy.c
index 5b02534715..29ee9e1a22 100644
--- a/source3/modules/onefs_shadow_copy.c
+++ b/source3/modules/onefs_shadow_copy.c
@@ -21,6 +21,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "smbd/smbd.h"
 #include <ifs/ifs_syscalls.h>
 #include <sys/types.h>
 #include <sys/isi_enc.h>
diff --git a/source3/modules/onefs_streams.c b/source3/modules/onefs_streams.c
index fa65b51996..85ab25683f 100644
--- a/source3/modules/onefs_streams.c
+++ b/source3/modules/onefs_streams.c
@@ -20,6 +20,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "onefs.h"
 #include "onefs_config.h"
 
diff --git a/source3/modules/onefs_system.c b/source3/modules/onefs_system.c
index 94b5da2a9e..05b033181e 100644
--- a/source3/modules/onefs_system.c
+++ b/source3/modules/onefs_system.c
@@ -19,6 +19,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "onefs.h"
 #include "onefs_config.h"
 #include "oplock_onefs.h"
diff --git a/source3/modules/perfcount_onefs.c b/source3/modules/perfcount_onefs.c
index d693376bfe..fcc0620159 100644
--- a/source3/modules/perfcount_onefs.c
+++ b/source3/modules/perfcount_onefs.c
@@ -19,6 +19,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include <sys/isi_stats_protocol.h>
 #include <sys/isi_stats_client.h>
 #include <sys/isi_stats_cifs.h>
diff --git a/source3/modules/perfcount_test.c b/source3/modules/perfcount_test.c
index 67be4aa9c6..c0b53360c7 100644
--- a/source3/modules/perfcount_test.c
+++ b/source3/modules/perfcount_test.c
@@ -19,6 +19,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 
 #define PARM_PC_TEST_TYPE		"pc_test"
 #define PARM_DUMPON_COUNT		"count"
diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index 0e513ee682..b3e9973fda 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -19,6 +19,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "smbd/smbd.h"
 #include "system/filesys.h"
 #include "../libcli/security/security.h"
 #include "../librpc/gen_ndr/ndr_security.h"
diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c
index 27aa37a8e0..a5f21329a4 100644
--- a/source3/modules/vfs_acl_tdb.c
+++ b/source3/modules/vfs_acl_tdb.c
@@ -21,6 +21,7 @@
 /* NOTE: This is an experimental module, not yet finished. JRA. */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "system/filesys.h"
 #include "librpc/gen_ndr/xattr.h"
 #include "librpc/gen_ndr/ndr_xattr.h"
diff --git a/source3/modules/vfs_acl_xattr.c b/source3/modules/vfs_acl_xattr.c
index aa7aeae5f4..46f9cf6ef4 100644
--- a/source3/modules/vfs_acl_xattr.c
+++ b/source3/modules/vfs_acl_xattr.c
@@ -21,6 +21,7 @@
 /* NOTE: This is an experimental module, not yet finished. JRA. */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "librpc/gen_ndr/xattr.h"
 #include "librpc/gen_ndr/ndr_xattr.h"
 #include "../lib/crypto/crypto.h"
diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c
index df4a20a90b..9f085ce317 100644
--- a/source3/modules/vfs_afsacl.c
+++ b/source3/modules/vfs_afsacl.c
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS
diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c
index 54964a373e..fc8ffefc13 100644
--- a/source3/modules/vfs_aio_fork.c
+++ b/source3/modules/vfs_aio_fork.c
@@ -20,6 +20,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "system/shmem.h"
 
 struct mmap_area {
diff --git a/source3/modules/vfs_aixacl.c b/source3/modules/vfs_aixacl.c
index a4f58db0ba..30a65c87bd 100644
--- a/source3/modules/vfs_aixacl.c
+++ b/source3/modules/vfs_aixacl.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 
 extern SMB_ACL_T aixacl_to_smbacl( struct acl *file_acl);
 extern struct acl *aixacl_smb_to_aixacl(SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl);
diff --git a/source3/modules/vfs_aixacl2.c b/source3/modules/vfs_aixacl2.c
index fcf964b512..e74c00f423 100644
--- a/source3/modules/vfs_aixacl2.c
+++ b/source3/modules/vfs_aixacl2.c
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "nfs4_acls.h"
 
 #undef DBGC_CLASS
diff --git a/source3/modules/vfs_aixacl_util.c b/source3/modules/vfs_aixacl_util.c
index 2d84f03bfb..768d0f3358 100644
--- a/source3/modules/vfs_aixacl_util.c
+++ b/source3/modules/vfs_aixacl_util.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 
 SMB_ACL_T aixacl_to_smbacl(struct acl *file_acl)
 {
diff --git a/source3/modules/vfs_audit.c b/source3/modules/vfs_audit.c
index cb1a5d3a0c..e816a0b29f 100644
--- a/source3/modules/vfs_audit.c
+++ b/source3/modules/vfs_audit.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "system/syslog.h"
+#include "smbd/smbd.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS
diff --git a/source3/modules/vfs_cacheprime.c b/source3/modules/vfs_cacheprime.c
index 02cffbb703..167b93580f 100644
--- a/source3/modules/vfs_cacheprime.c
+++ b/source3/modules/vfs_cacheprime.c
@@ -16,6 +16,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 
 /* Cache priming module.
  *
diff --git a/source3/modules/vfs_cap.c b/source3/modules/vfs_cap.c
index 89f16891a9..9edf13326f 100644
--- a/source3/modules/vfs_cap.c
+++ b/source3/modules/vfs_cap.c
@@ -23,6 +23,7 @@
 
 
 #include "includes.h"
+#include "smbd/smbd.h"
 
 /* cap functions */
 static char *capencode(TALLOC_CTX *ctx, const char *from);
diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c
index af6efd28df..12a32d24d5 100644
--- a/source3/modules/vfs_catia.c
+++ b/source3/modules/vfs_catia.c
@@ -27,6 +27,7 @@
 
 
 #include "includes.h"
+#include "smbd/smbd.h"
 
 #define GLOBAL_SNUM     0xFFFFFFF
 #define MAP_SIZE        0xFF
diff --git a/source3/modules/vfs_commit.c b/source3/modules/vfs_commit.c
index cade1170ba..4a202a0192 100644
--- a/source3/modules/vfs_commit.c
+++ b/source3/modules/vfs_commit.c
@@ -17,6 +17,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 
 /* Commit data module.
  *
diff --git a/source3/modules/vfs_crossrename.c b/source3/modules/vfs_crossrename.c
index e1d0353d1e..ffb807da48 100644
--- a/source3/modules/vfs_crossrename.c
+++ b/source3/modules/vfs_crossrename.c
@@ -16,6 +16,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "system/filesys.h"
 #include "transfer_file.h"
 
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 886798ebc3..414e428c6c 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -19,7 +19,9 @@
 */
 
 #include "includes.h"
+#include "system/time.h"
 #include "system/filesys.h"
+#include "smbd/smbd.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS
diff --git a/source3/modules/vfs_default_quota.c b/source3/modules/vfs_default_quota.c
index 33af5bd9e9..fc95ef2e3b 100644
--- a/source3/modules/vfs_default_quota.c
+++ b/source3/modules/vfs_default_quota.c
@@ -68,6 +68,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_QUOTA
diff --git a/source3/modules/vfs_dirsort.c b/source3/modules/vfs_dirsort.c
index 050c7342c0..adeab0425d 100644
--- a/source3/modules/vfs_dirsort.c
+++ b/source3/modules/vfs_dirsort.c
@@ -19,6 +19,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "system/filesys.h"
 
 static int compare_dirent (const SMB_STRUCT_DIRENT *da, const SMB_STRUCT_DIRENT *db)
diff --git a/source3/modules/vfs_expand_msdfs.c b/source3/modules/vfs_expand_msdfs.c
index 45cc32c88e..ab0a8412e8 100644
--- a/source3/modules/vfs_expand_msdfs.c
+++ b/source3/modules/vfs_expand_msdfs.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "smbd/smbd.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 #include "smbd/globals.h"
 
diff --git a/source3/modules/vfs_extd_audit.c b/source3/modules/vfs_extd_audit.c
index 326e40428e..bb334892a0 100644
--- a/source3/modules/vfs_extd_audit.c
+++ b/source3/modules/vfs_extd_audit.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "system/syslog.h"
+#include "smbd/smbd.h"
 
 static int vfs_extd_audit_debug_level = DBGC_VFS;
 
diff --git a/source3/modules/vfs_fake_perms.c b/source3/modules/vfs_fake_perms.c
index 344b15f95d..eb36e1d224 100644
--- a/source3/modules/vfs_fake_perms.c
+++ b/source3/modules/vfs_fake_perms.c
@@ -22,6 +22,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "system/filesys.h"
 
 #undef DBGC_CLASS
diff --git a/source3/modules/vfs_fileid.c b/source3/modules/vfs_fileid.c
index 27da7d63bb..4c230a0566 100644
--- a/source3/modules/vfs_fileid.c
+++ b/source3/modules/vfs_fileid.c
@@ -20,6 +20,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "system/filesys.h"
 
 static int vfs_fileid_debug_level = DBGC_VFS;
diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c
index 71a8723315..c9a9e3d485 100644
--- a/source3/modules/vfs_full_audit.c
+++ b/source3/modules/vfs_full_audit.c
@@ -60,6 +60,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "system/syslog.h"
+#include "smbd/smbd.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 
 static int vfs_full_audit_debug_level = DBGC_VFS;
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index e9257e65a3..7297677876 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "librpc/gen_ndr/ndr_xattr.h"
 
 #undef DBGC_CLASS
diff --git a/source3/modules/vfs_hpuxacl.c b/source3/modules/vfs_hpuxacl.c
index 62a35b1680..1df3fbbf5a 100644
--- a/source3/modules/vfs_hpuxacl.c
+++ b/source3/modules/vfs_hpuxacl.c
@@ -47,6 +47,7 @@
 
 
 #include "includes.h"
+#include "smbd/smbd.h"
 
 /* 
  * including standard header <sys/aclv.h> 
diff --git a/source3/modules/vfs_irixacl.c b/source3/modules/vfs_irixacl.c
index 42f82a9620..cceddb2f8d 100644
--- a/source3/modules/vfs_irixacl.c
+++ b/source3/modules/vfs_irixacl.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 
 /* prototypes for private functions first - for clarity */
 
diff --git a/source3/modules/vfs_linux_xfs_sgid.c b/source3/modules/vfs_linux_xfs_sgid.c
index ca2b5b58a7..fee12b0110 100644
--- a/source3/modules/vfs_linux_xfs_sgid.c
+++ b/source3/modules/vfs_linux_xfs_sgid.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "smbd/smbd.h"
 
 static int linux_xfs_sgid_mkdir(vfs_handle_struct *handle,  const char *path, mode_t mode)
 {
diff --git a/source3/modules/vfs_netatalk.c b/source3/modules/vfs_netatalk.c
index 11559aea0e..8d2c9b7ab1 100644
--- a/source3/modules/vfs_netatalk.c
+++ b/source3/modules/vfs_netatalk.c
@@ -19,6 +19,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "system/filesys.h"
 
 #undef DBGC_CLASS
diff --git a/source3/modules/vfs_notify_fam.c b/source3/modules/vfs_notify_fam.c
index c26d137af0..a4e7fd1e2b 100644
--- a/source3/modules/vfs_notify_fam.c
+++ b/source3/modules/vfs_notify_fam.c
@@ -19,6 +19,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "librpc/gen_ndr/notify.h"
 
 #include <fam.h>
diff --git a/source3/modules/vfs_onefs.c b/source3/modules/vfs_onefs.c
index 5f1b99292b..94685f6ded 100644
--- a/source3/modules/vfs_onefs.c
+++ b/source3/modules/vfs_onefs.c
@@ -19,6 +19,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "onefs.h"
 #include "onefs_config.h"
 
diff --git a/source3/modules/vfs_onefs_shadow_copy.c b/source3/modules/vfs_onefs_shadow_copy.c
index 9011f6da77..89be05d8a2 100644
--- a/source3/modules/vfs_onefs_shadow_copy.c
+++ b/source3/modules/vfs_onefs_shadow_copy.c
@@ -22,6 +22,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "onefs_shadow_copy.h"
 
 static int vfs_onefs_shadow_copy_debug_level = DBGC_VFS;
diff --git a/source3/modules/vfs_posixacl.c b/source3/modules/vfs_posixacl.c
index 6bdfeda646..9890110d98 100644
--- a/source3/modules/vfs_posixacl.c
+++ b/source3/modules/vfs_posixacl.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "system/filesys.h"
 
 
diff --git a/source3/modules/vfs_prealloc.c b/source3/modules/vfs_prealloc.c
index 386de29071..dce3044afe 100644
--- a/source3/modules/vfs_prealloc.c
+++ b/source3/modules/vfs_prealloc.c
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 
 /* Extent preallocation module.
  *
diff --git a/source3/modules/vfs_preopen.c b/source3/modules/vfs_preopen.c
index 12a2f9df37..10519c96dc 100644
--- a/source3/modules/vfs_preopen.c
+++ b/source3/modules/vfs_preopen.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "smbd/smbd.h"
 
 struct preopen_state;
 
diff --git a/source3/modules/vfs_readahead.c b/source3/modules/vfs_readahead.c
index 0fd745d66a..b9dbece94e 100644
--- a/source3/modules/vfs_readahead.c
+++ b/source3/modules/vfs_readahead.c
@@ -17,6 +17,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "smbd/smbd.h"
 
 struct readahead_data {
 	SMB_OFF_T off_bound;
diff --git a/source3/modules/vfs_readonly.c b/source3/modules/vfs_readonly.c
index c19f5941be..2b09d882bd 100644
--- a/source3/modules/vfs_readonly.c
+++ b/source3/modules/vfs_readonly.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "getdate.h"
 
 /*
diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c
index 607ce3a4b8..110acad75a 100644
--- a/source3/modules/vfs_recycle.c
+++ b/source3/modules/vfs_recycle.c
@@ -23,6 +23,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "system/filesys.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 
diff --git a/source3/modules/vfs_scannedonly.c b/source3/modules/vfs_scannedonly.c
index db18a077f5..bc9ae6468f 100644
--- a/source3/modules/vfs_scannedonly.c
+++ b/source3/modules/vfs_scannedonly.c
@@ -48,6 +48,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "system/filesys.h"
 
 #include "config.h"
diff --git a/source3/modules/vfs_shadow_copy.c b/source3/modules/vfs_shadow_copy.c
index b597644869..cf911d7a70 100644
--- a/source3/modules/vfs_shadow_copy.c
+++ b/source3/modules/vfs_shadow_copy.c
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 
 /*
     Please read the VFS module Samba-HowTo-Collection.
diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c
index 788270cf15..654e01161c 100644
--- a/source3/modules/vfs_shadow_copy2.c
+++ b/source3/modules/vfs_shadow_copy2.c
@@ -20,6 +20,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "system/filesys.h"
 
 /*
diff --git a/source3/modules/vfs_smb_traffic_analyzer.c b/source3/modules/vfs_smb_traffic_analyzer.c
index 1e1732d24b..a8a6cb75a7 100644
--- a/source3/modules/vfs_smb_traffic_analyzer.c
+++ b/source3/modules/vfs_smb_traffic_analyzer.c
@@ -20,6 +20,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "../smbd/globals.h"
 #include "../lib/crypto/crypto.h"
 #include "vfs_smb_traffic_analyzer.h"
diff --git a/source3/modules/vfs_solarisacl.c b/source3/modules/vfs_solarisacl.c
index 4e0cd475a8..04b8e4ebc4 100644
--- a/source3/modules/vfs_solarisacl.c
+++ b/source3/modules/vfs_solarisacl.c
@@ -19,6 +19,7 @@
 
 
 #include "includes.h"
+#include "smbd/smbd.h"
 
 
 /* typedef struct acl SOLARIS_ACE_T; */
diff --git a/source3/modules/vfs_streams_depot.c b/source3/modules/vfs_streams_depot.c
index ac0b95a63b..0f94820023 100644
--- a/source3/modules/vfs_streams_depot.c
+++ b/source3/modules/vfs_streams_depot.c
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "system/filesys.h"
 
 #undef DBGC_CLASS
diff --git a/source3/modules/vfs_streams_xattr.c b/source3/modules/vfs_streams_xattr.c
index 6912a8b610..19cded6634 100644
--- a/source3/modules/vfs_streams_xattr.c
+++ b/source3/modules/vfs_streams_xattr.c
@@ -22,6 +22,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "system/filesys.h"
 #include "../lib/crypto/md5.h"
 
diff --git a/source3/modules/vfs_syncops.c b/source3/modules/vfs_syncops.c
index a828e92165..22044f9946 100644
--- a/source3/modules/vfs_syncops.c
+++ b/source3/modules/vfs_syncops.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "smbd/smbd.h"
 
 /*
 
diff --git a/source3/modules/vfs_time_audit.c b/source3/modules/vfs_time_audit.c
index d692529a34..84d6b6eec2 100644
--- a/source3/modules/vfs_time_audit.c
+++ b/source3/modules/vfs_time_audit.c
@@ -26,6 +26,7 @@
 
 
 #include "includes.h"
+#include "smbd/smbd.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS
diff --git a/source3/modules/vfs_tru64acl.c b/source3/modules/vfs_tru64acl.c
index a978868444..de3c415863 100644
--- a/source3/modules/vfs_tru64acl.c
+++ b/source3/modules/vfs_tru64acl.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 
 /* prototypes for private functions first - for clarity */
 
diff --git a/source3/modules/vfs_tsmsm.c b/source3/modules/vfs_tsmsm.c
index 6383891913..d53d291832 100644
--- a/source3/modules/vfs_tsmsm.c
+++ b/source3/modules/vfs_tsmsm.c
@@ -39,6 +39,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 
 #ifndef USE_DMAPI
 #error "This module requires DMAPI support!"
diff --git a/source3/modules/vfs_xattr_tdb.c b/source3/modules/vfs_xattr_tdb.c
index b98ebb3df6..5b62565d62 100644
--- a/source3/modules/vfs_xattr_tdb.c
+++ b/source3/modules/vfs_xattr_tdb.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "smbd/smbd.h"
 #include "librpc/gen_ndr/xattr.h"
 #include "librpc/gen_ndr/ndr_xattr.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
diff --git a/source3/modules/vfs_zfsacl.c b/source3/modules/vfs_zfsacl.c
index c5277a6b2c..2dbc2b92c4 100644
--- a/source3/modules/vfs_zfsacl.c
+++ b/source3/modules/vfs_zfsacl.c
@@ -23,6 +23,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "nfs4_acls.h"
 
 #if HAVE_FREEBSD_SUNACL_H
diff --git a/source3/torture/cmd_vfs.c b/source3/torture/cmd_vfs.c
index 0720f084aa..2c3a416002 100644
--- a/source3/torture/cmd_vfs.c
+++ b/source3/torture/cmd_vfs.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "system/passwd.h"
 #include "system/filesys.h"
 #include "vfstest.h"
diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c
index 479bc86e45..584f6e30ef 100644
--- a/source3/torture/vfstest.c
+++ b/source3/torture/vfstest.c
@@ -24,6 +24,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "popt_common.h"
 #include "vfstest.h"
 #include "../libcli/smbreadline/smbreadline.h"