Index: trunk/src/lua/lua_area.cc
===================================================================
--- trunk/src/lua/lua_area.cc	(revision 369)
+++ trunk/src/lua/lua_area.cc	(revision 374)
@@ -79,5 +79,5 @@
 {
 	nv::rectangle* a = to_parea( L, 1 );
-	std::size_t l;
+	nv::size_t l;
 	const char* index = lua_tolstring( L, 2, &l );
 	if ( l == 1 && index[0] == 'a' )
@@ -101,5 +101,5 @@
 {
 	nv::rectangle* a = to_parea( L, 1 );
-	std::size_t l;
+	nv::size_t l;
 	const char* index = lua_tolstring( L, 2, &l );
 	nv::ivec2 value( to_coord( L, 3 ) );
Index: trunk/src/lua/lua_map_tile.cc
===================================================================
--- trunk/src/lua/lua_map_tile.cc	(revision 369)
+++ trunk/src/lua/lua_map_tile.cc	(revision 374)
@@ -7,7 +7,8 @@
 #include "nv/lua/lua_map_tile.hh"
 
-#include <numeric>
 #include "nv/lua/lua_map_area.hh"
 #include "nv/stl/flags.hh"
+#include "nv/stl/numeric.hh"
+#include "nv/stl/algorithm.hh"
 #include "nv/core/random.hh"
 #include "nv/lua/lua_area.hh"
@@ -59,5 +60,5 @@
 	map_tile tile;
 
-	tile.size_y = (nv::uint16)( std::count( code.begin(), code.end(), '\n' ) + 1 );
+	tile.size_y = (nv::uint16)( nv::count( code.begin(), code.end(), '\n' ) + 1 );
 	tile.size_x = (nv::uint16)( code.find( '\n' ) );
 	if ( tile.size_x == 0 )
@@ -236,6 +237,6 @@
 	nv::uint16 org_x = tile->size_x;
 	nv::uint16 org_y = tile->size_y;
-	nv::uint16 new_x = (nv::uint16)std::accumulate( sizes_x.begin(), sizes_x.end(), 0 );
-	nv::uint16 new_y = (nv::uint16)std::accumulate( sizes_y.begin(), sizes_y.end(), 0 );
+	nv::uint16 new_x = ( nv::uint16 )nv::accumulate( sizes_x.begin(), sizes_x.end(), 0 );
+	nv::uint16 new_y = ( nv::uint16 )nv::accumulate( sizes_y.begin(), sizes_y.end(), 0 );
 
 	nv::uint8* data = new nv::uint8[ new_x * new_y ];