diff --git a/src/kits/interface/Point.cpp b/src/kits/interface/Point.cpp
index 75f5b859e3..cf35ccdd67 100644
--- a/src/kits/interface/Point.cpp
+++ b/src/kits/interface/Point.cpp
@@ -4,11 +4,14 @@
  *
  * Authors:
  *		Frans van Nispen
+ *		John Scipione, jscipione@gmail.com
  */
 
 
 #include <Point.h>
 
+#include <algorithm>
+
 #include <stdio.h>
 
 #include <SupportDefs.h>
@@ -21,8 +24,8 @@ const BPoint B_ORIGIN(0, 0);
 void
 BPoint::ConstrainTo(BRect rect)
 {
-	x = max_c(min_c(x, rect.right), rect.left);
-	y = max_c(min_c(y, rect.bottom), rect.top);
+	x = std::max(std::min(x, rect.right), rect.left);
+	y = std::max(std::min(y, rect.bottom), rect.top);
 }