diff --git a/common/rdr/HexInStream.cxx b/common/rdr/HexInStream.cxx
index e23974e198..17154125b3 100644
--- a/common/rdr/HexInStream.cxx
+++ b/common/rdr/HexInStream.cxx
@@ -24,11 +24,10 @@
 #include <rdr/HexInStream.h>
 #include <rdr/Exception.h>
 #include <rfb/util.h>
+#include <algorithm>
 
 using namespace rdr;
 
-static inline int min(int a, int b) {return a<b ? a : b;}
-
 HexInStream::HexInStream(InStream& is)
 : in_stream(is)
 {
@@ -41,8 +40,8 @@ HexInStream::~HexInStream() {
 bool HexInStream::fillBuffer() {
   if (!in_stream.hasData(2))
     return false;
-
-  size_t length = min(in_stream.avail()/2, availSpace());
+  
+  size_t length = std::min(in_stream.avail()/2, availSpace());
   const uint8_t* iptr = in_stream.getptr(length*2);
 
   uint8_t* optr = (uint8_t*) end;
diff --git a/common/rdr/HexOutStream.cxx b/common/rdr/HexOutStream.cxx
index b1ab2dc064..a8fec0cb25 100644
--- a/common/rdr/HexOutStream.cxx
+++ b/common/rdr/HexOutStream.cxx
@@ -23,11 +23,10 @@
 
 #include <rdr/HexOutStream.h>
 #include <rfb/util.h>
+#include <algorithm>
 
 using namespace rdr;
 
-static inline size_t min(size_t a, size_t b) {return a<b ? a : b;}
-
 HexOutStream::HexOutStream(OutStream& os)
   : out_stream(os)
 {
@@ -41,7 +40,7 @@ bool HexOutStream::flushBuffer()
 {
   while (sentUpTo != ptr) {
     uint8_t* optr = out_stream.getptr(2);
-    size_t length = min(ptr-sentUpTo, out_stream.avail()/2);
+    size_t length = std::min(ptr-sentUpTo, (int64_t)out_stream.avail()/2);
 
     for (size_t i=0; i<length; i++)
       rfb::binToHex(&sentUpTo[i], 1, (char*)&optr[i*2], 2);