diff --git a/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp b/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp
index 20e86e3925..6618ba56bd 100644
--- a/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp
+++ b/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp
@@ -1,6 +1,7 @@
 /*
  * Copyright 2004-2006, Jérôme Duval. All rights reserved.
  * Copyright 2005-2008, Axel Dörfler, axeld@pinc-software.de.
+ * Copyright 2008, Stephan Aßmus, superstippi@gmx.de.
  *
  * Distributed under the terms of the MIT License.
  */
diff --git a/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.h b/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.h
index 1fb22e9249..e34dffc959 100644
--- a/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.h
+++ b/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 2004-2008, Jérôme Duval. All rights reserved.
+ * Copyright 2008, Stephan Aßmus, superstippi@gmx.de.
  * Distributed under the terms of the MIT License.
  */
 #ifndef KEYBOARD_INPUT_DEVICE_H
@@ -47,16 +48,16 @@ private:
 			int32				_Thread();
 
 private:
-	KeyboardInputDevice*		fOwner;
-	input_device_ref			fDeviceRef;
-	char						fPath[B_PATH_NAME_LENGTH];
-	int							fFD;
-	thread_id					fThread;
-	kb_settings					fSettings;
+			KeyboardInputDevice* fOwner;
+			input_device_ref	fDeviceRef;
+			char				fPath[B_PATH_NAME_LENGTH];
+			int					fFD;
+			thread_id			fThread;
+			kb_settings			fSettings;
 	volatile bool				fActive;
-	bool						fIsAT;
+			bool				fIsAT;
 	volatile bool				fInputMethodStarted;
-	uint32						fModifiers;
+			uint32				fModifiers;
 
 			Keymap				fKeymap;
 			BLocker				fKeymapLock;
diff --git a/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp b/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp
index ad23a07439..437d099b3a 100644
--- a/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp
+++ b/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp
@@ -6,6 +6,7 @@
  *		Stefano Ceccherini (stefano.ceccherini@gmail.com)
  *		Jérôme Duval
  *		Axel Dörfler, axeld@pinc-software.de
+ *		Stephan Aßmus, superstippi@gmx.de
  */
 
 
diff --git a/src/add-ons/input_server/devices/touchpad/TouchpadInputDevice.cpp b/src/add-ons/input_server/devices/touchpad/TouchpadInputDevice.cpp
index 812413ca51..fafb0998c1 100644
--- a/src/add-ons/input_server/devices/touchpad/TouchpadInputDevice.cpp
+++ b/src/add-ons/input_server/devices/touchpad/TouchpadInputDevice.cpp
@@ -1,11 +1,12 @@
 /*
- * Copyright 2004-2007, Haiku.
+ * Copyright 2004-2008, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
  *		Stefano Ceccherini (stefano.ceccherini@gmail.com)
  *		Jérôme Duval
  *		Axel Dörfler, axeld@pinc-software.de
+ *		Clemens Zeidler, haiku@clemens-zeidler.de
  */
 
 
diff --git a/src/add-ons/input_server/devices/touchpad/TouchpadInputDevice.h b/src/add-ons/input_server/devices/touchpad/TouchpadInputDevice.h
index 217d6266ce..98233a0706 100644
--- a/src/add-ons/input_server/devices/touchpad/TouchpadInputDevice.h
+++ b/src/add-ons/input_server/devices/touchpad/TouchpadInputDevice.h
@@ -1,9 +1,10 @@
 /*
- * Copyright 2004-2006, Haiku.
+ * Copyright 2004-2008, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
  *		Stefano Ceccherini
+ *		Clemens Zeidler, haiku@clemens-zeidler.de
  */
 #ifndef MOUSE_INPUT_DEVICE_H
 #define MOUSE_INPUT_DEVICE_H