Index: trunk/nv/engine/resource_system.hh
===================================================================
--- trunk/nv/engine/resource_system.hh	(revision 393)
+++ trunk/nv/engine/resource_system.hh	(revision 394)
@@ -17,5 +17,6 @@
 #include <nv/interface/context.hh>
 #include <nv/lua/lua_state.hh>
-#include <unordered_map>
+#include <nv/stl/unordered_map.hh>
+#include <nv/stl/vector.hh>
 
 namespace nv
@@ -42,5 +43,5 @@
 
 		lua::state* m_lua;
-		std::unordered_map< std::string, resource_id > m_names;
+		unordered_map< std::string, resource_id > m_names;
 	};
 
@@ -84,5 +85,5 @@
 		}
 
-		std::vector< T > m_data;
+		vector< T > m_data;
 	};
 
@@ -97,6 +98,6 @@
 		virtual ~resource_system();
 	protected:
-		std::vector< resource_manager_base* >     m_managers;
-		std::unordered_map< std::string, resource_id > m_manager_names;
+		vector< resource_manager_base* >     m_managers;
+		unordered_map< std::string, resource_id > m_manager_names;
 		lua::state* m_lua_state; 
 	};
Index: trunk/nv/gfx/texture_atlas.hh
===================================================================
--- trunk/nv/gfx/texture_atlas.hh	(revision 393)
+++ trunk/nv/gfx/texture_atlas.hh	(revision 394)
@@ -13,4 +13,5 @@
 #include <nv/stl/math.hh>
 #include <nv/gfx/image.hh>
+//#include <nv/stl/vector.hh>
 #include <vector>
 
Index: trunk/nv/gfx/texture_font.hh
===================================================================
--- trunk/nv/gfx/texture_font.hh	(revision 393)
+++ trunk/nv/gfx/texture_font.hh	(revision 394)
@@ -10,5 +10,5 @@
 #include <nv/core/common.hh>
 #include <nv/stl/string.hh>
-#include <unordered_map>
+#include <nv/stl/unordered_map.hh>
 #include <nv/stl/math.hh>
 #include <nv/gfx/texture_atlas.hh>
@@ -24,5 +24,5 @@
 		vec2   tl;      //!< Top-left of the glyph's bounding box.
 		vec2   br;      //!< Bottom-right of the glyph's bounding box.
-		std::unordered_map< uint16, float > kerning; //!< Kerning space between other characters.
+		unordered_map< uint16, float > kerning; //!< Kerning space between other characters.
 
 		/**
@@ -51,5 +51,5 @@
 			void generate_kerning();
 		private:
-			std::unordered_map< uint16, texture_glyph > m_glyphs; //!< Hash table of glyphs for this font.
+			unordered_map< uint16, texture_glyph > m_glyphs; //!< Hash table of glyphs for this font.
 
 			texture_atlas* m_atlas; //!< Atlas Image object for this font.
Index: trunk/nv/gui/gui_gfx_renderer.hh
===================================================================
--- trunk/nv/gui/gui_gfx_renderer.hh	(revision 393)
+++ trunk/nv/gui/gui_gfx_renderer.hh	(revision 394)
@@ -59,7 +59,7 @@
 			size_t load_image( const std::string& filename );
 
-			typedef std::unordered_map< std::string, size_t > names;
-			typedef std::vector< texture_font* >              font_vector;
-			typedef std::vector< image_info >                 image_vector;
+			typedef unordered_map< std::string, size_t > names;
+			typedef vector< texture_font* >              font_vector;
+			typedef vector< image_info >                 image_vector;
 
 			context*      m_context;
Index: trunk/nv/interface/font.hh
===================================================================
--- trunk/nv/interface/font.hh	(revision 393)
+++ trunk/nv/interface/font.hh	(revision 394)
@@ -9,6 +9,6 @@
 
 #include <nv/core/common.hh>
-#include <nv/core/math.hh>
-#include <unordered_map>
+#include <nv/stl/math.hh>
+#include <nv/stl/unordered_map.hh>
 
 namespace nv
@@ -22,5 +22,5 @@
 	    vec2 tl;
 	    vec2 br;
-		std::unordered_map< uint16, float > kerning;
+		unordered_map< uint16, float > kerning;
 
 		gylph();
@@ -33,6 +33,6 @@
 		const gylph* get_gylph( uint16 charcode ) const;
 	private:
-		std::unordered_map< uint16, gylph > m_gylphs;
-	}
+		unordered_map< uint16, gylph > m_gylphs;
+	};
 
 
Index: trunk/nv/stl/cstring_store.hh
===================================================================
--- trunk/nv/stl/cstring_store.hh	(revision 393)
+++ trunk/nv/stl/cstring_store.hh	(revision 394)
@@ -68,5 +68,5 @@
 		bool exists( const char* cstr )
 		{
-			return m_map.find( cstr ) != std::end( m_map );
+			return m_map.find( cstr ) != m_map.end();
 		}
 		
@@ -79,5 +79,5 @@
 		{
 			auto it = m_map.find( cstr );
-			if ( it != std::end( m_map ) )
+			if ( it != m_map.end() )
 			{
 				return it->second;
@@ -98,5 +98,5 @@
 		{
 			auto it = m_map.find( cstr );
-			if ( it == std::end( m_map ) )
+			if ( it == m_map.end() )
 			{
 				return push( cstr );