diff --git a/hw/xfree86/os-support/solaris/sun_vid.c b/hw/xfree86/os-support/solaris/sun_vid.c
index 3db537a3a..82cd1ae7b 100644
--- a/hw/xfree86/os-support/solaris/sun_vid.c
+++ b/hw/xfree86/os-support/solaris/sun_vid.c
@@ -27,6 +27,8 @@
 #include <xorg-config.h>
 #endif
 
+#include <sys/types.h> /* get __x86 definition if not set by compiler */
+
 #if defined(i386) || defined(__x86)
 #define _NEED_SYSI86
 #endif
diff --git a/include/servermd.h b/include/servermd.h
index e21eecf8c..73f339b99 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -215,10 +215,16 @@ SOFTWARE.
 #endif /* SuperH */
 
 
-#if (defined(sun) && !(defined(i386) && defined(SVR4))) || \
+#if (defined(sun) && (defined(__sparc) || defined(sparc))) || \
     (defined(__uxp__) && (defined(sparc) || defined(mc68000))) || \
     defined(__sparc__) || defined(__mc68000__)
 
+#if defined(__sparc) || defined(__sparc__)
+# if !defined(sparc)
+#  define sparc 1
+# endif
+#endif
+
 #if defined(sun386) || defined(sun5)
 # define IMAGE_BYTE_ORDER	LSBFirst        /* Values for the SUN only */
 # define BITMAP_BIT_ORDER	LSBFirst
@@ -447,7 +453,7 @@ SOFTWARE.
 
 #if	(defined(SVR4) && defined(i386)) || \
 	defined(__alpha__) || defined(__alpha) || \
-	defined(__i386__) || \
+	defined(__i386__) || defined(__i386) || \
 	defined(__UNIXOS2__) || \
 	defined(__OS2ELF__) || \
 	defined(__QNX__) || \