diff --git a/drivers/firewire/Makefile b/drivers/firewire/Makefile
index eddc16c701b50e3a991c87582867d806427d8212..7f02d6fe7a44f19e0c3a0ceb9913c7b5b0a9989a 100644
--- a/drivers/firewire/Makefile
+++ b/drivers/firewire/Makefile
@@ -3,7 +3,7 @@
 #
 
 fw-core-objs := fw-card.o fw-topology.o fw-transaction.o fw-iso.o \
-	fw-device.o fw-device-cdev.o
+	fw-device.o fw-cdev.o
 
 obj-$(CONFIG_FIREWIRE) += fw-core.o
 obj-$(CONFIG_FIREWIRE_OHCI) += fw-ohci.o
diff --git a/drivers/firewire/fw-device-cdev.c b/drivers/firewire/fw-cdev.c
similarity index 99%
rename from drivers/firewire/fw-device-cdev.c
rename to drivers/firewire/fw-cdev.c
index 2910db69ec2c3ece540bba6a3385ad6e67912279..88b8fd917f54a1cf365abb7711fb7bd18b5ada5e 100644
--- a/drivers/firewire/fw-device-cdev.c
+++ b/drivers/firewire/fw-cdev.c
@@ -30,11 +30,11 @@
 #include <linux/mm.h>
 #include <linux/idr.h>
 #include <linux/compat.h>
+#include <linux/firewire-cdev.h>
 #include <asm/uaccess.h>
 #include "fw-transaction.h"
 #include "fw-topology.h"
 #include "fw-device.h"
-#include "fw-device-cdev.h"
 
 /* dequeue_event() just kfree()'s the event, so the event has to be
  * the first field in the struct. */
diff --git a/drivers/firewire/fw-device-cdev.h b/include/linux/firewire-cdev.h
similarity index 100%
rename from drivers/firewire/fw-device-cdev.h
rename to include/linux/firewire-cdev.h