4 files changed, 6 insertions, 8 deletions
diff --git a/input/Makefile.am b/input/Makefile.am
index 16061453..e39bd254 100644
--- a/input/Makefile.am
+++ b/input/Makefile.am
@@ -10,10 +10,8 @@ servicedir = $(libdir)/bluetooth
 
 service_PROGRAMS = bluetoothd-service-input
 
-bluetoothd_service_input_SOURCES = \
-		main.c server.h server.c \
-		input-service.h input-service.c \
-		storage.h storage.c
+bluetoothd_service_input_SOURCES = main.c \
+	server.h server.c device.h device.c storage.h storage.c
 
 LDADD = $(top_builddir)/common/libhelper.a \
 		@GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
diff --git a/input/input-service.c b/input/device.c
index 3a309068..421b6c20 100644
--- a/input/input-service.c
+++ b/input/device.c
@@ -2,7 +2,7 @@
  *
  *  BlueZ - Bluetooth protocol stack for Linux
  *
- *  Copyright (C) 2005-2006  Marcel Holtmann <marcel@holtmann.org>
+ *  Copyright (C) 2004-2007  Marcel Holtmann <marcel@holtmann.org>
  *
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -48,8 +48,8 @@
 #include "logging.h"
 #include "textfile.h"
 
-#include "input-service.h"
 #include "storage.h"
+#include "device.h"
 
 #define INPUT_PATH "/org/bluez/input"
 #define INPUT_MANAGER_INTERFACE	"org.bluez.input.Manager"
diff --git a/input/input-service.h b/input/device.h
index 6eefc6d4..957756fd 100644
--- a/input/input-service.h
+++ b/input/device.h
@@ -2,7 +2,7 @@
  *
  *  BlueZ - Bluetooth protocol stack for Linux
  *
- *  Copyright (C) 2006  Marcel Holtmann <marcel@holtmann.org>
+ *  Copyright (C) 2004-2007  Marcel Holtmann <marcel@holtmann.org>
  *
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/input/main.c b/input/main.c
index 340fc776..084493f5 100644
--- a/input/main.c
+++ b/input/main.c
@@ -41,7 +41,7 @@
 #include "logging.h"
 
 #include "server.h"
-#include "input-service.h"
+#include "device.h"
 
 static GMainLoop *main_loop;