8 files changed, 9 insertions, 0 deletions
diff --git a/source4/smb_server/smb/config.mk b/source4/smb_server/smb/config.mk
index b412674c00..2f0da23072 100644
--- a/source4/smb_server/smb/config.mk
+++ b/source4/smb_server/smb/config.mk
@@ -1,6 +1,7 @@
 #######################
 # Start SUBSYSTEM SMB_PROTOCOL
 [SUBSYSTEM::SMB_PROTOCOL]
+PRIVATE_PROTO_HEADER = smb_proto.h
 OBJ_FILES = \
 		receive.o \
 		negprot.o \
diff --git a/source4/smb_server/smb/nttrans.c b/source4/smb_server/smb/nttrans.c
index 7d5398671d..1ade18d694 100644
--- a/source4/smb_server/smb/nttrans.c
+++ b/source4/smb_server/smb/nttrans.c
@@ -26,6 +26,7 @@
 #include "smb_server/smb_server.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "ntvfs/ntvfs.h"
+#include "libcli/raw/libcliraw.h"
 
 
 
diff --git a/source4/smb_server/smb/signing.c b/source4/smb_server/smb/signing.c
index b461056397..7f441a2816 100644
--- a/source4/smb_server/smb/signing.c
+++ b/source4/smb_server/smb/signing.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "smb_server/smb_server.h"
+#include "libcli/raw/libcliraw.h"
 
 
 /*
diff --git a/source4/smb_server/smb/trans2.c b/source4/smb_server/smb/trans2.c
index ef7fa40b20..885f54a48e 100644
--- a/source4/smb_server/smb/trans2.c
+++ b/source4/smb_server/smb/trans2.c
@@ -26,6 +26,7 @@
 #include "smb_server/smb_server.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "ntvfs/ntvfs.h"
+#include "libcli/raw/libcliraw.h"
 
 #define CHECK_MIN_BLOB_SIZE(blob, size) do { \
 	if ((blob)->length < (size)) { \
diff --git a/source4/smb_server/smb2/config.mk b/source4/smb_server/smb2/config.mk
index 4a680200fd..686f6f783c 100644
--- a/source4/smb_server/smb2/config.mk
+++ b/source4/smb_server/smb2/config.mk
@@ -1,6 +1,7 @@
 #######################
 # Start SUBSYSTEM SMB2_PROTOCOL
 [SUBSYSTEM::SMB2_PROTOCOL]
+PRIVATE_PROTO_HEADER = smb2_proto.h
 OBJ_FILES = \
 		receive.o \
 		negprot.o \
diff --git a/source4/smb_server/smb2/smb2_server.h b/source4/smb_server/smb2/smb2_server.h
index 913c7f2eab..1c544bfe82 100644
--- a/source4/smb_server/smb2/smb2_server.h
+++ b/source4/smb_server/smb2/smb2_server.h
@@ -48,3 +48,5 @@ struct smb2srv_request {
 	struct smb2_request_buffer in;
 	struct smb2_request_buffer out;
 };
+
+#include "smb_server/smb2/smb2_proto.h"
diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c
index bffc19fc72..e4b9a227d4 100644
--- a/source4/smb_server/smb_server.c
+++ b/source4/smb_server/smb_server.c
@@ -28,6 +28,7 @@
 #include "lib/messaging/irpc.h"
 #include "lib/stream/packet.h"
 #include "libcli/smb2/smb2.h"
+#include "smb_server/smb2/smb2_server.h"
 
 static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob)
 {
diff --git a/source4/smb_server/smb_server.h b/source4/smb_server/smb_server.h
index d0df15e022..3280706eca 100644
--- a/source4/smb_server/smb_server.h
+++ b/source4/smb_server/smb_server.h
@@ -303,3 +303,4 @@ struct smbsrv_connection {
 };
 
 #include "smb_server/smb_server_proto.h"
+#include "smb_server/smb/smb_proto.h"