diff --git a/sys/conf/files b/sys/conf/files
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -3527,7 +3527,7 @@
 dev/xen/grant_table/grant_table.c	optional xenhvm
 dev/xen/netback/netback.c	optional xenhvm
 dev/xen/netfront/netfront.c	optional xenhvm
-dev/xen/timer/timer.c		optional xenhvm xentimer
+dev/xen/timer/xen_timer.c	optional xenhvm xentimer
 dev/xen/xenpci/xenpci.c		optional xenpci
 dev/xen/xenstore/xenstore.c	optional xenhvm
 dev/xen/xenstore/xenstore_dev.c	optional xenhvm
diff --git a/sys/dev/xen/timer/timer.c b/sys/dev/xen/timer/xen_timer.c
rename from sys/dev/xen/timer/timer.c
rename to sys/dev/xen/timer/xen_timer.c
--- a/sys/dev/xen/timer/timer.c
+++ b/sys/dev/xen/timer/xen_timer.c
@@ -29,7 +29,7 @@
  */
 
 /**
- * \file dev/xen/timer/timer.c
+ * \file dev/xen/timer/xen_timer.c
  * \brief A timer driver for the Xen hypervisor's PV clock.
  */