diff --git a/src/engine/client/serverbrowser.cpp b/src/engine/client/serverbrowser.cpp
index 1764dfb72..1893f5b86 100644
--- a/src/engine/client/serverbrowser.cpp
+++ b/src/engine/client/serverbrowser.cpp
@@ -914,7 +914,7 @@ void CServerBrowser::RequestCurrentServerWithRandomToken(const NETADDR &Addr, in
 
 void CServerBrowser::SetCurrentServerPing(const NETADDR &Addr, int Ping)
 {
-	SetLatency(Addr, std::min(Ping, 999));
+	SetLatency(Addr, minimum(Ping, 999));
 }
 
 void ServerBrowserFillEstimatedLatency(int OwnLocation, const IServerBrowserPingCache::CEntry *pEntries, int NumEntries, int *pIndex, NETADDR Addr, CServerInfo *pInfo)
diff --git a/src/engine/shared/serverinfo.cpp b/src/engine/shared/serverinfo.cpp
index 2a554a7d6..7197f1505 100644
--- a/src/engine/shared/serverinfo.cpp
+++ b/src/engine/shared/serverinfo.cpp
@@ -173,7 +173,7 @@ CServerInfo2::operator CServerInfo() const
 	str_copy(Result.m_aMap, m_aMapName, sizeof(Result.m_aMap));
 	str_copy(Result.m_aVersion, m_aVersion, sizeof(Result.m_aVersion));
 
-	for(int i = 0; i < std::min(m_NumClients, (int)MAX_CLIENTS); i++)
+	for(int i = 0; i < minimum(m_NumClients, (int)MAX_CLIENTS); i++)
 	{
 		str_copy(Result.m_aClients[i].m_aName, m_aClients[i].m_aName, sizeof(Result.m_aClients[i].m_aName));
 		str_copy(Result.m_aClients[i].m_aClan, m_aClients[i].m_aClan, sizeof(Result.m_aClients[i].m_aClan));
@@ -182,7 +182,7 @@ CServerInfo2::operator CServerInfo() const
 		Result.m_aClients[i].m_Player = m_aClients[i].m_IsPlayer;
 	}
 
-	Result.m_NumReceivedClients = std::min(m_NumClients, (int)MAX_CLIENTS);
+	Result.m_NumReceivedClients = minimum(m_NumClients, (int)MAX_CLIENTS);
 	Result.m_Latency = -1;
 
 	return Result;