diff --git a/platform/switch_sparc_sun_gcc.h b/platform/switch_sparc_sun_gcc.h
index f6020b0e..1f701a2a 100644
--- a/platform/switch_sparc_sun_gcc.h
+++ b/platform/switch_sparc_sun_gcc.h
@@ -26,9 +26,9 @@
 
 #ifdef SLP_EVAL
 
-#include <sys/trap.h>
 
 #define STACK_MAGIC 0
+#define ST_FLUSH_WINDOWS 3
 
 static int
 slp_switch(void)
diff --git a/slp_platformselect.h b/slp_platformselect.h
index efbc00dc..76c21ba5 100644
--- a/slp_platformselect.h
+++ b/slp_platformselect.h
@@ -16,7 +16,7 @@
 #include "platform/switch_ppc_macosx.h" /* Apple MacOS X on PowerPC */
 #elif defined(__GNUC__) && defined(_ARCH_PPC) && defined(_AIX)
 #include "platform/switch_ppc_aix.h" /* gcc on AIX/PowerPC */
-#elif defined(__GNUC__) && defined(sparc) && defined(sun)
+#elif defined(__GNUC__) && defined(sparc)
 #include "platform/switch_sparc_sun_gcc.h" /* SunOS sparc with gcc */
 #elif defined(__SUNPRO_C) && defined(sparc) && defined(sun)
 #include "platform/switch_sparc_sun_gcc.h" /* SunStudio on amd64 */