5 files changed, 25 insertions, 20 deletions
diff --git a/source4/include/cli_context.h b/source4/include/cli_context.h
index a69cb93aa8..65128f09f5 100644
--- a/source4/include/cli_context.h
+++ b/source4/include/cli_context.h
@@ -30,7 +30,7 @@ struct smbcli_state {
 	struct smbcli_transport *transport;
 	struct smbcli_session *session;
 	struct smbcli_tree *tree;
-	struct substitute_context substitute;
+	struct substitute_context *substitute;
 };
 
 #endif /* _SMBCLI_CONTEXT_H */
diff --git a/source4/include/includes.h b/source4/include/includes.h
index 86222679e4..c58cf1a5c5 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -181,6 +181,8 @@ extern int errno;
 #include "pstring.h"
 
 /* Lists, trees, caching, database... */
+#include "dynconfig.h"
+#include "version.h"
 #include "xfile.h"
 #include "talloc.h"
 #include "lib/ldb/include/ldb.h"
@@ -192,50 +194,32 @@ extern int errno;
 #include "trans2.h"
 #include "nterr.h"
 #include "charset.h"
-#include "dynconfig.h"
-
-#include "version.h"
 #include "rewrite.h"
 #include "smb.h"
 #include "ads.h"
 #include "lib/socket/socket.h"
 #include "libcli/ldap/ldap.h"
 #include "nameserv.h"
-
 #include "byteorder.h"
-
 #include "module.h"
-
 #include "mutex.h"
-
-#include "structs.h"
 #include "librpc/ndr/libndr.h"
 #include "librpc/ndr/ndr_sec.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_dcerpc.h"
 #include "librpc/rpc/dcerpc.h"
 #include "librpc/gen_ndr/tables.h"
-
 #include "smb_interfaces.h"
 #include "smbd/server.h"
 #include "smbd/service.h"
 #include "rpc_server/dcerpc_server.h"
-#include "request.h"
-#include "signing.h"
-#include "smb_server/smb_server.h"
+#include "structs.h"
 #include "ntvfs/ntvfs.h"
 #include "cli_context.h"
-
 #include "libnet/libnet.h"
 #include "utils/net/net.h"
-
 #include "nsswitch/winbind_client.h"
 
-/* hmm, this really is getting ugly isn't it .... we probably need to
-   have some way to have subsystem includes without including it
-   globally */
-#include "ntvfs/posix/vfs_posix.h"
-
 #define malloc_p(type) (type *)malloc(sizeof(type))
 #define malloc_array_p(type, count) (type *)realloc_array(NULL, sizeof(type), count)
 #define realloc_p(p, type, count) (type *)realloc_array(p, sizeof(type), count)
diff --git a/source4/include/request.h b/source4/include/request.h
index 7dae579c24..fc5fa8442a 100644
--- a/source4/include/request.h
+++ b/source4/include/request.h
@@ -1,3 +1,5 @@
+#ifndef _REQUEST_H
+#define _REQUEST_H
 /*
    Unix SMB/CIFS implementation.
    SMB parameters and setup
@@ -19,6 +21,8 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include "signing.h"
+
 /*
   Shared state structure between client and server, representing the basic packet.
 */
@@ -55,3 +59,4 @@ struct request_buffer {
 	char *ptr;
 };
 
+#endif
diff --git a/source4/include/signing.h b/source4/include/signing.h
index c290f96788..dfc5a4bd7e 100644
--- a/source4/include/signing.h
+++ b/source4/include/signing.h
@@ -1,3 +1,5 @@
+#ifndef _SIGNING_H
+#define _SIGNING_H
 /*
    Unix SMB/CIFS implementation.
    SMB Signing
@@ -35,3 +37,4 @@ struct smb_signing_context {
 	BOOL seen_valid; /* Have I ever seen a validly signed packet? */
 };
 
+#endif
diff --git a/source4/include/structs.h b/source4/include/structs.h
index c6b8125939..a553977952 100644
--- a/source4/include/structs.h
+++ b/source4/include/structs.h
@@ -77,3 +77,16 @@ struct registry_value;
 
 struct rap_NetShareEnum;
 struct rap_NetServerEnum2;
+
+struct smbsrv_request;
+struct smbsrv_tcon;
+struct smb_signing_context;
+struct smbsrv_connection;
+struct auth_context;
+struct request_buffer;
+
+struct pvfs_dir;
+struct pvfs_filename;
+struct pvfs_state;
+struct pvfs_file;
+