Index: trunk/nv/types.hh
===================================================================
--- trunk/nv/types.hh	(revision 81)
+++ trunk/nv/types.hh	(revision 82)
@@ -16,4 +16,5 @@
 #include <vector>
 #include <string>
+#include <cstddef>
 
 namespace nv
@@ -230,9 +231,9 @@
     struct type_entry
     {
-		 // Function types for the constructor and destructor of registered types
-	    typedef void (*constructor_func)(void*);
-	    typedef void (*destructor_func)(void*);
-
-		// Parent type database
+        // Function types for the constructor and destructor of registered types
+        typedef void (*constructor_func)(void*);
+        typedef void (*destructor_func)(void*);
+
+        // Parent type database
         class type_database* type_db;
 
@@ -247,22 +248,22 @@
         size_t size;
 
-		// Base type
-		type_entry* base_type;
-
-		// Field list
-		std::vector<type_field> field_list;
-
-		// Enum list
-		std::vector<type_enum> enum_list;
-
-		template <int TYPE>
-		type_entry& base()
-		{
-			base_type = type_db->get_type( typeid(TYPE) );
-		}
-
-		template <int SIZE>
-		type_entry& fields( type_field (&init_fields)[SIZE] )
-		{
+        // Base type
+        type_entry* base_type;
+
+        // Field list
+        std::vector<type_field> field_list;
+
+        // Enum list
+        std::vector<type_enum> enum_list;
+
+        template <int TYPE>
+        type_entry& base()
+        {
+            base_type = type_db->get_type( typeid(TYPE) );
+        }
+
+        template <int SIZE>
+        type_entry& fields( type_field (&init_fields)[SIZE] )
+	{
 			for (int i = 0; i < SIZE; i++)
 			{
@@ -323,5 +324,5 @@
 		}
 
-		type_entry* get_type( const type_info& t )
+		type_entry* get_type( const std::type_info& t )
 		{
 			type_info_map::iterator it = m_idx_types.find( std::type_index(t) );
@@ -334,5 +335,5 @@
     private:
 		struct compare_type_info {
-			bool operator ()(const type_info* a, const type_info* b) const {
+			bool operator ()(const std::type_info* a, const std::type_info* b) const {
 				return a->before(*b);
 			}