From: Günther Deschner <gd@samba.org>
Date: Fri, 25 Feb 2011 22:20:06 +0000 (+0100)
Subject: s3-includes: only include system/filesys.h when needed.
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=0e771263eed0b9bc364ce523765ea17dd1192841;p=metze%2Fsamba%2Fwip.git

s3-includes: only include system/filesys.h when needed.

Guenther
---

diff --git a/libgpo/gpo_util.c b/libgpo/gpo_util.c
index 9e4687ddc95c..553402a4274f 100644
--- a/libgpo/gpo_util.c
+++ b/libgpo/gpo_util.c
@@ -18,12 +18,12 @@
  */
 #define TALLOC_DEPRECATED 1
 #include "includes.h"
+#include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "../libgpo/gpo.h"
 #include "../libcli/security/security.h"
 #if _SAMBA_BUILD_ == 4
-#include "system/filesys.h"
 #include "auth/auth.h"
 #include <talloc.h>
 #include "source4/libgpo/ads_convenience.h"
diff --git a/source3/auth/user_util.c b/source3/auth/user_util.c
index d6c47a83321e..4ed6db1f62fa 100644
--- a/source3/auth/user_util.c
+++ b/source3/auth/user_util.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 
 /*******************************************************************
  Map a username from a dos name to a unix name by looking in the username
diff --git a/source3/client/client.c b/source3/client/client.c
index bc4816be8c3b..29ef0e667934 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "popt_common.h"
 #include "rpc_client/cli_pipe.h"
 #include "client/client_proto.h"
diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index ac891aa7e8c6..b46115becf34 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -35,6 +35,7 @@
 
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "clitar.h"
 #include "client/client_proto.h"
 
diff --git a/source3/client/smbspool.c b/source3/client/smbspool.c
index 2add37f49d26..98c350d7ddbe 100644
--- a/source3/client/smbspool.c
+++ b/source3/client/smbspool.c
@@ -23,6 +23,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "system/passwd.h"
 
 /*
diff --git a/source3/groupdb/mapping_tdb.c b/source3/groupdb/mapping_tdb.c
index cd9a59cb4f75..263455212774 100644
--- a/source3/groupdb/mapping_tdb.c
+++ b/source3/groupdb/mapping_tdb.c
@@ -21,6 +21,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "groupdb/mapping.h"
 #include "dbwrap.h"
 #include "../libcli/security/security.h"
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 6fc8809e8861..91b81e4ea046 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -69,7 +69,6 @@
 #endif /* RELIANTUNIX */
 
 #include "system/dir.h"
-#include "system/filesys.h"
 #include "system/locale.h"
 #include "system/time.h"
 #include "system/wait.h"
diff --git a/source3/intl/lang_tdb.c b/source3/intl/lang_tdb.c
index ac7e9dda4042..19a50c49f66e 100644
--- a/source3/intl/lang_tdb.c
+++ b/source3/intl/lang_tdb.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 
 static TDB_CONTEXT *tdb;
 
diff --git a/source3/lib/conn_tdb.c b/source3/lib/conn_tdb.c
index e4c5e720144e..50f0d9fa1bb1 100644
--- a/source3/lib/conn_tdb.c
+++ b/source3/lib/conn_tdb.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "smbd/globals.h"
 #include "dbwrap.h"
 
diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c
index 46ec6dec293d..9b0b66c1f0f3 100644
--- a/source3/lib/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap_ctdb.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #ifdef CLUSTER_SUPPORT
 #include "ctdb.h"
 #include "ctdb_private.h"
diff --git a/source3/lib/dumpcore.c b/source3/lib/dumpcore.c
index 59a891205afe..90acc1679b69 100644
--- a/source3/lib/dumpcore.c
+++ b/source3/lib/dumpcore.c
@@ -26,6 +26,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 
 #ifdef HAVE_SYS_SYSCTL_H
 #include <sys/sysctl.h>
diff --git a/source3/lib/eventlog/eventlog.c b/source3/lib/eventlog/eventlog.c
index 70062345a6ad..4941199c5eaf 100644
--- a/source3/lib/eventlog/eventlog.c
+++ b/source3/lib/eventlog/eventlog.c
@@ -21,6 +21,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "lib/eventlog/eventlog.h"
 #include "../libcli/security/security.h"
 
diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c
index dfbcf8445c0d..59f1d590b64c 100644
--- a/source3/lib/g_lock.c
+++ b/source3/lib/g_lock.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "g_lock.h"
 #include "librpc/gen_ndr/messaging.h"
 #include "ctdbd_conn.h"
diff --git a/source3/lib/gencache.c b/source3/lib/gencache.c
index 2bbc952108ad..67c37f34e73c 100644
--- a/source3/lib/gencache.c
+++ b/source3/lib/gencache.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "system/glob.h"
 
 #undef  DBGC_CLASS
