2 files changed, 10 insertions, 10 deletions
diff --git a/sys/arch/sgi/sgi/ip30_machdep.c b/sys/arch/sgi/sgi/ip30_machdep.c
index fc0ce491026..2725f4a686e 100644
--- a/sys/arch/sgi/sgi/ip30_machdep.c
+++ b/sys/arch/sgi/sgi/ip30_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip30_machdep.c,v 1.2 2008/04/24 12:52:26 jsing Exp $	*/
+/*	$OpenBSD: ip30_machdep.c,v 1.3 2009/04/12 17:53:02 miod Exp $	*/
 
 /*
  * Copyright (c) 2008 Miodrag Vallat.
@@ -22,6 +22,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/device.h>
+#include <sys/tty.h>
 
 #include <mips64/arcbios.h>
 
@@ -39,14 +41,12 @@
 #include <sgi/xbow/xheartreg.h>
 #include <sgi/pci/iocreg.h>
 
+#include <dev/ic/comvar.h>
+
 paddr_t	ip30_widget_short(int16_t, u_int);
 paddr_t	ip30_widget_long(int16_t, u_int);
 int	ip30_widget_id(int16_t, u_int, uint32_t *);
 
-extern bus_addr_t comconsaddr;
-extern bus_space_tag_t comconsiot;
-extern int comconsfreq;
-
 void
 ip30_setup()
 {
diff --git a/sys/arch/sgi/sgi/ip32_machdep.c b/sys/arch/sgi/sgi/ip32_machdep.c
index e46587347d8..7b66d1a6295 100644
--- a/sys/arch/sgi/sgi/ip32_machdep.c
+++ b/sys/arch/sgi/sgi/ip32_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip32_machdep.c,v 1.3 2008/05/04 12:27:46 miod Exp $ */
+/*	$OpenBSD: ip32_machdep.c,v 1.4 2009/04/12 17:53:02 miod Exp $ */
 
 /*
  * Copyright (c) 2003-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -29,7 +29,9 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
+#include <sys/device.h>
 #include <sys/extent.h>
+#include <sys/tty.h>
 
 #include <uvm/uvm_extern.h>
 
@@ -44,14 +46,12 @@
 #include <sgi/localbus/crimebus.h>
 #include <sgi/localbus/macebus.h>
 
+#include <dev/ic/comvar.h>
+
 void crime_configure_memory(void);
 
 extern int bootdriveoffs;
 
-extern bus_addr_t comconsaddr;
-extern bus_space_tag_t comconsiot;
-extern int comconsfreq;
-
 void
 crime_configure_memory(void)
 {