9 files changed, 15 insertions, 10 deletions
diff --git a/sys/dev/syscons/scgfbrndr.c b/sys/dev/syscons/scgfbrndr.c
index 74615258d8ce9..85c4418e10362 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 c4053498acf0e..1c5f15468aa23 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 f08659327594e..08ee861b49509 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 8c498f995f07b..e550b17db9e29 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 74615258d8ce9..85c4418e10362 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 8af13a0b07193..be9d1e66f30d3 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 de9dfca2d92ec..2654a4ae265b9 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 43b7724582a3b..d622613ae7ccb 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 e97be1ac6602e..7d7c575bcafbb 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>