diff --git a/[refs] b/[refs]
index a6484612b2e7..60e6331e8242 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3180e66d77e3c34cb466188105eace05dfeb5681
+refs/heads/master: 7bf446f8b581cef434f5ff05e8a791563bc09b7f
diff --git a/trunk/fs/xfs/linux-2.6/xfs_ioctl.c b/trunk/fs/xfs/linux-2.6/xfs_ioctl.c
index 6f04493b8aba..d0b499418a7d 100644
--- a/trunk/fs/xfs/linux-2.6/xfs_ioctl.c
+++ b/trunk/fs/xfs/linux-2.6/xfs_ioctl.c
@@ -34,6 +34,7 @@
 #include "xfs_dir2_sf.h"
 #include "xfs_dinode.h"
 #include "xfs_inode.h"
+#include "xfs_ioctl.h"
 #include "xfs_btree.h"
 #include "xfs_ialloc.h"
 #include "xfs_rtalloc.h"
diff --git a/trunk/fs/xfs/support/debug.c b/trunk/fs/xfs/support/debug.c
index ae5482965424..930bb34804b0 100644
--- a/trunk/fs/xfs/support/debug.c
+++ b/trunk/fs/xfs/support/debug.c
@@ -17,6 +17,7 @@
  */
 #include <xfs.h>
 #include "debug.h"
+#include "xfs_error.h"
 
 /* xfs_mount.h drags a lot of crap in, sorry.. */
 #include "xfs_sb.h"