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

Guenther

132 files changed, 132 insertions, 4 deletions

diff --git a/libgpo/gpo_util.c b/libgpo/gpo_util.c
index 9e4687ddc9..553402a427 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 d6c47a8332..4ed6db1f62 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 bc4816be8c..29ef0e6679 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 ac891aa7e8..b46115becf 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 2add37f49d..98c350d7dd 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 cd9a59cb4f..2634552127 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 6fc8809e88..91b81e4ea0 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 ac7e9dda40..19a50c49f6 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 e4c5e72014..50f0d9fa1b 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 46ec6dec29..9b0b66c1f0 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 59a891205a..90acc1679b 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 70062345a6..4941199c5e 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 dfbcf8445c..59f1d590b6 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 2bbc952108..67c37f34e7 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 8cc060b9e2..9b3a7ed7c7 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 a3e39db784..88d0fb07ea 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 8ff2b8023b..128b9c1870 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 ea01596421..7cbb8a0b92 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 43c0de1975..1ba9d6a65b 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 a8cdcfa2a9..f13c66e2c9 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 1a91c04752..ab54ec9ca5 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 59be365e1e..c84e8fa00b 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 f846dcac89..52b6477266 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 e001d9cb76..b91ea7af83 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 1bd199cca6..973670ede0 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 0c7db2e134..b010c991f7 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 aef4a7dec3..a9290ab94a 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 11bfb4d069..d496ade71b 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 4e3b93809e..be964a201e 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 3ffe520fa7..0c6740e59c 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 f3ef9547b7..facdbc7dc1 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 bf3250bab4..1a6c2123ed 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 95194dad16..0152897081 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 32d1b34faa..bfdf8092fd 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 3bddb630db..c0eca295a2 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 952bc9c6c1..bb457fdc6a 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 e01ac4ec5f..0e513ee682 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 5fc1bc03f2..27aa37a8e0 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 a073da8d91..cb1a5d3a0c 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 ad8f45ac3f..a754b1ff76 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 b7e70a608b..886798ebc3 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 82a3a4bb98..050c7342c0 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 96f68e02c8..45cc32c88e 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 dd2f9a832e..326e40428e 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 af8b410657..344b15f95d 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 559b520d1c..27da7d63bb 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 aba5f83b44..71a8723315 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 e01b2d1157..ca2b5b58a7 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 734c603618..11559aea0e 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 9dd25a781e..6bdfeda646 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 e545901035..12a2f9df37 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 e7a7dd305c..0fd745d66a 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 626147ca83..607ce3a4b8 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 fd6c3e2077..db18a077f5 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 e3c3f9f3a0..788270cf15 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 9870d0d571..ac0b95a63b 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 fb83c5b789..6912a8b610 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 d5770d092c..a828e92165 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 594f2e635c..b98ebb3df6 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 9796815b27..ac199c5051 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 9c5d0efde2..c6315f665d 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 acb5310a64..01627c3331 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 136a5c416c..2fd510cedd 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 2f48bc737f..976b99023e 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 49b9248ca6..172e5c446a 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 40d8ddd4c9..a30b9ca32a 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 eba83ea686..a12265642d 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 9feb9bfe3a..c39394bfa5 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 da61e48a99..f249538208 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 49a01254e3..db9fb7275d 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 59fd04067b..a15c41beea 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 94671983a0..98ac46797f 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 e38777315e..a8460935c9 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 d36a746e45..417eea777b 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 fb33789a7f..1ebf41b7ba 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 762b418bb1..70accab935 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 ab05a42500..4bff290e28 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 3625fc4cab..97eab03a70 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 29b1a48c3c..4aed6e73e1 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 c03b39c29d..0c596a8f5e 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 d660dd0565..136f67fd8f 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 507f720823..5d3fdba3c0 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 910b782c56..613758f454 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 27d7f60924..3f4c673b21 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 f4876222fb..fb97c13fa5 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 547705bc57..b2b8c2283a 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 a85e5a7e1d..c1ba6764fc 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 325a3c6461..49ddf161ad 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 28d028fcb1..5fb0e924c5 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 03877218de..4238e58d10 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 13e797c0e5..89df10a757 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 d5d46fd539..17caa36d5d 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 acb438b118..3b481cdef9 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 afc4f54cf2..c1256f259f 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 937117bee0..3c91d8485e 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 bdc86b9fb9..efc8c70d39 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 8e2c9d871b..0e7ab87b6e 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 48d317bba2..29eb201bed 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 26a73b8582..7562ca1805 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 8c7b146e19..7461eef62f 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 00b5294be6..800b79989f 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 d5f6896f64..ce3955b53a 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 ee33e13a48..55469f5d08 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 1fcbfaac23..5e8c0c80d8 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 41d3650413..7af94f94b5 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 e1772dc22e..0720f084aa 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 4762bf7d0e..1f60734fa7 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 9a47f991ea..6a53c88e5a 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 782427b8a9..b51b8f2cad 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 6b9263e5de..dd68467140 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 c94ed0c9a9..bf7e6fbb3c 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 fa7d6fbe39..c7d3ebc291 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 0ba796d968..88ad6fef60 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 b7789d35bc..3ddb468834 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 796bea938d..f65964d7f9 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 22c0a64a52..e9bf98a078 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 9e536b77cc..fd00c008dd 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 e7bac53e5f..79f69f24a1 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 689fac214b..8019d4ff61 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 8be4fb145c..0e63d18947 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 809ec59097..5ccd166945 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 13b18934e8..06ed4533d5 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 53862f441f..30c6ad0a1f 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 ed7ca596d8..3ecd2d4531 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 f455f2df91..9cdbb690c8 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 dd7f7ea686..21ed9ea52f 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 1a011a5a37..978ada26c6 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 b783d0c9d4..c7edf6b27d 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 54f4cd7b20..1b73b21dd3 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 81919216d6..5e3dacf624 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 18c7fbbe53..19e7f0e1d5 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 243c46a03c..5b1757b1dd 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"