diff --git a/src/add-ons/Jamfile b/src/add-ons/Jamfile
index 8d3dabfb79..081477f9ec 100644
--- a/src/add-ons/Jamfile
+++ b/src/add-ons/Jamfile
@@ -56,6 +56,34 @@ KernelLd
 	addons/drivers/dev/random
 	; 
 
+KernelLd
+	ps2mouse
+	:
+	<$(SOURCE_GRIST)!kernel!drivers!arch!$(OBOS_ARCH)!ps2mouse>ps2mouse.o
+	kernel.so
+	:
+	$(OBOS_TOP)/src/kernel/core/addons/ldscripts/$(OBOS_ARCH)/addon.ld
+	:
+	-Bdynamic -shared
+	:
+	:
+	addons/drivers/dev/ps2mouse
+	; 
+
+KernelLd
+	keyboard
+	:
+	<$(SOURCE_GRIST)!kernel!drivers!arch!$(OBOS_ARCH)!keyboard>keyboard.o
+	kernel.so
+	:
+	$(OBOS_TOP)/src/kernel/core/addons/ldscripts/$(OBOS_ARCH)/addon.ld
+	:
+	-Bdynamic -shared
+	:
+	:
+	addons/drivers/dev/keyboard
+	; 
+
 # This needs to be fixed once the various headers are fixed.
 #KernelLd 
 #	ac97
diff --git a/src/add-ons/kernel/drivers/Jamfile b/src/add-ons/kernel/drivers/Jamfile
index 142d7fe621..1de9eddb32 100644
--- a/src/add-ons/kernel/drivers/Jamfile
+++ b/src/add-ons/kernel/drivers/Jamfile
@@ -1,5 +1,6 @@
 SubDir OBOS_TOP src add-ons kernel drivers ;
 
+SubInclude OBOS_TOP src add-ons kernel drivers arch ;
 SubInclude OBOS_TOP src add-ons kernel drivers audio ;
 SubInclude OBOS_TOP src add-ons kernel drivers common ;
 SubInclude OBOS_TOP src add-ons kernel drivers random ;
diff --git a/src/add-ons/kernel/drivers/common/digit.c b/src/add-ons/kernel/drivers/common/digit.c
index b313af8e6e..266527ad08 100644
--- a/src/add-ons/kernel/drivers/common/digit.c
+++ b/src/add-ons/kernel/drivers/common/digit.c
@@ -12,7 +12,7 @@
 *******************************************************************************/
 
 #include <ktypes.h>
-#include <drivers.h>
+#include <Drivers.h>
 #include <debug.h>
 #include <memheap.h>
 #include <string.h>
diff --git a/src/add-ons/kernel/drivers/random/driver.c b/src/add-ons/kernel/drivers/random/driver.c
index 2e7063ca70..273e90e23f 100644
--- a/src/add-ons/kernel/drivers/random/driver.c
+++ b/src/add-ons/kernel/drivers/random/driver.c
@@ -252,7 +252,7 @@ __inline void kill_chrand (ch_randgen *randgen)
    +++++ */
 
 //#include <drivers/KernelExport.h>
-#include <drivers.h>
+#include <Drivers.h>
 #include <Errors.h>
 #include <string.h>
 #include <stdlib.h>
@@ -443,4 +443,3 @@ device_hooks *find_device(const char* name)
 			return &my_device_hooks;
 	return NULL;
 }
-