11 files changed, 13 insertions, 11 deletions
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c
index 1349686..15a84f1 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.c
+++ b/usr.sbin/kbdcontrol/kbdcontrol.c
@@ -38,7 +38,8 @@ static const char rcsid[] =
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <machine/console.h>
+#include <sys/kbio.h>
+#include <sys/consio.h>
 #include "path.h"
 #include "lex.h"
 
diff --git a/usr.sbin/moused/moused.c b/usr.sbin/moused/moused.c
index 1157bd8..9f33c36 100644
--- a/usr.sbin/moused/moused.c
+++ b/usr.sbin/moused/moused.c
@@ -64,9 +64,9 @@ static const char rcsid[] =
 #include <termios.h>
 #include <syslog.h>
 
-#include <machine/console.h>
 #include <machine/mouse.h>
 
+#include <sys/consio.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
diff --git a/usr.sbin/sade/keymap.c b/usr.sbin/sade/keymap.c
index 53b0761..3c53a00 100644
--- a/usr.sbin/sade/keymap.c
+++ b/usr.sbin/sade/keymap.c
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <machine/console.h>
+#include <sys/kbio.h>
 
 struct keymapInfo {
     const char *name;
diff --git a/usr.sbin/sade/msg.c b/usr.sbin/sade/msg.c
index 499d705..19e16c5 100644
--- a/usr.sbin/sade/msg.c
+++ b/usr.sbin/sade/msg.c
@@ -37,7 +37,7 @@
 #include "sysinstall.h"
 #include <stdarg.h>
 #include <sys/ioctl.h>
-#include <machine/console.h>
+#include <sys/consio.h>
 
 Boolean
 isDebug(void)
diff --git a/usr.sbin/sade/system.c b/usr.sbin/sade/system.c
index 6010e7a..0eec38a 100644
--- a/usr.sbin/sade/system.c
+++ b/usr.sbin/sade/system.c
@@ -20,7 +20,7 @@
 #include <signal.h>
 #include <termios.h>
 #include <sys/reboot.h>
-#include <machine/console.h>
+#include <sys/consio.h>
 #include <sys/fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/sade/termcap.c b/usr.sbin/sade/termcap.c
index edac12e..78a78d6 100644
--- a/usr.sbin/sade/termcap.c
+++ b/usr.sbin/sade/termcap.c
@@ -16,7 +16,7 @@
 #include <fcntl.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
-#include <machine/console.h>
+#include <sys/consio.h>
 
 #define VTY_STATUS_LINE    24
 #define TTY_STATUS_LINE    23
diff --git a/usr.sbin/sysinstall/keymap.c b/usr.sbin/sysinstall/keymap.c
index 53b0761..3c53a00 100644
--- a/usr.sbin/sysinstall/keymap.c
+++ b/usr.sbin/sysinstall/keymap.c
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <machine/console.h>
+#include <sys/kbio.h>
 
 struct keymapInfo {
     const char *name;
diff --git a/usr.sbin/sysinstall/msg.c b/usr.sbin/sysinstall/msg.c
index 499d705..19e16c5 100644
--- a/usr.sbin/sysinstall/msg.c
+++ b/usr.sbin/sysinstall/msg.c
@@ -37,7 +37,7 @@
 #include "sysinstall.h"
 #include <stdarg.h>
 #include <sys/ioctl.h>
-#include <machine/console.h>
+#include <sys/consio.h>
 
 Boolean
 isDebug(void)
diff --git a/usr.sbin/sysinstall/system.c b/usr.sbin/sysinstall/system.c
index 6010e7a..0eec38a 100644
--- a/usr.sbin/sysinstall/system.c
+++ b/usr.sbin/sysinstall/system.c
@@ -20,7 +20,7 @@
 #include <signal.h>
 #include <termios.h>
 #include <sys/reboot.h>
-#include <machine/console.h>
+#include <sys/consio.h>
 #include <sys/fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/sysinstall/termcap.c b/usr.sbin/sysinstall/termcap.c
index edac12e..78a78d6 100644
--- a/usr.sbin/sysinstall/termcap.c
+++ b/usr.sbin/sysinstall/termcap.c
@@ -16,7 +16,7 @@
 #include <fcntl.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
-#include <machine/console.h>
+#include <sys/consio.h>
 
 #define VTY_STATUS_LINE    24
 #define TTY_STATUS_LINE    23
diff --git a/usr.sbin/vidcontrol/vidcontrol.c b/usr.sbin/vidcontrol/vidcontrol.c
index 1e81cf5..cf2dc30 100644
--- a/usr.sbin/vidcontrol/vidcontrol.c
+++ b/usr.sbin/vidcontrol/vidcontrol.c
@@ -38,7 +38,8 @@ static const char rcsid[] =
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <machine/console.h>
+#include <sys/fbio.h>
+#include <sys/consio.h>
 #include <sys/errno.h>
 #include "path.h"
 #include "decode.h"