diff --git a/Quake/mathlib.c b/Quake/mathlib.c
index eab19c40..94deace6 100644
--- a/Quake/mathlib.c
+++ b/Quake/mathlib.c
@@ -33,27 +33,6 @@ int nanmask = 255<<23;
 //#define DEG2RAD( a ) ( a * M_PI ) / 180.0F
 #define DEG2RAD( a ) ( (a) * M_PI_DIV_180 ) //johnfitz
 
-// kristian - missing math functions
-#ifndef max
-int max (int x, int y)
-{
-    if (x > y)
-        return x;
-        
-    return y;
-}
-#endif
-#ifndef min
-int min (int x, int y)
-{
-    if (x < y)
-        return x;
-    
-    return y;
-}
-#endif
-// kristian
-
 void ProjectPointOnPlane( vec3_t dst, const vec3_t p, const vec3_t normal )
 {
 	float d;
diff --git a/Quake/mathlib.h b/Quake/mathlib.h
index 291d113b..95398997 100644
--- a/Quake/mathlib.h
+++ b/Quake/mathlib.h
@@ -71,10 +71,22 @@ extern	int nanmask;
 
 // kristian - missing math functions
 #if !defined(max)
-inline int max (int x, int y);
+#define max q_max
+static inline int q_max (int x, int y)
+{
+	if (x > y)
+		return x;
+	return y;
+}
 #endif
 #if !defined(min)
-inline int min (int x, int y);
+#define min q_min
+static inline int q_min (int x, int y)
+{
+	if (x < y)
+		return x;
+	return y;
+}
 #endif
 // kristian