diff --git a/[refs] b/[refs]
index 7ee89f66d610..0620d8d0de04 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bbf094cf3dbd9a969dd17cf52325e9fab8dfbe91
+refs/heads/master: 2147ef204f57191e0fff6d5d3d1a0336afa6cfae
diff --git a/trunk/drivers/firewire/fw-transaction.h b/trunk/drivers/firewire/fw-transaction.h
index 7e928e86022f..219094e38542 100644
--- a/trunk/drivers/firewire/fw-transaction.h
+++ b/trunk/drivers/firewire/fw-transaction.h
@@ -20,12 +20,12 @@
 #define __fw_transaction_h
 
 #include <linux/device.h>
-#include <linux/timer.h>
-#include <linux/interrupt.h>
-#include <linux/list.h>
-#include <linux/fs.h>
 #include <linux/dma-mapping.h>
 #include <linux/firewire-constants.h>
+#include <linux/list.h>
+#include <linux/spinlock_types.h>
+#include <linux/timer.h>
+#include <linux/workqueue.h>
 #include <asm/atomic.h>
 
 #define TCODE_IS_READ_REQUEST(tcode)	(((tcode) & ~1) == 4)