diff --git a/src/console.c b/src/console.c
index dd24ffaf0..4d45dc07c 100644
--- a/src/console.c
+++ b/src/console.c
@@ -44,8 +44,12 @@
 #ifdef HAVE_THREADS
 I_mutex con_mutex;
 
-#  define Lock_state()    I_lock_mutex(&con_mutex)
-#  define Unlock_state() I_unlock_mutex(con_mutex)
+// g_in_exiting_signal_handler is an evil hack
+// to avoid infinite SIGABRT recursion in the signal handler
+// due to poisoned locks or mach-o kernel not supporting locks in signals
+// or something like that. idk
+#  define Lock_state()    if (!g_in_exiting_signal_handler) { I_lock_mutex(&con_mutex); }
+#  define Unlock_state()  if (!g_in_exiting_signal_handler) { I_unlock_mutex(con_mutex); }
 #else/*HAVE_THREADS*/
 #  define Lock_state()
 #  define Unlock_state()
diff --git a/src/i_system.h b/src/i_system.h
index b21e31830..e2eff46b5 100644
--- a/src/i_system.h
+++ b/src/i_system.h
@@ -34,6 +34,9 @@ extern UINT8 graphics_started;
 */
 extern UINT8 keyboard_started;
 
+/** \brief Set to true when inside a signal handler that will exit the program. */
+extern boolean g_in_exiting_signal_handler;
+
 /**	\brief	The I_GetFreeMem function
 
 	\param	total	total memory in the system
diff --git a/src/k_botitem.cpp b/src/k_botitem.cpp
index fc1370b1f..1d8ba9360 100644
--- a/src/k_botitem.cpp
+++ b/src/k_botitem.cpp
@@ -7,9 +7,11 @@
 // terms of the GNU General Public License, version 2.
 // See the 'LICENSE' file for more details.
 //-----------------------------------------------------------------------------
-/// \file  k_botitem.c
+/// \file  k_botitem.cpp
 /// \brief Bot item usage logic
 
+#include <algorithm>
+
 #include <tracy/tracy/Tracy.hpp>
 
 #include "doomdef.h"
@@ -240,7 +242,7 @@ static player_t *K_PlayerInCone(const player_t *player, fixed_t radius, UINT16 c
 			{
 				ad = AngleFixed(a)>>FRACBITS;
 			}
-			else 
+			else
 			{
 				ad = 360-(AngleFixed(a)>>FRACBITS);
 			}
diff --git a/src/k_botsearch.cpp b/src/k_botsearch.cpp
index f3bdbf4bd..1a4e9cc57 100644
--- a/src/k_botsearch.cpp
+++ b/src/k_botsearch.cpp
@@ -7,9 +7,11 @@
 // terms of the GNU General Public License, version 2.
 // See the 'LICENSE' file for more details.
 //-----------------------------------------------------------------------------
-/// \file  k_botsearch.c
+/// \file  k_botsearch.cpp
 /// \brief Bot blockmap search functions
 
+#include <algorithm>
+
 #include <tracy/tracy/Tracy.hpp>
 
 #include "doomdef.h"
@@ -441,7 +443,7 @@ static BlockItReturn_t K_FindObjectsForNudging(mobj_t *thing)
 	{
 		angledelta = AngleFixed(angle)>>FRACBITS;
 	}
-	else 
+	else
 	{
 		angledelta = 360-(AngleFixed(angle)>>FRACBITS);
 		side = 1;
@@ -930,7 +932,7 @@ static BlockItReturn_t K_FindPlayersToBully(mobj_t *thing)
 	{
 		anglediff = AngleFixed(angle)>>FRACBITS;
 	}
-	else 
+	else
 	{
 		anglediff = 360-(AngleFixed(angle)>>FRACBITS);
 	}
@@ -1007,7 +1009,7 @@ INT32 K_PositionBully(const player_t *player)
 	{
 		anglediff = AngleFixed(angle)>>FRACBITS;
 	}
-	else 
+	else
 	{
 		anglediff = 360-(AngleFixed(angle)>>FRACBITS);
 	}
diff --git a/src/k_hud.cpp b/src/k_hud.cpp
index 50670abf7..647259244 100644
--- a/src/k_hud.cpp
+++ b/src/k_hud.cpp
@@ -4473,7 +4473,7 @@ static void K_drawKartMinimap(void)
 
 			MiniWaypoint(waypoint_t* wp) : waypoint(wp), rank(K_RankMinimapWaypoint(wp)) {}
 
-			bool operator<(const MiniWaypoint& b) { return rank < b.rank; }
+			bool operator<(const MiniWaypoint& b) const noexcept { return rank < b.rank; }
 		};
 
 		std::vector<MiniWaypoint> waypoints;
diff --git a/src/sdl/i_system.cpp b/src/sdl/i_system.cpp
index 2a1a4f9ee..0fba83218 100644
--- a/src/sdl/i_system.cpp
+++ b/src/sdl/i_system.cpp
@@ -208,6 +208,7 @@ SDL_bool consolevent = SDL_FALSE;
 SDL_bool framebuffer = SDL_FALSE;
 
 UINT8 keyboard_started = false;
+boolean g_in_exiting_signal_handler = false;
 
 #ifdef UNIXBACKTRACE
 #define STDERR_WRITE(string) if (fd != -1) I_OutputMsg("%s", string)
@@ -428,6 +429,8 @@ static void I_ReportSignal(int num, int coredumped)
 #ifndef NEWSIGNALHANDLER
 FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num)
 {
+	g_in_exiting_signal_handler = true;
+
 	if (g_main_thread_id != std::this_thread::get_id())
 	{
 		// Do not attempt any sort of recovery if this signal triggers off the main thread