Index: trunk/src/gfx/keyframed_mesh.cc
===================================================================
--- trunk/src/gfx/keyframed_mesh.cc	(revision 365)
+++ trunk/src/gfx/keyframed_mesh.cc	(revision 367)
@@ -5,10 +5,6 @@
 #include "nv/gfx/keyframed_mesh.hh"
 
-#include <glm/gtc/matrix_access.hpp>
-#include <glm/gtx/matrix_interpolation.hpp>
 #include "nv/interface/context.hh"
 #include "nv/interface/device.hh"
-
-
 #include "nv/core/logging.hh"
 
Index: trunk/src/gfx/skeletal_mesh.cc
===================================================================
--- trunk/src/gfx/skeletal_mesh.cc	(revision 365)
+++ trunk/src/gfx/skeletal_mesh.cc	(revision 367)
@@ -5,9 +5,6 @@
 #include "nv/gfx/skeletal_mesh.hh"
 
-#include <glm/gtc/matrix_access.hpp>
-#include <glm/gtx/matrix_interpolation.hpp>
 #include "nv/interface/context.hh"
 #include "nv/interface/device.hh"
-
 
 nv::skeletal_mesh_cpu::skeletal_mesh_cpu( context* a_context, const mesh_data* a_mesh_data, const mesh_nodes_data* bones )
Index: trunk/src/gfx/texture_atlas.cc
===================================================================
--- trunk/src/gfx/texture_atlas.cc	(revision 365)
+++ trunk/src/gfx/texture_atlas.cc	(revision 367)
@@ -8,5 +8,4 @@
 
 #include "nv/core/logging.hh"
-#include <iostream>
 
 using namespace nv;
Index: trunk/src/gfx/texture_font.cc
===================================================================
--- trunk/src/gfx/texture_font.cc	(revision 365)
+++ trunk/src/gfx/texture_font.cc	(revision 367)
@@ -6,6 +6,4 @@
 #include "nv/gfx/texture_font.hh"
 
-#include <sstream>
-#include <stdexcept>
 #include "nv/lib/freetype2.hh"
 #include "nv/core/logging.hh"
@@ -126,8 +124,6 @@
 		if ( error )
 		{
-			std::stringstream error_msg;
-			error_msg << "FT_Error while loading glyphs, error: "
-				<< error << " code: " << c; 
-			NV_THROW( std::runtime_error, error_msg.str().c_str() );
+			NV_LOG_ERROR( "FT_Error while loading glyphs, error: ", error, " code: ", c );
+			NV_THROW( std::runtime_error, "FT_Error while loading glyphs" );
 		}
 
@@ -144,9 +140,6 @@
 		if ( r.pos.x < 0 ) 
 		{
-			std::stringstream error_msg;
-			error_msg << "Atlas full while loading glyphs, "
-				<< "r.pos.x: " << r.pos.x << " code: "
-				<< c; 
-			NV_THROW( std::runtime_error, error_msg.str().c_str() );
+			NV_LOG_ERROR( "Atlas full while loading glyphs, r.pos.x: ", r.pos.x, " code: ", c );
+			NV_THROW( std::runtime_error, "Atlas full while loading glyphs" );
 		}
 		if (depth == 4)