14 files changed, 20 insertions, 15 deletions

diff --git a/sys/dev/atkbdc/atkbd.c b/sys/dev/atkbdc/atkbd.c
index 497d267bc272..9b62dd813773 100644
--- a/sys/dev/atkbdc/atkbd.c
+++ b/sys/dev/atkbdc/atkbd.c
@@ -167,7 +167,7 @@ atkbd_timeout(void *arg)
 /* LOW-LEVEL */
 
 #include <machine/limits.h>
-#include <machine/console.h>
+#include <sys/kbio.h>
 #include <machine/clock.h>
 
 #define ATKBD_DEFAULT	0
diff --git a/sys/dev/kbd/atkbd.c b/sys/dev/kbd/atkbd.c
index 497d267bc272..9b62dd813773 100644
--- a/sys/dev/kbd/atkbd.c
+++ b/sys/dev/kbd/atkbd.c
@@ -167,7 +167,7 @@ atkbd_timeout(void *arg)
 /* LOW-LEVEL */
 
 #include <machine/limits.h>
-#include <machine/console.h>
+#include <sys/kbio.h>
 #include <machine/clock.h>
 
 #define ATKBD_DEFAULT	0
diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c
index a9471e807a19..ec72820a25cd 100644
--- a/sys/dev/kbd/kbd.c
+++ b/sys/dev/kbd/kbd.c
@@ -39,7 +39,7 @@
 #include <sys/vnode.h>
 #include <sys/uio.h>
 
-#include <machine/console.h>
+#include <sys/kbio.h>
 
 #include <dev/kbd/kbdreg.h>
 
diff --git a/sys/dev/kbd/kbdreg.h b/sys/dev/kbd/kbdreg.h
index 54b2d6d4089d..de7d9419c910 100644
--- a/sys/dev/kbd/kbdreg.h
+++ b/sys/dev/kbd/kbdreg.h
@@ -232,7 +232,7 @@ int			kbd_detach(keyboard_t *kbd);
 #define CLKDOWN		(1 << 28)
 #define ALKDOWN		(1 << 29)
 #define SHIFTAON	(1 << 30)
-/* lock key state (defined in machine/console.h) */
+/* lock key state (defined in sys/kbio.h) */
 /*
 #define CLKED		LED_CAP
 #define NLKED		LED_NUM
diff --git a/sys/dev/syscons/scgfbrndr.c b/sys/dev/syscons/scgfbrndr.c
index 74615258d8ce..85c4418e1036 100644
--- a/sys/dev/syscons/scgfbrndr.c
+++ b/sys/dev/syscons/scgfbrndr.c
@@ -32,8 +32,9 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/fbio.h>
+#include <sys/consio.h>
 
-#include <machine/console.h>
 #include <machine/bus.h>
 
 #include <dev/fb/fbreg.h>
diff --git a/sys/dev/syscons/schistory.c b/sys/dev/syscons/schistory.c
index c4053498acf0..1c5f15468aa2 100644
--- a/sys/dev/syscons/schistory.c
+++ b/sys/dev/syscons/schistory.c
@@ -37,11 +37,11 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
+#include <sys/consio.h>
 #include <sys/tty.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 
-#include <machine/console.h>
 #include <machine/pc/display.h>
 
 #include <dev/syscons/syscons.h>
diff --git a/sys/dev/syscons/scmouse.c b/sys/dev/syscons/scmouse.c
index f08659327594..08ee861b4950 100644
--- a/sys/dev/syscons/scmouse.c
+++ b/sys/dev/syscons/scmouse.c
@@ -37,8 +37,9 @@
 #include <sys/random.h>
 #include <sys/tty.h>
 #include <sys/malloc.h>
+#include <sys/consio.h>
+#include <sys/fbio.h>
 
-#include <machine/console.h>
 #include <machine/mouse.h>
 
 #include <dev/syscons/syscons.h>
diff --git a/sys/dev/syscons/scvesactl.c b/sys/dev/syscons/scvesactl.c
index 8c498f995f07..e550b17db9e2 100644
--- a/sys/dev/syscons/scvesactl.c
+++ b/sys/dev/syscons/scvesactl.c
@@ -36,7 +36,6 @@
 #include <sys/tty.h>
 #include <sys/kernel.h>
 
-#include <machine/console.h>
 #include <machine/pc/vesa.h>
 
 #include <dev/fb/fbreg.h>
diff --git a/sys/dev/syscons/scvgarndr.c b/sys/dev/syscons/scvgarndr.c
index 74615258d8ce..85c4418e1036 100644
--- a/sys/dev/syscons/scvgarndr.c
+++ b/sys/dev/syscons/scvgarndr.c
@@ -32,8 +32,9 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/fbio.h>
+#include <sys/consio.h>
 
-#include <machine/console.h>
 #include <machine/bus.h>
 
 #include <dev/fb/fbreg.h>
diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c
index 8af13a0b0719..be9d1e66f30d 100644
--- a/sys/dev/syscons/scvidctl.c
+++ b/sys/dev/syscons/scvidctl.c
@@ -34,8 +34,8 @@
 #include <sys/signalvar.h>
 #include <sys/tty.h>
 #include <sys/kernel.h>
-
-#include <machine/console.h>
+#include <sys/fbio.h>
+#include <sys/consio.h>
 
 #include <dev/fb/fbreg.h>
 #include <dev/syscons/syscons.h>
diff --git a/sys/dev/syscons/scvtb.c b/sys/dev/syscons/scvtb.c
index de9dfca2d92e..2654a4ae265b 100644
--- a/sys/dev/syscons/scvtb.c
+++ b/sys/dev/syscons/scvtb.c
@@ -31,8 +31,9 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
+#include <sys/fbio.h>
+#include <sys/consio.h>
 
-#include <machine/console.h>
 #include <machine/md_var.h>
 #include <machine/bus.h>
 
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 43b7724582a3..d622613ae7cc 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -48,9 +48,11 @@
 #include <sys/malloc.h>
 #include <sys/cons.h>
 #include <sys/random.h>
+#include <sys/consio.h>
+#include <sys/kbio.h>
+#include <sys/fbio.h>
 
 #include <machine/clock.h>
-#include <machine/console.h>
 #include <machine/psl.h>
 #include <machine/pc/display.h>
 #ifdef __i386__
diff --git a/sys/dev/syscons/sysmouse.c b/sys/dev/syscons/sysmouse.c
index e97be1ac6602..7d7c575bcafb 100644
--- a/sys/dev/syscons/sysmouse.c
+++ b/sys/dev/syscons/sysmouse.c
@@ -34,8 +34,8 @@
 #include <sys/proc.h>
 #include <sys/tty.h>
 #include <sys/kernel.h>
+#include <sys/consio.h>
 
-#include <machine/console.h>
 #include <machine/mouse.h>
 
 #include <dev/syscons/syscons.h>
diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c
index c3334329d36c..5debe8f2652c 100644
--- a/sys/dev/usb/ukbd.c
+++ b/sys/dev/usb/ukbd.c
@@ -216,7 +216,7 @@ ukbd_intr(usbd_xfer_handle xfer, usbd_private_handle addr, usbd_status status)
 DRIVER_MODULE(ukbd, uhub, ukbd_driver, ukbd_devclass, ukbd_driver_load, 0);
 
 #include <machine/limits.h>
-#include <machine/console.h>
+#include <sys/kbio.h>
 #include <machine/clock.h>
 
 #define UKBD_DEFAULT	0