4 files changed, 6 insertions, 3 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index ab2f6a9641..86d7f069cd 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -936,6 +936,7 @@ extern int errno;
 #include "debugparse.h"
 #include "version.h"
 #include "privileges.h"
+#include "locking.h"
 #include "smb.h"
 #include "ads_cldap.h"
 #include "nameserv.h"
diff --git a/source3/include/locking.h b/source3/include/locking.h
index 983d59a853..8eabb305f7 100644
--- a/source3/include/locking.h
+++ b/source3/include/locking.h
@@ -45,8 +45,10 @@ struct lock_key {
 	SMB_INO_T inode;
 };
 
+struct files_struct;
+
 struct byte_range_lock {
-	files_struct *fsp;
+	struct files_struct *fsp;
 	unsigned int num_locks;
 	BOOL modified;
 	struct lock_key key;
diff --git a/source3/include/messages.h b/source3/include/messages.h
index e246123ea9..b0305373c0 100644
--- a/source3/include/messages.h
+++ b/source3/include/messages.h
@@ -70,6 +70,7 @@
 #define MSG_SMB_KERNEL_BREAK 3010
 #define MSG_SMB_FILE_RENAME  3011
 #define MSG_SMB_INJECT_FAULT 3012
+#define MSG_SMB_BLOCKING_LOCK_CANCEL 3013
 
 /* winbind messages */
 #define MSG_WINBIND_FINISHED     4001
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 39a7897581..1a55bef428 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -440,6 +440,7 @@ typedef struct files_struct {
 	int oplock_type;
 	int sent_oplock_break;
 	struct timed_event *oplock_timeout;
+	struct lock_struct last_lock_failure;
 
 	struct share_mode_entry *pending_break_messages;
 	int num_pending_break_messages;
@@ -861,8 +862,6 @@ struct parm_struct {
 #define FLAG_HIDE  	0x2000 /* options that should be hidden in SWAT */
 #define FLAG_DOS_STRING 0x4000 /* convert from UNIX to DOS codepage when reading this string. */
 
-#include "locking.h"
-
 struct bitmap {
 	uint32 *b;
 	unsigned int n;