diff --git a/[refs] b/[refs]
index 5184bc34fbb5..7402594116f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d814731ba67f9514bdf380c1b95dd852ac82a2f
+refs/heads/master: 5a577e38724226e06337bc8361f492b6bb76b9a5
diff --git a/trunk/drivers/block/xen-blkback/common.h b/trunk/drivers/block/xen-blkback/common.h
index 1e4ccdeadef3..9e40b283a468 100644
--- a/trunk/drivers/block/xen-blkback/common.h
+++ b/trunk/drivers/block/xen-blkback/common.h
@@ -24,8 +24,8 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef __BLKIF__BACKEND__COMMON_H__
-#define __BLKIF__BACKEND__COMMON_H__
+#ifndef __XEN_BLKIF__BACKEND__COMMON_H__
+#define __XEN_BLKIF__BACKEND__COMMON_H__
 
 #include <linux/version.h>
 #include <linux/module.h>
@@ -230,4 +230,4 @@ static inline void blkif_get_x86_64_req(struct blkif_request *dst,
 		dst->u.rw.seg[i] = src->seg[i];
 }
 
-#endif /* __BLKIF__BACKEND__COMMON_H__ */
+#endif /* __XEN_BLKIF__BACKEND__COMMON_H__ */