diff --git a/source3/lib/messages_local.c b/source3/lib/messages_local.c
index 8cc060b9e2bf..9b3a7ed7c762 100644
--- a/source3/lib/messages_local.c
+++ b/source3/lib/messages_local.c
@@ -43,6 +43,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "librpc/gen_ndr/messaging.h"
 #include "librpc/gen_ndr/ndr_messaging.h"
 
diff --git a/source3/lib/pidfile.c b/source3/lib/pidfile.c
index a3e39db78483..88d0fb07ea76 100644
--- a/source3/lib/pidfile.c
+++ b/source3/lib/pidfile.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 
 #ifndef O_NONBLOCK
 #define O_NONBLOCK
diff --git a/source3/lib/popt_common.c b/source3/lib/popt_common.c
index 8ff2b8023bf2..128b9c187064 100644
--- a/source3/lib/popt_common.c
+++ b/source3/lib/popt_common.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "popt_common.h"
 
 /* Handle command line options:
diff --git a/source3/lib/recvfile.c b/source3/lib/recvfile.c
index ea0159642137..7cbb8a0b92e3 100644
--- a/source3/lib/recvfile.c
+++ b/source3/lib/recvfile.c
@@ -24,6 +24,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 
 /* Do this on our own in TRANSFER_BUF_SIZE chunks.
  * It's safe to make direct syscalls to lseek/write here
diff --git a/source3/lib/server_mutex.c b/source3/lib/server_mutex.c
index 43c0de1975f5..1ba9d6a65be9 100644
--- a/source3/lib/server_mutex.c
+++ b/source3/lib/server_mutex.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 
 /* For reasons known only to MS, many of their NT/Win2k versions
    need serialised access only.  Two connections at the same time
diff --git a/source3/lib/serverid.c b/source3/lib/serverid.c
index a8cdcfa2a9d3..f13c66e2c912 100644
--- a/source3/lib/serverid.c
+++ b/source3/lib/serverid.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "serverid.h"
 #include "dbwrap.h"
 
diff --git a/source3/lib/sessionid_tdb.c b/source3/lib/sessionid_tdb.c
index 1a91c047523e..ab54ec9ca5f8 100644
--- a/source3/lib/sessionid_tdb.c
+++ b/source3/lib/sessionid_tdb.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "dbwrap.h"
 #include "session.h"
 
diff --git a/source3/lib/sharesec.c b/source3/lib/sharesec.c
index 59be365e1ef9..c84e8fa00b2c 100644
--- a/source3/lib/sharesec.c
+++ b/source3/lib/sharesec.c
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "../libcli/security/security.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "dbwrap.h"
diff --git a/source3/lib/system.c b/source3/lib/system.c
index f846dcac8956..52b647726664 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -24,6 +24,7 @@
 #include "system/syslog.h"
 #include "system/capability.h"
 #include "system/passwd.h"
+#include "system/filesys.h"
 
 #ifdef HAVE_SYS_PRCTL_H
 #include <sys/prctl.h>
diff --git a/source3/lib/tdb_validate.c b/source3/lib/tdb_validate.c
index e001d9cb768a..b91ea7af834b 100644
--- a/source3/lib/tdb_validate.c
+++ b/source3/lib/tdb_validate.c
@@ -19,8 +19,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "tdb_validate.h"
 #include "includes.h"
+#include "system/filesys.h"
+#include "tdb_validate.h"
 
 /*
  * internal validation function, executed by the child.
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 1bd199cca673..973670ede08d 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "system/passwd.h"
+#include "system/filesys.h"
 #include "popt_common.h"
 #include "secrets.h"
 #include "ctdbd_conn.h"
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index 0c7db2e13434..b010c991f798 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "memcache.h"
 #include "../lib/async_req/async_sock.h"
 #include "../lib/util/select.h"
diff --git a/source3/lib/util_tdb.c b/source3/lib/util_tdb.c
index aef4a7dec33f..a9290ab94aee 100644
--- a/source3/lib/util_tdb.c
+++ b/source3/lib/util_tdb.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #undef malloc
 #undef realloc
 #undef calloc
diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c
index 11bfb4d069d6..d496ade71b0c 100644
--- a/source3/libads/kerberos.c
+++ b/source3/libads/kerberos.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "smb_krb5.h"
 #include "../librpc/gen_ndr/ndr_misc.h"
 #include "libads/kerberos_proto.h"
diff --git a/source3/libgpo/gpo_filesync.c b/source3/libgpo/gpo_filesync.c
index 4e3b93809ef8..be964a201e4f 100644
--- a/source3/libgpo/gpo_filesync.c
+++ b/source3/libgpo/gpo_filesync.c
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "../libgpo/gpo.h"
 #include "libgpo/gpo_proto.h"
 
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index 3ffe520fa7ad..0c6740e59c57 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "async_smb.h"
 #include "libsmb/clirap.h"
 #include "trans2.h"
diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index f3ef9547b7b3..facdbc7dc194 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
 #include "../libcli/security/security.h"
 
diff --git a/source3/libsmb/smb_share_modes.c b/source3/libsmb/smb_share_modes.c
index bf3250bab442..1a6c2123ed66 100644
--- a/source3/libsmb/smb_share_modes.c
+++ b/source3/libsmb/smb_share_modes.c
@@ -25,6 +25,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "smb_share_modes.h"
 
 /* Database context handle. */
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index 95194dad16bc..015289708167 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -25,6 +25,7 @@
    used. This allows us to provide the same semantics as NT */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "librpc/gen_ndr/messaging.h"
 #include "smbd/globals.h"
 #include "dbwrap.h"
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 32d1b34faae1..bfdf8092fd4c 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -36,6 +36,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "librpc/gen_ndr/messaging.h"
 #include "smbd/globals.h"
 #include "dbwrap.h"
