r5298: - got rid of pstring.h from includes.h. This at least makes it a bit

   less likely that anyone will use pstring for new code

 - got rid of winbind_client.h from includes.h. This one triggered a
   huge change, as winbind_client.h was including system/filesys.h and
   defining the old uint32 and uint16 types, as well as its own
   pstring and fstring.
(This used to be commit 9db6c79e902ec538108d6b7d3324039aabe1704f)

10 files changed, 13 insertions, 0 deletions

diff --git a/source4/torture/basic/delaywrite.c b/source4/torture/basic/delaywrite.c
index 27a7c92eed..b0d92d005d 100644
--- a/source4/torture/basic/delaywrite.c
+++ b/source4/torture/basic/delaywrite.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
+#include "system/filesys.h"
 
 #define BASEDIR "\\delaywrite"
 
diff --git a/source4/torture/basic/delete.c b/source4/torture/basic/delete.c
index 3247a7cd28..f3aef08ce1 100644
--- a/source4/torture/basic/delete.c
+++ b/source4/torture/basic/delete.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_security.h"
 
 
diff --git a/source4/torture/basic/denytest.c b/source4/torture/basic/denytest.c
index 7308805da7..35c22ff19f 100644
--- a/source4/torture/basic/denytest.c
+++ b/source4/torture/basic/denytest.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
 #include "librpc/gen_ndr/ndr_security.h"
 
diff --git a/source4/torture/basic/dir.c b/source4/torture/basic/dir.c
index d7721ce5ae..59cd21f06d 100644
--- a/source4/torture/basic/dir.c
+++ b/source4/torture/basic/dir.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_security.h"
 
 static void list_fn(struct clilist_file_info *finfo, const char *name, void *state)
diff --git a/source4/torture/basic/disconnect.c b/source4/torture/basic/disconnect.c
index 2a302ae3f6..fab9733eb0 100644
--- a/source4/torture/basic/disconnect.c
+++ b/source4/torture/basic/disconnect.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
 #include "librpc/gen_ndr/ndr_security.h"
 
diff --git a/source4/torture/basic/locking.c b/source4/torture/basic/locking.c
index 00310e5405..c3feaae2eb 100644
--- a/source4/torture/basic/locking.c
+++ b/source4/torture/basic/locking.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
+#include "system/filesys.h"
 
 #define BASEDIR "\\locktest"
 
diff --git a/source4/torture/basic/mangle_test.c b/source4/torture/basic/mangle_test.c
index a0333b1c53..3ea2644d1a 100644
--- a/source4/torture/basic/mangle_test.c
+++ b/source4/torture/basic/mangle_test.c
@@ -19,7 +19,9 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "lib/tdb/include/tdbutil.h"
+#include "pstring.h"
 
 static TDB_CONTEXT *tdb;
 
diff --git a/source4/torture/basic/scanner.c b/source4/torture/basic/scanner.c
index b1bbdf1cd1..df9234feca 100644
--- a/source4/torture/basic/scanner.c
+++ b/source4/torture/basic/scanner.c
@@ -20,7 +20,9 @@
 
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
+#include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "pstring.h"
 
 #define VERBOSE 0
 #define OP_MIN 0
diff --git a/source4/torture/basic/unlink.c b/source4/torture/basic/unlink.c
index 30d862e345..40a486f93f 100644
--- a/source4/torture/basic/unlink.c
+++ b/source4/torture/basic/unlink.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
 #include "librpc/gen_ndr/ndr_security.h"
 
diff --git a/source4/torture/basic/utable.c b/source4/torture/basic/utable.c
index 01984077a3..ea1bb76b8c 100644
--- a/source4/torture/basic/utable.c
+++ b/source4/torture/basic/utable.c
@@ -20,7 +20,9 @@
 
 #include "includes.h"
 #include "system/iconv.h"
+#include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "pstring.h"
 
 BOOL torture_utable(void)
 {