diff -Nura xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_io.c xorg-server-1.1.1.sparc/hw/xfree86/os-support/linux/lnx_io.c
--- xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_io.c	2006-07-05 15:31:41.000000000 -0300
+++ xorg-server-1.1.1.sparc/hw/xfree86/os-support/linux/lnx_io.c	2007-01-18 14:43:53.000000000 -0300
@@ -72,10 +72,6 @@
 
 #include <linux/kd.h>
 #include <linux/version.h>
-#ifdef __sparc__
-#include <asm/param.h>
-#include <asm/kbio.h>
-#endif
 
 /* Deal with spurious kernel header change in struct kbd_repeat.
    We undo this define after the routine using that struct is over,
diff -Nura xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_kbd.c xorg-server-1.1.1.sparc/hw/xfree86/os-support/linux/lnx_kbd.c
--- xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_kbd.c	2006-07-05 15:31:41.000000000 -0300
+++ xorg-server-1.1.1.sparc/hw/xfree86/os-support/linux/lnx_kbd.c	2007-01-18 14:44:55.000000000 -0300
@@ -102,10 +102,6 @@
 
 #include <linux/kd.h>
 #include <linux/version.h>
-#ifdef __sparc__
-#include <asm/param.h>
-#include <asm/kbio.h>
-#endif
 
 /* Deal with spurious kernel header change in struct kbd_repeat.
    We undo this define after the routine using that struct is over,