Index: trunk/src/engine/program_manager.cc
===================================================================
--- trunk/src/engine/program_manager.cc	(revision 374)
+++ trunk/src/engine/program_manager.cc	(revision 380)
@@ -46,5 +46,5 @@
 }
 
-void nv::program_manager::load_source( lua::table_guard& table, string& out, const string& append )
+void nv::program_manager::load_source( lua::table_guard& table, std::string& out, const std::string& append )
 {
 	out = append;
Index: trunk/src/engine/resource_system.cc
===================================================================
--- trunk/src/engine/resource_system.cc	(revision 374)
+++ trunk/src/engine/resource_system.cc	(revision 380)
@@ -36,10 +36,10 @@
 }
 
-nv::resource_type_id nv::resource_system::register_resource_type( const string& /*name*/, resource_manager_base* /*manager*/ )
+nv::resource_type_id nv::resource_system::register_resource_type( const std::string& /*name*/, resource_manager_base* /*manager*/ )
 {
 	return 0;
 }
 
-nv::resource_type_id nv::resource_system::get_resource_type_id( const string& /*name*/ ) const
+nv::resource_type_id nv::resource_system::get_resource_type_id( const std::string& /*name*/ ) const
 {
 	return 0;