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;