s3-trans2: only include trans2.h where needed.

Guenther

16 files changed, 15 insertions, 1 deletions

diff --git a/source3/client/client.c b/source3/client/client.c
index 000970e5ccd..bc4816be8c3 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -32,6 +32,7 @@
 #include "../libcli/security/security.h"
 #include "system/select.h"
 #include "libsmb/clirap.h"
+#include "trans2.h"
 
 #ifndef REGISTER
 #define REGISTER 0
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 346829d2dc5..1655cfea69a 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -539,7 +539,6 @@ typedef char fstring[FSTRING_LEN];
 #include "../lib/util/time.h"
 
 #include "libads/ads_status.h"
-#include "trans2.h"
 #include "../libcli/util/error.h"
 #include "ntioctl.h"
 #include "../lib/util/charset/charset.h"
diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index 957bf4d707c..c252b85f8e0 100644
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "libsmb/clirap.h"
 #include "msdfs.h"
+#include "trans2.h"
 
 /********************************************************************
  Important point.
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index 6e4cf90e51e..3ffe520fa7a 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "async_smb.h"
 #include "libsmb/clirap.h"
+#include "trans2.h"
 
 /***********************************************************
  Common function for pushing stings, used by smb_bytes_push_str()
diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c
index 7845a9de078..ebd04e6d2b6 100644
--- a/source3/libsmb/clifsinfo.c
+++ b/source3/libsmb/clifsinfo.c
@@ -23,6 +23,7 @@
 #include "../libcli/auth/ntlmssp.h"
 #include "async_smb.h"
 #include "smb_crypt.h"
+#include "trans2.h"
 
 /****************************************************************************
  Get UNIX extensions version info.
diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c
index 87c66672e10..552de002428 100644
--- a/source3/libsmb/clilist.c
+++ b/source3/libsmb/clilist.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "async_smb.h"
+#include "trans2.h"
 
 /****************************************************************************
  Calculate a safe next_entry_offset.
diff --git a/source3/libsmb/cliquota.c b/source3/libsmb/cliquota.c
index 87ca00fd144..e05b64e686b 100644
--- a/source3/libsmb/cliquota.c
+++ b/source3/libsmb/cliquota.c
@@ -21,6 +21,7 @@
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "fake_file.h"
 #include "../libcli/security/security.h"
+#include "trans2.h"
 
 NTSTATUS cli_get_quota_handle(struct cli_state *cli, uint16_t *quota_fnum)
 {
diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c
index 141db7131e0..8d1be2d66e2 100644
--- a/source3/libsmb/clirap.c
+++ b/source3/libsmb/clirap.c
@@ -25,6 +25,7 @@
 #include "../lib/crypto/arcfour.h"
 #include "async_smb.h"
 #include "libsmb/clirap.h"
+#include "trans2.h"
 
 #define PIPE_LANMAN   "\\PIPE\\LANMAN"
 
diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
index a6620d9f5ef..59f8ac3aee5 100644
--- a/source3/libsmb/clireadwrite.c
+++ b/source3/libsmb/clireadwrite.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "async_smb.h"
+#include "trans2.h"
 
 /****************************************************************************
   Calculate the recommended read buffer size
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index ebdc644ef9e..8e2c9d871b9 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "../libcli/security/security.h"
+#include "trans2.h"
 
 extern const struct generic_mapping file_generic_mapping;
 
diff --git a/source3/smbd/smb2_find.c b/source3/smbd/smb2_find.c
index fe5dee618e7..4c779f92e77 100644
--- a/source3/smbd/smb2_find.c
+++ b/source3/smbd/smb2_find.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
+#include "trans2.h"
 
 static struct tevent_req *smbd_smb2_find_send(TALLOC_CTX *mem_ctx,
 					      struct tevent_context *ev,
diff --git a/source3/smbd/smb2_getinfo.c b/source3/smbd/smb2_getinfo.c
index 123531c3511..70225f18d2d 100644
--- a/source3/smbd/smb2_getinfo.c
+++ b/source3/smbd/smb2_getinfo.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
+#include "trans2.h"
 
 static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx,
 						 struct tevent_context *ev,
diff --git a/source3/smbd/smb2_setinfo.c b/source3/smbd/smb2_setinfo.c
index 26d94e2b10e..ba06fb3db71 100644
--- a/source3/smbd/smb2_setinfo.c
+++ b/source3/smbd/smb2_setinfo.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
+#include "trans2.h"
 
 static struct tevent_req *smbd_smb2_setinfo_send(TALLOC_CTX *mem_ctx,
 						 struct tevent_context *ev,
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 12cbc3b9e9e..1fcbfaac231 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -30,6 +30,7 @@
 #include "../librpc/gen_ndr/xattr.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "libcli/security/security.h"
+#include "trans2.h"
 
 #define DIR_ENTRY_SAFETY_MARGIN 4096
 
diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c
index 88791028444..c94ed0c9a9a 100644
--- a/source3/torture/masktest.c
+++ b/source3/torture/masktest.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "trans2.h"
 
 static fstring password;
 static fstring username;
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 66433ecfad0..68871d304ad 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -31,6 +31,7 @@
 #include "talloc_dict.h"
 #include "async_smb.h"
 #include "libsmb/clirap.h"
+#include "trans2.h"
 
 extern char *optarg;
 extern int optind;