6 files changed, 6 insertions, 2 deletions
diff --git a/source4/libcli/smb2/keepalive.c b/source4/libcli/smb2/keepalive.c
index 99d9dd3ae9..b800bdb3b1 100644
--- a/source4/libcli/smb2/keepalive.c
+++ b/source4/libcli/smb2/keepalive.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "libcli/smb2/smb2.h"
+#include "libcli/smb2/smb2_calls.h"
 
 /*
   send a keepalive request
diff --git a/source4/libcli/smb2/logoff.c b/source4/libcli/smb2/logoff.c
index ba0e691e8b..977c1e57af 100644
--- a/source4/libcli/smb2/logoff.c
+++ b/source4/libcli/smb2/logoff.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "libcli/smb2/smb2.h"
+#include "libcli/smb2/smb2_calls.h"
 
 /*
   send a logoff request
diff --git a/source4/libcli/smb2/smb2.h b/source4/libcli/smb2/smb2.h
index cf84f34442..913d58409b 100644
--- a/source4/libcli/smb2/smb2.h
+++ b/source4/libcli/smb2/smb2.h
@@ -199,5 +199,3 @@ struct smb2_request {
 		return NT_STATUS_INVALID_PARAMETER; \
 	} \
 } while (0)
-
-#include "libcli/smb2/smb2_proto.h"
diff --git a/source4/libcli/smb2/smb2_calls.h b/source4/libcli/smb2/smb2_calls.h
index 08e765ad60..7349b609cb 100644
--- a/source4/libcli/smb2/smb2_calls.h
+++ b/source4/libcli/smb2/smb2_calls.h
@@ -361,3 +361,5 @@ struct smb2_flush {
 		struct smb2_handle handle;
 	} in;
 };
+
+#include "libcli/smb2/smb2_proto.h"
diff --git a/source4/libcli/smb2/tdis.c b/source4/libcli/smb2/tdis.c
index 7d1f7aee4e..9ea58113b3 100644
--- a/source4/libcli/smb2/tdis.c
+++ b/source4/libcli/smb2/tdis.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "libcli/smb2/smb2.h"
+#include "libcli/smb2/smb2_calls.h"
 
 /*
   send a tdis request
diff --git a/source4/libcli/smb2/transport.c b/source4/libcli/smb2/transport.c
index 60dd5d2ba6..d5591fa11c 100644
--- a/source4/libcli/smb2/transport.c
+++ b/source4/libcli/smb2/transport.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/smb2/smb2.h"
+#include "libcli/smb2/smb2_calls.h"
 #include "lib/socket/socket.h"
 #include "lib/events/events.h"
 #include "lib/stream/packet.h"