diff --git a/src/prefs/keyboard/Jamfile b/src/prefs/keyboard/Jamfile
index 7ebe209e10..5d882d99f6 100644
--- a/src/prefs/keyboard/Jamfile
+++ b/src/prefs/keyboard/Jamfile
@@ -1,5 +1,7 @@
 SubDir OBOS_TOP src prefs keyboard ;
 
+UsePrivateHeaders input ;
+
 AddResources Keyboard : Keyboard.rdef ;
 
 Preference Keyboard : 
diff --git a/src/prefs/keyboard/KeyboardSettings.cpp b/src/prefs/keyboard/KeyboardSettings.cpp
index 8b608cc637..3212418ab5 100644
--- a/src/prefs/keyboard/KeyboardSettings.cpp
+++ b/src/prefs/keyboard/KeyboardSettings.cpp
@@ -15,7 +15,6 @@
 #include "KeyboardSettings.h"
 #include "KeyboardMessages.h"
 
-const char KeyboardSettings::kKeyboardSettingsFile[] = "Keyboard_settings";
 
 KeyboardSettings::KeyboardSettings()
 {
@@ -30,7 +29,7 @@ KeyboardSettings::KeyboardSettings()
 	BPath path;
 	
 	if (find_directory(B_USER_SETTINGS_DIRECTORY,&path) == B_OK) {
-		path.Append(kKeyboardSettingsFile);
+		path.Append(kb_settings_file);
 		BFile file(path.Path(), B_READ_ONLY);
 		if (file.InitCheck() == B_OK) {
 			// Now read in the data
@@ -51,7 +50,7 @@ KeyboardSettings::~KeyboardSettings()
 	if (find_directory(B_USER_SETTINGS_DIRECTORY,&path) < B_OK)
 		return;
 
-	path.Append(kKeyboardSettingsFile);
+	path.Append(kb_settings_file);
 
 	BFile file(path.Path(), B_WRITE_ONLY | B_CREATE_FILE);
 	if (file.InitCheck() == B_OK) {
diff --git a/src/prefs/keyboard/KeyboardSettings.h b/src/prefs/keyboard/KeyboardSettings.h
index 07ca3a5f3f..8ef0d570c1 100644
--- a/src/prefs/keyboard/KeyboardSettings.h
+++ b/src/prefs/keyboard/KeyboardSettings.h
@@ -9,11 +9,7 @@
 #define KEYBOARD_SETTINGS_H_
 
 #include <SupportDefs.h>
-
-typedef struct {
-        bigtime_t       key_repeat_delay;
-        int32           key_repeat_rate;
-} kb_settings;
+#include "kb_mouse_settings.h"
 
 class KeyboardSettings{
 public :