diff --git a/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp b/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp
index 830cd89def..058bf38e24 100644
--- a/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp
+++ b/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp
@@ -25,7 +25,7 @@
 // DEALINGS IN THE SOFTWARE.
 /*****************************************************************************/
 #include "KeyboardInputDevice.h"
-
+#include "kb_mouse_driver.h"
 #include <Directory.h>
 #include <Entry.h>
 #include <NodeMonitor.h>
diff --git a/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.h b/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.h
index bddc968c2f..8af01f4bcf 100644
--- a/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.h
+++ b/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.h
@@ -31,7 +31,7 @@
 #include <InputServerDevice.h>
 #include <List.h>
 #include <stdio.h>
-#include "kb_mouse_driver.h"
+#include "kb_mouse_settings.h"
 
 class KeyboardInputDevice;
 
diff --git a/src/add-ons/input_server/devices/mouse/Jamfile b/src/add-ons/input_server/devices/mouse/Jamfile
index f2d95b9f56..c07432662d 100644
--- a/src/add-ons/input_server/devices/mouse/Jamfile
+++ b/src/add-ons/input_server/devices/mouse/Jamfile
@@ -1,5 +1,7 @@
 SubDir OBOS_TOP src add-ons input_server devices mouse ;
 
+UsePrivateHeaders input ;
+
 Addon <input>mouse : input_server/devices : 
 	MouseInputDevice.cpp 
 	: false 
diff --git a/src/add-ons/input_server/devices/mouse/MouseInputDevice.h b/src/add-ons/input_server/devices/mouse/MouseInputDevice.h
index 95fd22dc30..3bc782cbee 100644
--- a/src/add-ons/input_server/devices/mouse/MouseInputDevice.h
+++ b/src/add-ons/input_server/devices/mouse/MouseInputDevice.h
@@ -31,23 +31,7 @@
 #include <InterfaceDefs.h>
 
 #include <stdio.h>
-
-// TODO : these structs are needed in : input_server, mouse driver, mouse addon, mouse prefs
-// => factorisation has to be done in a global header, possibly private
-
-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 BList;
 class MouseInputDevice : public BInputServerDevice {