diff --git a/compositor/Makefile.am b/compositor/Makefile.am
index ce5a3d2f..bf70a4ac 100644
--- a/compositor/Makefile.am
+++ b/compositor/Makefile.am
@@ -52,7 +52,7 @@ drm_backend = drm-backend.la
 drm_backend_la_LDFLAGS = -module -avoid-version
 drm_backend_la_LIBADD = $(COMPOSITOR_LIBS) $(DRM_COMPOSITOR_LIBS)
 drm_backend_la_CFLAGS = $(DRM_COMPOSITOR_CFLAGS) $(GCC_CFLAGS)
-drm_backend_la_SOURCES = compositor-drm.c tty.c evdev.c
+drm_backend_la_SOURCES = compositor-drm.c tty.c evdev.c evdev.h
 endif
 
 if ENABLE_WAYLAND_COMPOSITOR
@@ -68,7 +68,7 @@ openwfd_backend = openwfd-backend.la
 openwfd_backend_la_LDFLAGS = -module -avoid-version
 openwfd_backend_la_LIBADD = $(COMPOSITOR_LIBS) $(OPENWFD_COMPOSITOR_LIBS)
 openwfd_backend_la_CFLAGS = $(OPENWFD_COMPOSITOR_CFLAGS) $(GCC_CFLAGS)
-openwfd_backend_la_SOURCES = compositor-openwfd.c tty.c evdev.c
+openwfd_backend_la_SOURCES = compositor-openwfd.c tty.c evdev.c evdev.h
 endif
 
 if ENABLE_DESKTOP_SHELL
diff --git a/compositor/compositor-drm.c b/compositor/compositor-drm.c
index d6187af4..f1047ee5 100644
--- a/compositor/compositor-drm.c
+++ b/compositor/compositor-drm.c
@@ -35,6 +35,7 @@
 #include <gbm.h>
 
 #include "compositor.h"
+#include "evdev.h"
 
 struct drm_compositor {
 	struct wlsc_compositor base;
@@ -894,7 +895,7 @@ drm_compositor_create(struct wl_display *display,
 	udev_enumerate_unref(e);
 	path = NULL;
 
-	evdev_input_add_devices(&ec->base, ec->udev, seat);
+	evdev_input_create(&ec->base, ec->udev, seat);
 
 	loop = wl_display_get_event_loop(ec->base.wl_display);
 	ec->drm_source =
diff --git a/compositor/compositor-openwfd.c b/compositor/compositor-openwfd.c
index 4cda851f..8fb671ab 100644
--- a/compositor/compositor-openwfd.c
+++ b/compositor/compositor-openwfd.c
@@ -35,6 +35,7 @@
 #include <gbm.h>
 
 #include "compositor.h"
+#include "evdev.h"
 
 struct wfd_compositor {
 	struct wlsc_compositor base;
@@ -653,7 +654,7 @@ wfd_compositor_create(struct wl_display *display,
 		return NULL;
 	}
 
-	evdev_input_add_devices(&ec->base, ec->udev, seat);
+	evdev_input_create(&ec->base, ec->udev, seat);
 
 	loop = wl_display_get_event_loop(ec->base.wl_display);
 	ec->wfd_source =
diff --git a/compositor/compositor.h b/compositor/compositor.h
index 671be45b..0d5ad07e 100644
--- a/compositor/compositor.h
+++ b/compositor/compositor.h
@@ -373,20 +373,6 @@ wlsc_input_device_init(struct wlsc_input_device *device,
 void
 wlsc_switcher_init(struct wlsc_compositor *compositor);
 
-void
-evdev_input_add_devices(struct wlsc_compositor *c,
-			struct udev *udev, const char *seat);
-
-void
-evdev_add_devices(struct udev *udev, struct wlsc_input_device
-		       *input_base);
-
-void
-evdev_remove_devices(struct wlsc_input_device *input_base);
-
-void
-evdev_input_destroy(struct wlsc_input_device *input_base);
-
 enum {
 	TTY_ENTER_VT,
 	TTY_LEAVE_VT
diff --git a/compositor/evdev.c b/compositor/evdev.c
index d33c6055..13832dc4 100644
--- a/compositor/evdev.c
+++ b/compositor/evdev.c
@@ -28,6 +28,7 @@
 #include <fcntl.h>
 
 #include "compositor.h"
+#include "evdev.h"
 
 struct evdev_input {
 	struct wlsc_input_device base;
@@ -513,8 +514,8 @@ evdev_config_udev_monitor(struct udev *udev, struct evdev_input *master)
 }
 
 void
-evdev_input_add_devices(struct wlsc_compositor *c,
-			struct udev *udev, const char *seat)
+evdev_input_create(struct wlsc_compositor *c, struct udev *udev,
+		   const char *seat)
 {
 	struct evdev_input *input;
 
diff --git a/compositor/evdev.h b/compositor/evdev.h
new file mode 100644
index 00000000..22878938
--- /dev/null
+++ b/compositor/evdev.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2011 Intel Corporation
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of the copyright holders not be used in
+ * advertising or publicity pertaining to distribution of the software
+ * without specific, written prior permission.  The copyright holders make
+ * no representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+ * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+void
+evdev_add_devices(struct udev *udev, struct wlsc_input_device
+		  *input_base);
+
+void
+evdev_remove_devices(struct wlsc_input_device *input_base);
+
+void
+evdev_input_create(struct wlsc_compositor *c, struct udev *udev,
+		   const char *seat);
+
+void
+evdev_input_destroy(struct wlsc_input_device *input_base);