diff --git a/src/prefs/mouse/Jamfile b/src/prefs/mouse/Jamfile
index 408226f876..516ce16d74 100644
--- a/src/prefs/mouse/Jamfile
+++ b/src/prefs/mouse/Jamfile
@@ -1,5 +1,7 @@
 SubDir OBOS_TOP src prefs mouse ;
 
+UsePrivateHeaders input ;
+
 AddResources Mouse : Mouse.rdef ;
 
 Preference Mouse : 
diff --git a/src/prefs/mouse/MouseSettings.cpp b/src/prefs/mouse/MouseSettings.cpp
index 6a4f57e20d..a7d96a2b79 100644
--- a/src/prefs/mouse/MouseSettings.cpp
+++ b/src/prefs/mouse/MouseSettings.cpp
@@ -29,8 +29,6 @@
 // the latter maps 16 different mouse buttons
 #define R5_COMPATIBLE 1
 
-static const char kMouseSettingsFile[] = "Mouse_settings";
-
 static const bigtime_t kDefaultClickSpeed = 500000;
 static const int32 kDefaultMouseSpeed = 65536;
 static const int32 kDefaultMouseType = 3;	// 3 button mouse
@@ -61,7 +59,7 @@ MouseSettings::GetSettingsPath(BPath &path)
 	if (status < B_OK)
 		return status;
 
-	path.Append(kMouseSettingsFile);
+	path.Append(mouse_settings_file);
 	return B_OK;
 }
 
diff --git a/src/prefs/mouse/MouseSettings.h b/src/prefs/mouse/MouseSettings.h
index f564e39646..d2e3424184 100644
--- a/src/prefs/mouse/MouseSettings.h
+++ b/src/prefs/mouse/MouseSettings.h
@@ -20,23 +20,7 @@
 
 #include <SupportDefs.h>
 #include <InterfaceDefs.h>
-
-
-// ToDo: these should be defined somewhere else; the mouse
-//		input driver or add-on must read them as well
-
-typedef struct {
-        bool    enabled;        // Acceleration on / off
-        int32   accel_factor;   // accel factor: 256 = step by 1, 128 = step by 1/2
-        int32   speed;          // speed accelerator (1=1X, 2 = 2x)...
-} mouse_accel;
-
-typedef struct {
-        int32		    type;
-        mouse_map       map;
-        mouse_accel     accel;
-        bigtime_t       click_speed;
-} mouse_settings;
+#include "kb_mouse_settings.h"
 
 
 class MouseSettings {