Index: trunk/src/io/c_stream.cc
===================================================================
--- trunk/src/io/c_stream.cc	(revision 319)
+++ trunk/src/io/c_stream.cc	(revision 374)
@@ -6,5 +6,4 @@
 #include <sys/stat.h> 
 #include "nv/io/c_stream.hh"
-#include <limits>
 
 using namespace nv;
Index: trunk/src/io/std_stream.cc
===================================================================
--- trunk/src/io/std_stream.cc	(revision 319)
+++ trunk/src/io/std_stream.cc	(revision 374)
@@ -8,5 +8,6 @@
 
 #include "nv/io/std_stream.hh"
-#include <algorithm>
+#include "nv/stl/math.hh"
+#include "nv/stl/utility.hh"
 
 using namespace nv;
@@ -15,6 +16,6 @@
 	: m_stream( source )
 	, m_owner( owner )
-	, m_buffer( std::max(bsize, put_back) + put_back )
-	, m_put_back( std::max( put_back, std::size_t( 1 ) ) )
+	, m_buffer( nv::max(bsize, put_back) + put_back )
+	, m_put_back( nv::max( put_back, std::size_t( 1 ) ) )
 {
 	char *end = &m_buffer.front() + m_buffer.size();