Index: /trunk/nv/gfx/texture_font.hh
===================================================================
--- /trunk/nv/gfx/texture_font.hh	(revision 94)
+++ /trunk/nv/gfx/texture_font.hh	(revision 95)
@@ -8,7 +8,6 @@
 #define NV_GL_TEXTURE_FONT_HH
 
+#include <nv/common.hh>
 #include <string>
-
-#include <nv/common.hh>
 #include <nv/gfx/texture_atlas.hh>
 #include <glm/glm.hpp>
Index: /trunk/nv/interface/image_data.hh
===================================================================
--- /trunk/nv/interface/image_data.hh	(revision 94)
+++ /trunk/nv/interface/image_data.hh	(revision 95)
@@ -14,6 +14,6 @@
 #define NV_IMAGE_DATA_HH
 
+#include <nv/common.hh>
 #include <algorithm>
-#include <nv/common.hh>
 #include <glm/glm.hpp>
 
Index: /trunk/nv/logger.hh
===================================================================
--- /trunk/nv/logger.hh	(revision 94)
+++ /trunk/nv/logger.hh	(revision 95)
@@ -64,5 +64,5 @@
 		explicit logger( int llevel )
 		{
-			level = llevel;
+			m_level = llevel;
 		}
 
Index: /trunk/nv/logging.hh
===================================================================
--- /trunk/nv/logging.hh	(revision 94)
+++ /trunk/nv/logging.hh	(revision 95)
@@ -39,13 +39,13 @@
 		unsigned int get_level()
 		{
-			return level;
+			return m_level;
 		};
 		void set_level( unsigned int level )
 		{
-			level = level;
+			m_level = level;
 		};
 		virtual void log( log_level level, const std::string& message ) = 0;
 	protected:
-		unsigned int level;
+		unsigned int m_level;
 	};
 
Index: /trunk/src/gfx/texture_font.cc
===================================================================
--- /trunk/src/gfx/texture_font.cc	(revision 94)
+++ /trunk/src/gfx/texture_font.cc	(revision 95)
@@ -4,8 +4,8 @@
 // This file is part of NV Libraries.
 // For conditions of distribution and use, see copyright notice in nv.hh
+#include "nv/gfx/texture_font.hh"
+
 #include <sstream>
 #include <stdexcept>
-
-#include "nv/gfx/texture_font.hh"
 #include "nv/lib/freetype2.hh"