diff --git a/src/add-ons/kernel/bus_managers/ps2/Jamfile b/src/add-ons/kernel/bus_managers/ps2/Jamfile
index f3aff51fc5..c7713eaad6 100644
--- a/src/add-ons/kernel/bus_managers/ps2/Jamfile
+++ b/src/add-ons/kernel/bus_managers/ps2/Jamfile
@@ -1,8 +1,14 @@
 SubDir HAIKU_TOP src add-ons kernel bus_managers ps2 ;
 
+UsePrivateHeaders input ;
 UsePrivateHeaders kernel ;
 
 KernelAddon ps2 : kernel bus_managers :
+	packet_buffer.cpp
+	ps2_common.c
+	ps2_dev.c
+	ps2_keyboard.c
 	ps2_module.c
+	ps2_mouse.c
+	ps2_service.c
 	;
-
diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_common.c b/src/add-ons/kernel/bus_managers/ps2/ps2_common.c
index ad48da33ff..80151b66a4 100644
--- a/src/add-ons/kernel/bus_managers/ps2/ps2_common.c
+++ b/src/add-ons/kernel/bus_managers/ps2/ps2_common.c
@@ -12,12 +12,10 @@
 
 #include <string.h>
 
-#include "common.h"
+#include "ps2_common.h"
 #include "ps2_service.h"
 #include "ps2_dev.h"
 
-int32 api_version = B_CUR_DRIVER_API_VERSION;
-
 device_hooks sKeyboardDeviceHooks = {
 	keyboard_open,
 	keyboard_close,
@@ -237,31 +235,7 @@ ps2_interrupt(void* cookie)
 
 
 status_t
-init_hardware(void)
-{
-	TRACE(("ps2_hid: init_hardware\n"));
-	return B_OK;
-}
-
-
-const char **
-publish_devices(void)
-{
-	TRACE(("ps2_hid: publish_devices\n"));
-	return NULL;
-}
-
-
-device_hooks *
-find_device(const char *name)
-{
-	TRACE(("ps2_hid: find_device\n"));
-	return NULL;
-}
-
-
-status_t
-init_driver(void)
+ps2_init_driver(void)
 {
 	status_t status;
 
@@ -335,7 +309,7 @@ err_1:
 
 
 void
-uninit_driver(void)
+ps2_uninit_driver(void)
 {
 	TRACE(("ps2_hid: uninit_driver\n"));
 	remove_io_interrupt_handler(INT_PS2_MOUSE,    &ps2_interrupt, NULL);
diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_common.h b/src/add-ons/kernel/bus_managers/ps2/ps2_common.h
index a85a2d7f3b..1a4b16689b 100644
--- a/src/add-ons/kernel/bus_managers/ps2/ps2_common.h
+++ b/src/add-ons/kernel/bus_managers/ps2/ps2_common.h
@@ -18,7 +18,7 @@
 #include <KernelExport.h>
 #include <OS.h>
 
-#include "ps2.h"
+#include "ps2_defs.h"
 
 
 // debug defines
@@ -37,6 +37,9 @@ extern device_hooks sMouseDeviceHooks;
 
 // prototypes from common.c
 
+status_t ps2_init_driver(void);
+void ps2_uninit_driver(void);
+
 extern status_t ps2_wait_read();
 extern status_t ps2_wait_write();
 
diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_defs.h b/src/add-ons/kernel/bus_managers/ps2/ps2_defs.h
index 6657f8435c..46577d4835 100644
--- a/src/add-ons/kernel/bus_managers/ps2/ps2_defs.h
+++ b/src/add-ons/kernel/bus_managers/ps2/ps2_defs.h
@@ -9,8 +9,8 @@
  *		Stefano Ceccherini (burton666@libero.it)
  *		Axel Dörfler, axeld@pinc-software.de
  */
-#ifndef _PS2_H
-#define _PS2_H
+#ifndef _PS2_DEFS_H
+#define _PS2_DEFS_H
 
 
 /** Interface definitions for the Intel 8042, 8741, or 8742 (PS/2) */
diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_dev.h b/src/add-ons/kernel/bus_managers/ps2/ps2_dev.h
index 8715db8817..959a74913c 100644
--- a/src/add-ons/kernel/bus_managers/ps2/ps2_dev.h
+++ b/src/add-ons/kernel/bus_managers/ps2/ps2_dev.h
@@ -10,7 +10,7 @@
 #ifndef __PS2_DEV_H
 #define __PS2_DEV_H
 
-#include "common.h"
+#include "ps2_common.h"
 
 typedef struct
 {
diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.c b/src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.c
index a39804f22e..f0d4f9e8c4 100644
--- a/src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.c
+++ b/src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.c
@@ -10,7 +10,7 @@
  */
 
 
-#include "common.h"
+#include "ps2_common.h"
 #include "kb_mouse_driver.h"
 #include "packet_buffer.h"
 
diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_module.c b/src/add-ons/kernel/bus_managers/ps2/ps2_module.c
index 8cf83d7105..29e8999cb8 100644
--- a/src/add-ons/kernel/bus_managers/ps2/ps2_module.c
+++ b/src/add-ons/kernel/bus_managers/ps2/ps2_module.c
@@ -9,6 +9,7 @@
  */
 
 #include "PS2.h"
+#include "ps2_common.h"
 
 
 static int32 function1()
@@ -28,8 +29,10 @@ std_ops(int32 op, ...)
 {
 	switch(op) {
 		case B_MODULE_INIT:
-			break;
+			return ps2_init_driver();
+
 		case B_MODULE_UNINIT: 
+			ps2_uninit_driver();
 			break; 
 		default: 
 			return B_ERROR;
diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_mouse.c b/src/add-ons/kernel/bus_managers/ps2/ps2_mouse.c
index 6ca5da608a..67b56f1bce 100644
--- a/src/add-ons/kernel/bus_managers/ps2/ps2_mouse.c
+++ b/src/add-ons/kernel/bus_managers/ps2/ps2_mouse.c
@@ -62,7 +62,7 @@
 #include <string.h>
 
 #include "kb_mouse_driver.h"
-#include "common.h"
+#include "ps2_common.h"
 #include "packet_buffer.h"
 
 
diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_service.h b/src/add-ons/kernel/bus_managers/ps2/ps2_service.h
index cda0394474..4d1a5b0b84 100644
--- a/src/add-ons/kernel/bus_managers/ps2/ps2_service.h
+++ b/src/add-ons/kernel/bus_managers/ps2/ps2_service.h
@@ -10,7 +10,7 @@
 #ifndef __PS2_SERVICE_H
 #define __PS2_SERVICE_H
 
-#include "common.h"
+#include "ps2_common.h"
 #include "ps2_dev.h"
 
 status_t	ps2_service_init(void);