diff --git a/source3/locking/posix.c b/source3/locking/posix.c
index 3bddb630dbac..c0eca295a233 100644
--- a/source3/locking/posix.c
+++ b/source3/locking/posix.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "dbwrap.h"
 
 #undef DBGC_CLASS
diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index 952bc9c6c1be..bb457fdc6a2a 100644
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -23,6 +23,7 @@
 #include "../libcli/security/dom_sid.h"
 #include "../libcli/security/security.h"
 #include "include/dbwrap.h"
+#include "system/filesys.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_ACLS
diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index e01ac4ec5f38..0e513ee682c8 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 "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 5fc1bc03f222..27aa37a8e072 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 "system/filesys.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_audit.c b/source3/modules/vfs_audit.c
index a073da8d912c..cb1a5d3a0c3d 100644
--- a/source3/modules/vfs_audit.c
+++ b/source3/modules/vfs_audit.c
@@ -22,6 +22,7 @@
 
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "system/syslog.h"
 
 #undef DBGC_CLASS
diff --git a/source3/modules/vfs_crossrename.c b/source3/modules/vfs_crossrename.c
index ad8f45ac3f1d..a754b1ff769a 100644
--- a/source3/modules/vfs_crossrename.c
+++ b/source3/modules/vfs_crossrename.c
@@ -16,6 +16,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 
 
 #define MODULE "crossrename"
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index b7e70a608b0d..886798ebc3d6 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS
diff --git a/source3/modules/vfs_dirsort.c b/source3/modules/vfs_dirsort.c
index 82a3a4bb98f0..050c7342c092 100644
--- a/source3/modules/vfs_dirsort.c
+++ b/source3/modules/vfs_dirsort.c
@@ -19,6 +19,7 @@
  */
 
 #include "includes.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 96f68e02c8d3..45cc32c88e51 100644
--- a/source3/modules/vfs_expand_msdfs.c
+++ b/source3/modules/vfs_expand_msdfs.c
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.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 dd2f9a832e17..326e40428ebd 100644
--- a/source3/modules/vfs_extd_audit.c
+++ b/source3/modules/vfs_extd_audit.c
@@ -23,6 +23,7 @@
 
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "system/syslog.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 af8b41065720..344b15f95da1 100644
--- a/source3/modules/vfs_fake_perms.c
+++ b/source3/modules/vfs_fake_perms.c
@@ -22,6 +22,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS
diff --git a/source3/modules/vfs_fileid.c b/source3/modules/vfs_fileid.c
index 559b520d1cd0..27da7d63bb06 100644
--- a/source3/modules/vfs_fileid.c
+++ b/source3/modules/vfs_fileid.c
@@ -20,6 +20,7 @@
  */
 
 #include "includes.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 aba5f83b441b..71a87233152a 100644
--- a/source3/modules/vfs_full_audit.c
+++ b/source3/modules/vfs_full_audit.c
@@ -58,6 +58,7 @@
 
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "system/syslog.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 
diff --git a/source3/modules/vfs_linux_xfs_sgid.c b/source3/modules/vfs_linux_xfs_sgid.c
index e01b2d115734..ca2b5b58a794 100644
--- a/source3/modules/vfs_linux_xfs_sgid.c
+++ b/source3/modules/vfs_linux_xfs_sgid.c
@@ -19,6 +19,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.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 734c603618f4..11559aea0e4d 100644
--- a/source3/modules/vfs_netatalk.c
+++ b/source3/modules/vfs_netatalk.c
@@ -19,6 +19,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS
diff --git a/source3/modules/vfs_posixacl.c b/source3/modules/vfs_posixacl.c
index 9dd25a781e9f..6bdfeda64654 100644
--- a/source3/modules/vfs_posixacl.c
+++ b/source3/modules/vfs_posixacl.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 
 
 /* prototypes for static functions first - for clarity */
