diff --git a/drivers/firewire/fw-device-cdev.h b/drivers/firewire/fw-device-cdev.h
index 18b20c2..e2ae933 100644
--- a/drivers/firewire/fw-device-cdev.h
+++ b/drivers/firewire/fw-device-cdev.h
@@ -143,4 +143,4 @@
 	__s32 cycle;
 };
 
-#endif
+#endif /* __fw_cdev_h */
diff --git a/drivers/firewire/fw-device.h b/drivers/firewire/fw-device.h
index 84cd5e7..731abbe 100644
--- a/drivers/firewire/fw-device.h
+++ b/drivers/firewire/fw-device.h
@@ -124,4 +124,4 @@
 
 extern struct file_operations fw_device_ops;
 
-#endif
+#endif /* __fw_device_h */
diff --git a/drivers/firewire/fw-topology.h b/drivers/firewire/fw-topology.h
index 7582d6e..32ea7cd 100644
--- a/drivers/firewire/fw-topology.h
+++ b/drivers/firewire/fw-topology.h
@@ -81,4 +81,4 @@
 void
 fw_destroy_nodes(struct fw_card *card);
 
-#endif
+#endif /* __fw_topology_h */
diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h
index 7f618f2..292add5 100644
--- a/drivers/firewire/fw-transaction.h
+++ b/drivers/firewire/fw-transaction.h
@@ -19,8 +19,8 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef __fw_core_h
-#define __fw_core_h
+#ifndef __fw_transaction_h
+#define __fw_transaction_h
 
 #include <linux/device.h>
 #include <linux/timer.h>
@@ -423,4 +423,4 @@
                         u32 length, u32 *payload);
 
 
-#endif /* __fw_core_h */
+#endif /* __fw_transaction_h */