diff --git a/src/p_setup.h b/src/p_setup.h
index dc171e0717..b1590e7149 100644
--- a/src/p_setup.h
+++ b/src/p_setup.h
@@ -29,7 +29,7 @@
 
 struct MapData
 {
-	struct
+	struct MapLump
 	{
 		char Name[8];
 		FileReader *Reader;
diff --git a/src/sdl/crashcatcher.c b/src/sdl/crashcatcher.c
index 1dfa43af83..37511f63ac 100644
--- a/src/sdl/crashcatcher.c
+++ b/src/sdl/crashcatcher.c
@@ -8,6 +8,7 @@
 #include <sys/ucontext.h>
 #include <string.h>
 #include <errno.h>
+#include <limits.h>
 
 #ifdef __linux__
 #include <sys/prctl.h>
diff --git a/src/sdl/i_system.cpp b/src/sdl/i_system.cpp
index df15ce774c..afabd0d216 100644
--- a/src/sdl/i_system.cpp
+++ b/src/sdl/i_system.cpp
@@ -270,7 +270,14 @@ void I_HandleAlarm (int sig)
 void I_SelectTimer()
 {
 	SEMAPHORE_INIT(timerWait, 0, 0)
+#ifndef __sun
 	signal(SIGALRM, I_HandleAlarm);
+#else
+	struct sigaction alrmaction;
+	sigaction(SIGALRM, NULL, &alrmaction);
+	alrmaction.sa_handler = I_HandleAlarm;
+	sigaction(SIGALRM, &alrmaction, NULL);
+#endif
 
 	struct itimerval itv;
 	itv.it_interval.tv_sec = itv.it_value.tv_sec = 0;