diff --git a/src/kernel/drivers/Jamfile b/src/kernel/drivers/Jamfile
index e4306b2635..1f642566df 100644
--- a/src/kernel/drivers/Jamfile
+++ b/src/kernel/drivers/Jamfile
@@ -2,15 +2,14 @@ SubDir OBOS_TOP src kernel drivers ;
 
 KernelStaticLibrary libdrivers : 
 	<$(SOURCE_GRIST)>dev.c 
-	<$(SOURCE_GRIST)>devs.c
+#	<$(SOURCE_GRIST)>devs.c
+
 	<$(SOURCE_GRIST)>arch/$(OBOS_ARCH)/console/console.c
-	<$(SOURCE_GRIST)>arch/$(OBOS_ARCH)/keyboard/keyboard.c
-	<$(SOURCE_GRIST)>arch/$(OBOS_ARCH)/ps2mouse/ps2mouse.c
 
 	<$(SOURCE_GRIST)>fb_console/fb_console.c
 	:
 	-fno-pic -Wno-unused
 	;
 
-#SubInclude OBOS_TOP src kernel drivers arch ;
+SubInclude OBOS_TOP src kernel drivers arch ;
 #SubInclude OBOS_TOP src kernel drivers common ;
diff --git a/src/kernel/drivers/arch/x86/Jamfile b/src/kernel/drivers/arch/x86/Jamfile
index 4d6cdb2b8f..49ccc686e3 100644
--- a/src/kernel/drivers/arch/x86/Jamfile
+++ b/src/kernel/drivers/arch/x86/Jamfile
@@ -1,5 +1,3 @@
 SubDir OBOS_TOP src kernel drivers arch x86 ;
 
 SubInclude OBOS_TOP src kernel drivers arch x86 console ;
-SubInclude OBOS_TOP src kernel drivers arch x86 keyboard ;
-SubInclude OBOS_TOP src kernel drivers arch x86 ps2mouse ;
diff --git a/src/kernel/drivers/arch/x86/console/console.c b/src/kernel/drivers/arch/x86/console/console.c
index 4810d482f1..f22e2b8837 100755
--- a/src/kernel/drivers/arch/x86/console/console.c
+++ b/src/kernel/drivers/arch/x86/console/console.c
@@ -9,7 +9,7 @@
 #include <int.h>
 #include <vm.h>
 #include <lock.h>
-#include <drivers.h>
+#include <Drivers.h>
 #include <Errors.h>
 #include <devfs.h>
 
diff --git a/src/kernel/drivers/dev.c b/src/kernel/drivers/dev.c
index 4c6b589d2e..13463293bd 100755
--- a/src/kernel/drivers/dev.c
+++ b/src/kernel/drivers/dev.c
@@ -12,9 +12,15 @@
 #include <elf.h>
 #include <Errors.h>
 #include <devfs.h>
-#include <drivers.h>
+#include <Drivers.h>
 #include <memheap.h>
 
+#ifdef ARCH_x86
+#include <arch/x86/console_dev.h>
+#endif
+
+#include <fb_console.h>
+
 #include <stdio.h>
 
 /* These are mainly here to allow testing and this needs to be revisited */
@@ -48,6 +54,14 @@ int dev_init(kernel_args *ka)
 		}
 	}
 
+	/* now run the oddballs we have, consoles at present */
+	/* XXX - these are x86 and may not be applicable to all platforms */
+#ifdef ARCH_x86
+	console_dev_init(ka);
+#endif
+
+	fb_console_dev_init(ka);
+
 	return 0;
 }
 
diff --git a/src/kernel/drivers/devs.c b/src/kernel/drivers/devs.c
index 8dde54ae42..864c239b89 100755
--- a/src/kernel/drivers/devs.c
+++ b/src/kernel/drivers/devs.c
@@ -6,9 +6,6 @@
 #include <devs.h>
 
 #ifdef ARCH_x86
-#include <arch/x86/console_dev.h>
-#include <arch/x86/keyboard.h>
-#include <arch/x86/ps2mouse.h>
 #endif
 #ifdef ARCH_sh4
 #include <kernel/dev/arch/sh4/maple/maple_bus.h>
@@ -22,8 +19,8 @@ int devs_init(kernel_args *ka)
 {
 
 #ifdef ARCH_x86
-	keyboard_dev_init(ka);
-	console_dev_init(ka);
+//	keyboard_dev_init(ka);
+//	console_dev_init(ka);
 #endif
 
 #ifdef ARCH_sh4
diff --git a/src/kernel/drivers/fb_console/fb_console.c b/src/kernel/drivers/fb_console/fb_console.c
index 278e75931d..1924d3bb8d 100755
--- a/src/kernel/drivers/fb_console/fb_console.c
+++ b/src/kernel/drivers/fb_console/fb_console.c
@@ -10,7 +10,7 @@
 #include <vm.h>
 #include <lock.h>
 #include <devfs.h>
-#include <drivers.h>
+#include <Drivers.h>
 #include <Errors.h>
 
 #include <arch/cpu.h>