14 files changed, 27 insertions, 2 deletions
diff --git a/source4/smb_server/conn.c b/source4/smb_server/conn.c
index dce77f7978..a4bf2716fe 100644
--- a/source4/smb_server/conn.c
+++ b/source4/smb_server/conn.c
@@ -22,6 +22,8 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "dlinklist.h"
+#include "smb_server/smb_server.h"
+
 
 /****************************************************************************
 init the tcon structures
diff --git a/source4/smb_server/negprot.c b/source4/smb_server/negprot.c
index b500251265..bd1d8249d9 100644
--- a/source4/smb_server/negprot.c
+++ b/source4/smb_server/negprot.c
@@ -21,6 +21,8 @@
 #include "includes.h"
 #include "auth/auth.h"
 #include "asn_1.h"
+#include "smb_server/smb_server.h"
+
 
 /* initialise the auth_context for this server and return the cryptkey */
 static void get_challenge(struct smbsrv_connection *smb_conn, char buff[8]) 
diff --git a/source4/smb_server/nttrans.c b/source4/smb_server/nttrans.c
index 336328429b..0ea92c80a0 100644
--- a/source4/smb_server/nttrans.c
+++ b/source4/smb_server/nttrans.c
@@ -23,6 +23,8 @@
 */
 
 #include "includes.h"
+#include "smb_server/smb_server.h"
+
 
 
 #define CHECK_MIN_BLOB_SIZE(blob, size) do { \
diff --git a/source4/smb_server/password.c b/source4/smb_server/password.c
index fc3ee10584..91a9eac3c7 100644
--- a/source4/smb_server/password.c
+++ b/source4/smb_server/password.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "dlinklist.h"
+#include "smb_server/smb_server.h"
 
 
 /****************************************************************************
diff --git a/source4/smb_server/reply.c b/source4/smb_server/reply.c
index 8c20b2bb72..eb75ab08c7 100644
--- a/source4/smb_server/reply.c
+++ b/source4/smb_server/reply.c
@@ -24,6 +24,8 @@
 */
 
 #include "includes.h"
+#include "smb_server/smb_server.h"
+
 
 /* useful way of catching wct errors with file and line number */
 #define REQ_CHECK_WCT(req, wcount) do { \
diff --git a/source4/smb_server/request.c b/source4/smb_server/request.c
index 14e1d558cb..b1cb8fe2df 100644
--- a/source4/smb_server/request.c
+++ b/source4/smb_server/request.c
@@ -24,6 +24,8 @@
 
 #include "includes.h"
 #include "dlinklist.h"
+#include "smb_server/smb_server.h"
+
 
 /* we over allocate the data buffer to prevent too many realloc calls */
 #define REQ_OVER_ALLOCATION 256
diff --git a/source4/smb_server/search.c b/source4/smb_server/search.c
index adcafccafa..a0bc5b764b 100644
--- a/source4/smb_server/search.c
+++ b/source4/smb_server/search.c
@@ -23,6 +23,8 @@
 */
 
 #include "includes.h"
+#include "smb_server/smb_server.h"
+
 
 /* check req->async.status and if not OK then send an error reply */
 #define CHECK_ASYNC_STATUS do { \
diff --git a/source4/smb_server/service.c b/source4/smb_server/service.c
index 8519869e6b..815a58ce70 100644
--- a/source4/smb_server/service.c
+++ b/source4/smb_server/service.c
@@ -19,6 +19,8 @@
 */
 
 #include "includes.h"
+#include "smb_server/smb_server.h"
+
 
 
 /****************************************************************************
diff --git a/source4/smb_server/sesssetup.c b/source4/smb_server/sesssetup.c
index 8f55df58d2..cc8d4d7ff2 100644
--- a/source4/smb_server/sesssetup.c
+++ b/source4/smb_server/sesssetup.c
@@ -24,6 +24,8 @@
 #include "includes.h"
 #include "auth/auth.h"
 #include "asn_1.h"
+#include "smb_server/smb_server.h"
+
 
 /*
   setup the OS, Lanman and domain portions of a session setup reply
diff --git a/source4/smb_server/signing.c b/source4/smb_server/signing.c
index b3fac2fa70..8a3fd10095 100644
--- a/source4/smb_server/signing.c
+++ b/source4/smb_server/signing.c
@@ -19,6 +19,8 @@
 */
 
 #include "includes.h"
+#include "smb_server/smb_server.h"
+
 
 /*
   sign an outgoing packet
diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c
index a42ec3c82b..aa3a2a794c 100644
--- a/source4/smb_server/smb_server.c
+++ b/source4/smb_server/smb_server.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "system/time.h"
 #include "dlinklist.h"
+#include "smb_server/smb_server.h"
 
 
 /*
diff --git a/source4/smb_server/smb_server.h b/source4/smb_server/smb_server.h
index 054fc7c35d..121fff6ecd 100644
--- a/source4/smb_server/smb_server.h
+++ b/source4/smb_server/smb_server.h
@@ -20,6 +20,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include "request.h"
+#include "smbd/process_model.h"
+
 /*
   this header declares the core context structures associated with smb
   sockets, tree connects, requests etc
@@ -140,8 +143,6 @@ struct substitute_context {
 	char *user_name;
 };
 
-#include "smbd/process_model.h"
-
 /* smb server context structure. This should contain all the state
  * information associated with a SMB server connection 
  */
diff --git a/source4/smb_server/srvtime.c b/source4/smb_server/srvtime.c
index c39267521c..999ffc3ee1 100644
--- a/source4/smb_server/srvtime.c
+++ b/source4/smb_server/srvtime.c
@@ -21,6 +21,8 @@
 */
 
 #include "includes.h"
+#include "smb_server/smb_server.h"
+
 
 /*******************************************************************
 put a dos date into a buffer (time/date format)
diff --git a/source4/smb_server/trans2.c b/source4/smb_server/trans2.c
index 3c447c555e..02a7cbff01 100644
--- a/source4/smb_server/trans2.c
+++ b/source4/smb_server/trans2.c
@@ -22,6 +22,8 @@
 */
 
 #include "includes.h"
+#include "smb_server/smb_server.h"
+
 
 
 #define CHECK_MIN_BLOB_SIZE(blob, size) do { \