Index: trunk/src/formats/assimp_loader.cc
===================================================================
--- trunk/src/formats/assimp_loader.cc	(revision 389)
+++ trunk/src/formats/assimp_loader.cc	(revision 392)
@@ -6,6 +6,5 @@
 
 #include "nv/formats/assimp_loader.hh"
-#include <unordered_map>
-#include "nv/io/std_stream.hh"
+#include "nv/stl/unordered_map.hh"
 #include "nv/gfx/mesh_creator.hh"
 #include "nv/lib/assimp.hh"
@@ -286,5 +285,5 @@
 	const aiScene* scene = (const aiScene*)m_scene;
 	vector< mesh_node_data > final_bones;
-	std::unordered_map< std::string, uint16 > names;
+	unordered_map< std::string, uint16 > names;
 	for ( unsigned int m = 0; m < m_mesh_count; ++m )
 	{
@@ -334,5 +333,5 @@
 	}
 	mesh_node_data* bones = new mesh_node_data[ final_bones.size() ];
-	nv::raw_copy( final_bones.begin(), final_bones.end(), bones );
+	raw_copy( final_bones.begin(), final_bones.end(), bones );
 	return new mesh_nodes_data( "bones", final_bones.size(), bones );
 }
Index: trunk/src/formats/md5_loader.cc
===================================================================
--- trunk/src/formats/md5_loader.cc	(revision 389)
+++ trunk/src/formats/md5_loader.cc	(revision 392)
@@ -6,4 +6,5 @@
 
 #include "nv/core/logging.hh"
+#include "nv/stl/vector.hh"
 #include "nv/io/std_stream.hh"