diff --git a/source3/modules/vfs_preopen.c b/source3/modules/vfs_preopen.c
index e545901035bc..12a2f9df374f 100644
--- a/source3/modules/vfs_preopen.c
+++ b/source3/modules/vfs_preopen.c
@@ -19,6 +19,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 
 struct preopen_state;
 
diff --git a/source3/modules/vfs_readahead.c b/source3/modules/vfs_readahead.c
index e7a7dd305cce..0fd745d66a26 100644
--- a/source3/modules/vfs_readahead.c
+++ b/source3/modules/vfs_readahead.c
@@ -16,6 +16,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 
 struct readahead_data {
 	SMB_OFF_T off_bound;
diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c
index 626147ca83a6..607ce3a4b83e 100644
--- a/source3/modules/vfs_recycle.c
+++ b/source3/modules/vfs_recycle.c
@@ -23,6 +23,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 
 #define ALLOC_CHECK(ptr, label) do { if ((ptr) == NULL) { DEBUG(0, ("recycle.bin: out of memory!\n")); errno = ENOMEM; goto label; } } while(0)
diff --git a/source3/modules/vfs_scannedonly.c b/source3/modules/vfs_scannedonly.c
index fd6c3e2077bd..db18a077f50e 100644
--- a/source3/modules/vfs_scannedonly.c
+++ b/source3/modules/vfs_scannedonly.c
@@ -48,6 +48,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 
 #include "config.h"
 
diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c
index e3c3f9f3a06b..788270cf1518 100644
--- a/source3/modules/vfs_shadow_copy2.c
+++ b/source3/modules/vfs_shadow_copy2.c
@@ -20,6 +20,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 
 /*
 
diff --git a/source3/modules/vfs_streams_depot.c b/source3/modules/vfs_streams_depot.c
index 9870d0d571b1..ac0b95a63b9e 100644
--- a/source3/modules/vfs_streams_depot.c
+++ b/source3/modules/vfs_streams_depot.c
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS
diff --git a/source3/modules/vfs_streams_xattr.c b/source3/modules/vfs_streams_xattr.c
index fb83c5b789f1..6912a8b61099 100644
--- a/source3/modules/vfs_streams_xattr.c
+++ b/source3/modules/vfs_streams_xattr.c
@@ -22,6 +22,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "../lib/crypto/md5.h"
 
 #undef DBGC_CLASS
diff --git a/source3/modules/vfs_syncops.c b/source3/modules/vfs_syncops.c
index d5770d092cd0..a828e921656c 100644
--- a/source3/modules/vfs_syncops.c
+++ b/source3/modules/vfs_syncops.c
@@ -20,6 +20,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 
 /*
 
diff --git a/source3/modules/vfs_xattr_tdb.c b/source3/modules/vfs_xattr_tdb.c
index 594f2e635c9d..b98ebb3df600 100644
--- a/source3/modules/vfs_xattr_tdb.c
+++ b/source3/modules/vfs_xattr_tdb.c
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.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/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 9796815b27f0..ac199c505174 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "popt_common.h"
 #include "librpc/gen_ndr/messaging.h"
 #include "nmbd/nmbd.h"
diff --git a/source3/nmbd/nmbd_namelistdb.c b/source3/nmbd/nmbd_namelistdb.c
index 9c5d0efde2a9..c6315f665d7f 100644
--- a/source3/nmbd/nmbd_namelistdb.c
+++ b/source3/nmbd/nmbd_namelistdb.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "nmbd/nmbd.h"
 
 uint16 samba_nb_type = 0; /* samba's NetBIOS name type */
diff --git a/source3/nmbd/nmbd_serverlistdb.c b/source3/nmbd/nmbd_serverlistdb.c
index acb5310a6406..01627c333133 100644
--- a/source3/nmbd/nmbd_serverlistdb.c
+++ b/source3/nmbd/nmbd_serverlistdb.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "../librpc/gen_ndr/svcctl.h"
 #include "nmbd/nmbd.h"
 
diff --git a/source3/nmbd/nmbd_synclists.c b/source3/nmbd/nmbd_synclists.c
index 136a5c416cf0..2fd510cedd87 100644
--- a/source3/nmbd/nmbd_synclists.c
+++ b/source3/nmbd/nmbd_synclists.c
@@ -27,6 +27,7 @@
    also allows us to have more than 1 sync going at once (tridge) */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "../librpc/gen_ndr/svcctl.h"
 #include "nmbd/nmbd.h"
 #include "libsmb/clirap.h"
diff --git a/source3/nmbd/nmbd_winsserver.c b/source3/nmbd/nmbd_winsserver.c
index 2f48bc737f3c..976b99023ebf 100644
--- a/source3/nmbd/nmbd_winsserver.c
+++ b/source3/nmbd/nmbd_winsserver.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "nmbd/nmbd.h"
 
 #define WINS_LIST "wins.dat"
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 49b9248ca674..172e5c446ab9 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -52,6 +52,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "printing.h"
 #include "lib/smbconf/smbconf.h"
 #include "lib/smbconf/smbconf_init.h"
diff --git a/source3/passdb/account_pol.c b/source3/passdb/account_pol.c
index 40d8ddd4c9cd..a30b9ca32a7c 100644
--- a/source3/passdb/account_pol.c
+++ b/source3/passdb/account_pol.c
@@ -20,6 +20,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "dbwrap.h"
 #include "../libcli/security/security.h"
 static struct db_context *db;
diff --git a/source3/passdb/login_cache.c b/source3/passdb/login_cache.c
index eba83ea686c1..a12265642dfb 100644
--- a/source3/passdb/login_cache.c
+++ b/source3/passdb/login_cache.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB
diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c
index 9feb9bfe3a54..c39394bfa587 100644
--- a/source3/passdb/pdb_smbpasswd.c
+++ b/source3/passdb/pdb_smbpasswd.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "system/passwd.h"
+#include "system/filesys.h"
 #include "../librpc/gen_ndr/samr.h"
 #include "../libcli/security/security.h"
 
diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c
index da61e48a99d3..f24953820867 100644
--- a/source3/passdb/pdb_tdb.c
+++ b/source3/passdb/pdb_tdb.c
@@ -23,6 +23,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "dbwrap.h"
 #include "../libcli/security/security.h"
 
diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c
index 49a01254e3ee..db9fb7275de0 100644
--- a/source3/passdb/secrets.c
+++ b/source3/passdb/secrets.c
@@ -23,6 +23,7 @@
    such as the local SID and machine trust password */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "librpc/gen_ndr/ndr_secrets.h"
 #include "secrets.h"
diff --git a/source3/printing/nt_printing_migrate.c b/source3/printing/nt_printing_migrate.c
index 59fd04067b5f..a15c41beea8c 100644
--- a/source3/printing/nt_printing_migrate.c
+++ b/source3/printing/nt_printing_migrate.c
@@ -19,6 +19,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "printing/nt_printing_migrate.h"
 
 #include "librpc/gen_ndr/ndr_ntprinting.h"
diff --git a/source3/printing/nt_printing_tdb.c b/source3/printing/nt_printing_tdb.c
index 94671983a02a..98ac46797fcb 100644
--- a/source3/printing/nt_printing_tdb.c
+++ b/source3/printing/nt_printing_tdb.c
@@ -21,6 +21,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "printing/nt_printing_tdb.h"
 #include "librpc/gen_ndr/spoolss.h"
 #include "librpc/gen_ndr/ndr_security.h"
diff --git a/source3/printing/print_standard.c b/source3/printing/print_standard.c
index e38777315e41..a8460935c996 100644
--- a/source3/printing/print_standard.c
+++ b/source3/printing/print_standard.c
@@ -55,6 +55,7 @@
 
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "printing/pcap.h"
 
 /* handle standard printcap - moved from pcap_printer_fn() */
diff --git a/source3/printing/printer_list.c b/source3/printing/printer_list.c
index d36a746e4521..417eea777bb1 100644
--- a/source3/printing/printer_list.c
+++ b/source3/printing/printer_list.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "dbwrap.h"
 #include "printer_list.h"
 
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index fb33789a7fd0..1ebf41b7baa5 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "system/syslog.h"
+#include "system/filesys.h"
 #include "printing.h"
 #include "librpc/gen_ndr/messaging.h"
 #include "../librpc/gen_ndr/ndr_spoolss.h"
diff --git a/source3/printing/printing_db.c b/source3/printing/printing_db.c
index 762b418bb1eb..70accab93503 100644
--- a/source3/printing/printing_db.c
+++ b/source3/printing/printing_db.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "printing.h"
 
 static struct tdb_print_db *print_db_head;
diff --git a/source3/printing/tests/vlp.c b/source3/printing/tests/vlp.c
index ab05a425001e..4bff290e28a6 100644
--- a/source3/printing/tests/vlp.c
+++ b/source3/printing/tests/vlp.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "system/passwd.h"
+#include "system/filesys.h"
 #include "printing.h"
 
 #ifdef malloc
diff --git a/source3/registry/reg_api_regf.c b/source3/registry/reg_api_regf.c
index 3625fc4cabe3..97eab03a7069 100644
--- a/source3/registry/reg_api_regf.c
+++ b/source3/registry/reg_api_regf.c
@@ -19,6 +19,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "registry.h"
 #include "reg_api_regf.h"
 #include "reg_cachehook.h"
diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c
index 29b1a48c3cdc..4aed6e73e17b 100644
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -21,7 +21,7 @@
 /* Implementation of internal registry database functions. */
 
 #include "includes.h"
-
+#include "system/filesys.h"
 #include "registry.h"
 #include "reg_db.h"
 #include "reg_util_internal.h"
diff --git a/source3/registry/reg_parse.c b/source3/registry/reg_parse.c
index c03b39c29d79..0c596a8f5e0e 100644
--- a/source3/registry/reg_parse.c
+++ b/source3/registry/reg_parse.c
@@ -26,6 +26,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "cbuf.h"
 #include "srprs.h"
 #include "reg_parse_internal.h"
diff --git a/source3/registry/reg_perfcount.c b/source3/registry/reg_perfcount.c
index d660dd0565b8..136f67fd8fbc 100644
--- a/source3/registry/reg_perfcount.c
+++ b/source3/registry/reg_perfcount.c
@@ -20,6 +20,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "../librpc/gen_ndr/perfcount.h"
 #include "registry.h"
 #include "reg_perfcount.h"
diff --git a/source3/registry/regfio.c b/source3/registry/regfio.c
index 507f72082353..5d3fdba3c018 100644
--- a/source3/registry/regfio.c
+++ b/source3/registry/regfio.c
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "regfio.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 
diff --git a/source3/rpc_server/samr/srv_samr_chgpasswd.c b/source3/rpc_server/samr/srv_samr_chgpasswd.c
index 910b782c569c..613758f45469 100644
--- a/source3/rpc_server/samr/srv_samr_chgpasswd.c
+++ b/source3/rpc_server/samr/srv_samr_chgpasswd.c
@@ -48,6 +48,7 @@
 #include "includes.h"
 #include "system/terminal.h"
 #include "system/passwd.h"
+#include "system/filesys.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../lib/crypto/arcfour.h"
 #include "rpc_server/samr/srv_samr_util.h"
diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index 27d7f6092437..3f4c673b2113 100644
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -28,6 +28,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "srv_pipe_internal.h"
 #include "../librpc/gen_ndr/ndr_schannel.h"
 #include "../libcli/auth/schannel.h"
diff --git a/source3/rpc_server/svcctl/srv_svcctl_reg.c b/source3/rpc_server/svcctl/srv_svcctl_reg.c
index f4876222fb39..fb97c13fa5bf 100644
--- a/source3/rpc_server/svcctl/srv_svcctl_reg.c
+++ b/source3/rpc_server/svcctl/srv_svcctl_reg.c
@@ -22,6 +22,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "services/services.h"
 #include "services/svc_winreg_glue.h"
 #include "../librpc/gen_ndr/ndr_winreg_c.h"
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 547705bc571b..b2b8c2283a6f 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "printing.h"
 #include "librpc/gen_ndr/messaging.h"
 #include "smbd/globals.h"
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index a85e5a7e1d19..c1ba6764fcd7 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "smbd/globals.h"
 #include "libcli/security/security.h"
 
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index 325a3c646102..49ddf161ad25 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_xattr.h"
 #include "../libcli/security/security.h"
 
diff --git a/source3/smbd/file_access.c b/source3/smbd/file_access.c
index 28d028fcb1a1..5fb0e924c50d 100644
--- a/source3/smbd/file_access.c
+++ b/source3/smbd/file_access.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "../libcli/security/security.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index 03877218de57..4238e58d106b 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -25,6 +25,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "fake_file.h"
 
 static NTSTATUS build_stream_path(TALLOC_CTX *mem_ctx,
diff --git a/source3/smbd/mangle_hash.c b/source3/smbd/mangle_hash.c
index 13e797c0e546..89df10a75714 100644
--- a/source3/smbd/mangle_hash.c
+++ b/source3/smbd/mangle_hash.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "smbd/globals.h"
 #include "mangle.h"
 
diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
index d5d46fd539a3..17caa36d5d12 100644
--- a/source3/smbd/msdfs.c
+++ b/source3/smbd/msdfs.c
@@ -22,6 +22,7 @@
 
 #define DBGC_CLASS DBGC_MSDFS
 #include "includes.h"
+#include "system/filesys.h"
 #include "smbd/globals.h"
 #include "msdfs.h"
 
diff --git a/source3/smbd/notify_internal.c b/source3/smbd/notify_internal.c
index acb438b1189d..3b481cdef9fb 100644
--- a/source3/smbd/notify_internal.c
+++ b/source3/smbd/notify_internal.c
@@ -24,6 +24,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_notify.h"
 #include "librpc/gen_ndr/messaging.h"
 #include "dbwrap.h"
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index afc4f54cf294..c1256f259fd3 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.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 937117bee06e..3c91d8485e77 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "printing.h"
 #include "smbd/globals.h"
 #include "fake_file.h"
diff --git a/source3/smbd/oplock_linux.c b/source3/smbd/oplock_linux.c
index bdc86b9fb904..efc8c70d398a 100644
--- a/source3/smbd/oplock_linux.c
+++ b/source3/smbd/oplock_linux.c
@@ -19,6 +19,7 @@
 
 #define DBGC_CLASS DBGC_LOCKING
 #include "includes.h"
+#include "system/filesys.h"
 #include "smbd/globals.h"
 
 #if HAVE_KERNEL_OPLOCKS_LINUX
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 8e2c9d871b9e..0e7ab87b6e66 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.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 48d317bba294..29eb201bed49 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "smbd/globals.h"
 #include "librpc/gen_ndr/netlogon.h"
 #include "librpc/gen_ndr/messaging.h"
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 26a73b8582df..7562ca18050c 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -25,6 +25,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "printing.h"
 #include "smbd/globals.h"
 #include "fake_file.h"
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 8c7b146e19e9..7461eef62fc0 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "popt_common.h"
 #include "smbd/globals.h"
 #include "librpc/gen_ndr/messaging.h"
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 00b5294be668..800b79989f44 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "smbd/globals.h"
 #include "../librpc/gen_ndr/netlogon.h"
 #include "../libcli/security/security.h"
diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c
index d5f6896f645d..ce3955b53ab1 100644
--- a/source3/smbd/smb2_read.c
+++ b/source3/smbd/smb2_read.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 #include "libcli/security/security.h"
diff --git a/source3/smbd/statvfs.c b/source3/smbd/statvfs.c
index ee33e13a48dd..55469f5d083c 100644
--- a/source3/smbd/statvfs.c
+++ b/source3/smbd/statvfs.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.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 1fcbfaac231d..5e8c0c80d898 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -24,6 +24,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "version.h"
 #include "smbd/globals.h"
 #include "../libcli/auth/libcli_auth.h"
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 41d36504131d..7af94f94b5b1 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -24,6 +24,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "smbd/globals.h"
 #include "memcache.h"
 
diff --git a/source3/torture/cmd_vfs.c b/source3/torture/cmd_vfs.c
index e1772dc22e2b..0720f084aa1c 100644
--- a/source3/torture/cmd_vfs.c
+++ b/source3/torture/cmd_vfs.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "system/passwd.h"
+#include "system/filesys.h"
 #include "vfstest.h"
 #include "../lib/util/util_pw.h"
 
diff --git a/source3/torture/denytest.c b/source3/torture/denytest.c
index 4762bf7d0eba..1f60734fa7a7 100644
--- a/source3/torture/denytest.c
+++ b/source3/torture/denytest.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "torture/proto.h"
 
 extern bool torture_showall;
diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c
index 9a47f991ea38..6a53c88e5af7 100644
--- a/source3/torture/locktest.c
+++ b/source3/torture/locktest.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 
 static fstring password[2];
 static fstring username[2];
diff --git a/source3/torture/locktest2.c b/source3/torture/locktest2.c
index 782427b8a9c4..b51b8f2cad6a 100644
--- a/source3/torture/locktest2.c
+++ b/source3/torture/locktest2.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 
 static fstring password;
 static fstring username;
diff --git a/source3/torture/mangle_test.c b/source3/torture/mangle_test.c
index 6b9263e5de27..dd6846714091 100644
--- a/source3/torture/mangle_test.c
+++ b/source3/torture/mangle_test.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "torture/proto.h"
 #include "libsmb/clirap.h"
 
diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c
index c94ed0c9a9a5..bf7e6fbb3c10 100644
--- a/source3/torture/masktest.c
+++ b/source3/torture/masktest.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "trans2.h"
 
 static fstring password;
diff --git a/source3/torture/scanner.c b/source3/torture/scanner.c
index fa7d6fbe393f..c7d3ebc29131 100644
--- a/source3/torture/scanner.c
+++ b/source3/torture/scanner.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "torture/proto.h"
 
 #define VERBOSE 0
diff --git a/source3/torture/smbiconv.c b/source3/torture/smbiconv.c
index 0ba796d96834..88ad6fef6097 100644
--- a/source3/torture/smbiconv.c
+++ b/source3/torture/smbiconv.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "popt_common.h"
 #undef realloc
 
diff --git a/source3/torture/utable.c b/source3/torture/utable.c
index b7789d35bcea..3ddb4688341f 100644
--- a/source3/torture/utable.c
+++ b/source3/torture/utable.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "torture/proto.h"
 #include "../libcli/security/security.h"
 #include "libsmb/clirap.h"
diff --git a/source3/utils/dbwrap_tool.c b/source3/utils/dbwrap_tool.c
index 796bea938d4d..f65964d7f975 100644
--- a/source3/utils/dbwrap_tool.c
+++ b/source3/utils/dbwrap_tool.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "dbwrap.h"
 
 typedef enum { OP_FETCH, OP_STORE, OP_DELETE, OP_ERASE, OP_LISTKEYS } dbwrap_op;
diff --git a/source3/utils/dbwrap_torture.c b/source3/utils/dbwrap_torture.c
index 22c0a64a52ae..e9bf98a078a7 100644
--- a/source3/utils/dbwrap_torture.c
+++ b/source3/utils/dbwrap_torture.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "popt_common.h"
 #include "dbwrap.h"
 
diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 9e536b77ccf9..fd00c008dd6f 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -28,6 +28,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "utils/net.h"
 #include "lib/smbconf/smbconf.h"
 #include "lib/smbconf/smbconf_init.h"
diff --git a/source3/utils/net_idmap.c b/source3/utils/net_idmap.c
index e7bac53e5fb4..79f69f24a13f 100644
--- a/source3/utils/net_idmap.c
+++ b/source3/utils/net_idmap.c
@@ -19,6 +19,7 @@
 
 #define FOO(x) (x)
 #include "includes.h"
+#include "system/filesys.h"
 #include "utils/net.h"
 #include "secrets.h"
 #include "idmap.h"
diff --git a/source3/utils/net_printing.c b/source3/utils/net_printing.c
index 689fac214b9b..8019d4ff612d 100644
--- a/source3/utils/net_printing.c
+++ b/source3/utils/net_printing.c
@@ -20,6 +20,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "utils/net.h"
 #include "librpc/gen_ndr/ndr_ntprinting.h"
 #include "librpc/gen_ndr/ndr_spoolss_c.h"
diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c
index 8be4fb145c24..0e63d189470c 100644
--- a/source3/utils/net_rpc_printer.c
+++ b/source3/utils/net_rpc_printer.c
@@ -17,6 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "includes.h"
+#include "system/filesys.h"
 #include "utils/net.h"
 #include "../librpc/gen_ndr/ndr_spoolss_c.h"
 #include "rpc_client/cli_spoolss.h"
diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c
index 809ec5909748..5ccd16694505 100644
--- a/source3/utils/net_rpc_registry.c
+++ b/source3/utils/net_rpc_registry.c
@@ -18,6 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
  
 #include "includes.h"
+#include "system/filesys.h"
 #include "registry.h"
 #include "utils/net.h"
 #include "utils/net_registry_util.h"
diff --git a/source3/utils/net_usershare.c b/source3/utils/net_usershare.c
index 13b18934e825..06ed4533d551 100644
--- a/source3/utils/net_usershare.c
+++ b/source3/utils/net_usershare.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "system/passwd.h"
+#include "system/filesys.h"
 #include "utils/net.h"
 #include "../libcli/security/security.h"
 
diff --git a/source3/utils/profiles.c b/source3/utils/profiles.c
index 53862f441fc3..30c6ad0a1fb9 100644
--- a/source3/utils/profiles.c
+++ b/source3/utils/profiles.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "popt_common.h"
 #include "registry/reg_objects.h"
 #include "registry/regfio.h"
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index ed7ca596d8ad..3ecd2d4531b5 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -24,6 +24,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "popt_common.h"
 #include "librpc/gen_ndr/messaging.h"
 #include "librpc/gen_ndr/spoolss.h"
diff --git a/source3/utils/smbfilter.c b/source3/utils/smbfilter.c
index f455f2df91c8..9cdbb690c84c 100644
--- a/source3/utils/smbfilter.c
+++ b/source3/utils/smbfilter.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "system/select.h"
 #include "../lib/util/select.h"
 
diff --git a/source3/utils/status.c b/source3/utils/status.c
index dd7f7ea68678..21ed9ea52f92 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -31,6 +31,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "popt_common.h"
 #include "dbwrap.h"
 #include "../libcli/security/security.h"
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index 1a011a5a37da..978ada26c653 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -32,6 +32,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "popt_common.h"
 
 /*******************************************************************
diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index b783d0c9d4f6..c7edf6b27ddb 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "system/passwd.h"
+#include "system/filesys.h"
 #include "web/swat_proto.h"
 
 #define MAX_VARIABLES 10000
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 54f4cd7b2026..1b73b21dd34c 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -28,6 +28,7 @@
  **/
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "popt_common.h"
 #include "web/swat_proto.h"
 #include "printing/pcap.h"
diff --git a/source3/winbindd/idmap_autorid.c b/source3/winbindd/idmap_autorid.c
index 81919216d6da..5e3dacf62405 100644
--- a/source3/winbindd/idmap_autorid.c
+++ b/source3/winbindd/idmap_autorid.c
@@ -23,6 +23,7 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "winbindd.h"
 #include "dbwrap.h"
 #include "idmap.h"
diff --git a/source3/winbindd/idmap_tdb.c b/source3/winbindd/idmap_tdb.c
index 18c7fbbe53fa..19e7f0e1d5f1 100644
--- a/source3/winbindd/idmap_tdb.c
+++ b/source3/winbindd/idmap_tdb.c
@@ -24,6 +24,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "winbindd.h"
 #include "idmap.h"
 #include "idmap_rw.h"
diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index 243c46a03c03..5b1757b1dd3e 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -24,6 +24,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "winbindd.h"
 #include "tdb_validate.h"
 #include "../libcli/auth/libcli_auth.h"