Move value type to main source directory.

13 files changed, 355 insertions, 356 deletions

diff --git a/libgupnp-dlna/Makefile.am b/libgupnp-dlna/Makefile.am
index 08c31e7..3331d74 100644
--- a/libgupnp-dlna/Makefile.am
+++ b/libgupnp-dlna/Makefile.am
@@ -120,7 +120,8 @@ libgupnp_dlna_2_0_la_SOURCES = \
 	gupnp-dlna-restriction.c \
 	gupnp-dlna-value-list.c \
 	gupnp-dlna-g-values.c \
-	gupnp-dlna-utils.c
+	gupnp-dlna-utils.c \
+	gupnp-dlna-value-type.c
 libgupnp_dlna_2_0_la_LIBADD = \
 	$(gupnp_libadd) \
 	libloader.la \
@@ -160,7 +161,8 @@ dist_noinst_HEADERS += \
 	gupnp-dlna-value-list-private.h \
 	gupnp-dlna-g-values-private.h \
 	gupnp-dlna-utils.h \
-	gupnp-dlna-value-union.h
+	gupnp-dlna-value-union.h \
+	gupnp-dlna-value-type.h
 
 
 # INTROSPECTION
diff --git a/libgupnp-dlna/gupnp-dlna-profile-loader.c b/libgupnp-dlna/gupnp-dlna-profile-loader.c
index 6ae9193..18da2df 100644
--- a/libgupnp-dlna/gupnp-dlna-profile-loader.c
+++ b/libgupnp-dlna/gupnp-dlna-profile-loader.c
@@ -31,7 +31,7 @@
 #include "gupnp-dlna-profile-private.h"
 #include "gupnp-dlna-utils.h"
 #include "gupnp-dlna-value-list-private.h"
-#include "gupnp-dlna-native-value-type.h"
+#include "gupnp-dlna-value-type.h"
 #include "gupnp-dlna-restriction-private.h"
 
 G_DEFINE_TYPE (GUPnPDLNAProfileLoader, gupnp_dlna_profile_loader, G_TYPE_OBJECT)
@@ -253,11 +253,11 @@ pre_field (GUPnPDLNAProfileLoader *loader)
         push_tag (loader, GUPNP_DLNA_PARSED_ELEMENT_FIELD);
 }
 
-static GUPnPDLNANativeValueType *
+static GUPnPDLNAValueType *
 value_type_from_string (const gchar *type)
 {
         if (!g_strcmp0 (type, "boolean"))
-                return gupnp_dlna_native_value_type_bool ();
+                return gupnp_dlna_value_type_bool ();
         else if (!g_strcmp0 (type, "float")) {
                 g_warning ("'float' data type is not yet supported.");
 
@@ -267,11 +267,11 @@ value_type_from_string (const gchar *type)
 
                 return NULL;
         } else if (!g_strcmp0 (type, "fraction"))
-                return gupnp_dlna_native_value_type_fraction ();
+                return gupnp_dlna_value_type_fraction ();
         else if (!g_strcmp0 (type, "int"))
-                return gupnp_dlna_native_value_type_int ();
+                return gupnp_dlna_value_type_int ();
         else if (!g_strcmp0 (type, "string"))
-                return gupnp_dlna_native_value_type_string ();
+                return gupnp_dlna_value_type_string ();
         g_critical ("Unknown value type: %s", type);
 
         return NULL;
@@ -315,7 +315,7 @@ post_field (GUPnPDLNAProfileLoader *loader,
         GUPnPDLNARestrictionData *restriction_data;
         GUPnPDLNANameValueListPair *pair;
         GUPnPDLNAValueList *value_list;
-        GUPnPDLNANativeValueType* value_type;
+        GUPnPDLNAValueType* value_type;
         GList *iter;
 
         pop_tag (loader);
diff --git a/libgupnp-dlna/gupnp-dlna-value-list-private.h b/libgupnp-dlna/gupnp-dlna-value-list-private.h
index 9832d89..bfc3ee1 100644
--- a/libgupnp-dlna/gupnp-dlna-value-list-private.h
+++ b/libgupnp-dlna/gupnp-dlna-value-list-private.h
@@ -26,12 +26,12 @@
 
 #include "gupnp-dlna-native-info-value.h"
 #include "gupnp-dlna-value-list.h"
-#include "gupnp-dlna-native-value-type.h"
+#include "gupnp-dlna-value-type.h"
 
 G_BEGIN_DECLS
 
 GUPnPDLNAValueList *
-gupnp_dlna_value_list_new (GUPnPDLNANativeValueType *type);
+gupnp_dlna_value_list_new (GUPnPDLNAValueType *type);
 
 void
 gupnp_dlna_value_list_free (GUPnPDLNAValueList *list);
diff --git a/libgupnp-dlna/gupnp-dlna-value-list.c b/libgupnp-dlna/gupnp-dlna-value-list.c
index 0482f69..b9791d0 100644
--- a/libgupnp-dlna/gupnp-dlna-value-list.c
+++ b/libgupnp-dlna/gupnp-dlna-value-list.c
@@ -24,7 +24,7 @@
 #include "gupnp-dlna-native-info-value.h"
 
 struct _GUPnPDLNAValueList {
-        GUPnPDLNANativeValueType *type;
+        GUPnPDLNAValueType *type;
         GList                    *values; /* <GUPnPDLNANativeValue *> */
         gboolean                  sorted;
 };
@@ -35,7 +35,7 @@ G_DEFINE_BOXED_TYPE (GUPnPDLNAValueList,
                      gupnp_dlna_value_list_free)
 
 GUPnPDLNAValueList *
-gupnp_dlna_value_list_new (GUPnPDLNANativeValueType *type)
+gupnp_dlna_value_list_new (GUPnPDLNAValueType *type)
 {
         GUPnPDLNAValueList *list;
 
@@ -51,7 +51,7 @@ gupnp_dlna_value_list_new (GUPnPDLNANativeValueType *type)
 
 static void
 free_value (GUPnPDLNANativeValue     *value,
-            GUPnPDLNANativeValueType *type)
+            GUPnPDLNAValueType *type)
 {
         gupnp_dlna_native_value_free (value, type);
 }
@@ -81,7 +81,7 @@ gupnp_dlna_value_list_free (GUPnPDLNAValueList *list)
 static gint
 value_compare (GUPnPDLNANativeValue     *a,
                GUPnPDLNANativeValue     *b,
-               GUPnPDLNANativeValueType *type)
+               GUPnPDLNAValueType *type)
 {
         return gupnp_dlna_native_value_compare (a, b, type);
 }
@@ -259,8 +259,7 @@ gupnp_dlna_value_list_to_string (GUPnPDLNAValueList *value_list)
         str = g_string_new (NULL);
         g_string_append_printf (str,
                                 "(%s)",
-                                gupnp_dlna_native_value_type_name
-                                        (value_list->type));
+                                gupnp_dlna_value_type_name (value_list->type));
         if (value_list->values->next != NULL) {
                 g_string_append (str, "{ ");
                 val_str = list_to_string (value_list);
diff --git a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value-type.c b/libgupnp-dlna/gupnp-dlna-value-type.c
index e1e9601..6055b11 100644
--- a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value-type.c
+++ b/libgupnp-dlna/gupnp-dlna-value-type.c
@@ -22,64 +22,64 @@
 #include <stdlib.h>
 
 #include "gupnp-dlna-g-values-private.h"
-#include "gupnp-dlna-native-value-type.h"
+#include "gupnp-dlna-value-type.h"
 
-struct _GUPnPDLNANativeValueType {
+struct _GUPnPDLNAValueType {
         gboolean
-        (* init) (GUPnPDLNANativeValueType  *type,
+        (* init) (GUPnPDLNAValueType  *type,
                   GUPnPDLNAValueUnion *value,
-                  const gchar               *raw);
+                  const gchar         *raw);
 
         gboolean
-        (* copy) (GUPnPDLNANativeValueType  *type,
+        (* copy) (GUPnPDLNAValueType  *type,
                   GUPnPDLNAValueUnion *from,
                   GUPnPDLNAValueUnion *to);
 
         void
-        (* clean) (GUPnPDLNANativeValueType  *type,
+        (* clean) (GUPnPDLNAValueType  *type,
                    GUPnPDLNAValueUnion *value_union);
 
         gboolean
-        (* is_equal) (GUPnPDLNANativeValueType  *type,
+        (* is_equal) (GUPnPDLNAValueType  *type,
                       GUPnPDLNAValueUnion *first,
                       GUPnPDLNAValueUnion *second);
 
         gboolean
-        (* is_in_range) (GUPnPDLNANativeValueType  *type,
+        (* is_in_range) (GUPnPDLNAValueType  *type,
                          GUPnPDLNAValueUnion *min,
                          GUPnPDLNAValueUnion *max,
                          GUPnPDLNAValueUnion *value);
 
         const gchar *
-        (* name) (GUPnPDLNANativeValueType *type);
+        (* name) (GUPnPDLNAValueType *type);
 
         gboolean
-        (* verify_range) (GUPnPDLNANativeValueType  *type,
+        (* verify_range) (GUPnPDLNAValueType  *type,
                           GUPnPDLNAValueUnion *min,
                           GUPnPDLNAValueUnion *max);
 
         gchar *
-        (* to_string) (GUPnPDLNANativeValueType  *type,
+        (* to_string) (GUPnPDLNAValueType  *type,
                        GUPnPDLNAValueUnion *value);
 
         gint
-        (* compare) (GUPnPDLNANativeValueType  *type,
+        (* compare) (GUPnPDLNAValueType  *type,
                      GUPnPDLNAValueUnion *a,
                      GUPnPDLNAValueUnion *b);
 
         GType
-        (* get_g_type) (GUPnPDLNANativeValueType  *type);
+        (* get_g_type) (GUPnPDLNAValueType  *type);
 
         void
-        (* to_g_value) (GUPnPDLNANativeValueType  *type,
+        (* to_g_value) (GUPnPDLNAValueType  *type,
                         GUPnPDLNAValueUnion *value,
-                        GValue                    *g_value);
+                        GValue              *g_value);
 
         gboolean
-        (* flatten) (GUPnPDLNANativeValueType *type,
-                     GValue                   *target,
-                     GValue                   *min,
-                     GValue                   *max);
+        (* flatten) (GUPnPDLNAValueType *type,
+                     GValue             *target,
+                     GValue             *min,
+                     GValue             *max);
 };
 
 /* utils */
@@ -176,9 +176,9 @@ fraction_range_valid (GUPnPDLNAFraction min,
 
 /* bool */
 static gboolean
-bool_init (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+bool_init (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
            GUPnPDLNAValueUnion *value,
-           const gchar               *raw)
+           const gchar         *raw)
 {
         if (!g_strcmp0 (raw, "true"))
                 value->bool_value = TRUE;
@@ -191,7 +191,7 @@ bool_init (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
 }
 
 static gboolean
-bool_copy (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+bool_copy (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
            GUPnPDLNAValueUnion *from,
            GUPnPDLNAValueUnion *to)
 {
@@ -201,14 +201,14 @@ bool_copy (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
 }
 
 static void
-bool_clean (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+bool_clean (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
             GUPnPDLNAValueUnion *value_union G_GNUC_UNUSED)
 {
 
 }
 
 static gboolean
-bool_is_equal (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+bool_is_equal (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
                GUPnPDLNAValueUnion *first,
                GUPnPDLNAValueUnion *second)
 {
@@ -216,7 +216,7 @@ bool_is_equal (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
 }
 
 static gboolean
-bool_is_in_range (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+bool_is_in_range (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
                   GUPnPDLNAValueUnion *min G_GNUC_UNUSED,
                   GUPnPDLNAValueUnion *max G_GNUC_UNUSED,
                   GUPnPDLNAValueUnion *value G_GNUC_UNUSED)
@@ -226,13 +226,13 @@ bool_is_in_range (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
 }
 
 static const gchar *
-bool_name (GUPnPDLNANativeValueType *type G_GNUC_UNUSED)
+bool_name (GUPnPDLNAValueType *type G_GNUC_UNUSED)
 {
         return "boolean";
 }
 
 static gboolean
-bool_verify_range (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+bool_verify_range (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
                    GUPnPDLNAValueUnion *min G_GNUC_UNUSED,
                    GUPnPDLNAValueUnion *max G_GNUC_UNUSED)
 {
@@ -240,14 +240,14 @@ bool_verify_range (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
 }
 
 static gchar *
-bool_to_string (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+bool_to_string (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
                 GUPnPDLNAValueUnion *value)
 {
         return g_strdup (value->bool_value ? "true" : "false");
 }
 
 static gint
-bool_compare (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+bool_compare (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
               GUPnPDLNAValueUnion *a,
               GUPnPDLNAValueUnion *b)
 {
@@ -261,29 +261,29 @@ bool_compare (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
 }
 
 static GType
-bool_get_g_type (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED)
+bool_get_g_type (GUPnPDLNAValueType *type G_GNUC_UNUSED)
 {
         return G_TYPE_BOOLEAN;
 }
 
 static void
-bool_to_g_value (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+bool_to_g_value (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
                  GUPnPDLNAValueUnion *value,
-                 GValue                    *g_value)
+                 GValue              *g_value)
 {
         g_value_set_boolean (g_value, value->bool_value);
 }
 
 static gboolean
-bool_flatten (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
-              GValue                    *target G_GNUC_UNUSED,
-              GValue                    *from G_GNUC_UNUSED,
-              GValue                    *to G_GNUC_UNUSED)
+bool_flatten (GUPnPDLNAValueType *type G_GNUC_UNUSED,
+              GValue             *target G_GNUC_UNUSED,
+              GValue             *from G_GNUC_UNUSED,
+              GValue             *to G_GNUC_UNUSED)
 {
         return FALSE;
 }
 
-static GUPnPDLNANativeValueType bool_type_impl = {
+static GUPnPDLNAValueType bool_type_impl = {
         bool_init,
         bool_copy,
         bool_clean,
@@ -300,9 +300,9 @@ static GUPnPDLNANativeValueType bool_type_impl = {
 
 /* fraction */
 static gboolean
-fraction_init (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+fraction_init (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
                GUPnPDLNAValueUnion *value,
-               const gchar               *raw)
+               const gchar         *raw)
 {
         gchar **tokens = g_strsplit (raw, "/", 2);
         gboolean result = FALSE;
@@ -329,7 +329,7 @@ fraction_init (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
 }
 
 static gboolean
-fraction_copy (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+fraction_copy (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
                GUPnPDLNAValueUnion *from,
                GUPnPDLNAValueUnion *to)
 {
@@ -339,14 +339,14 @@ fraction_copy (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
 }
 
 static void
-fraction_clean (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+fraction_clean (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
                 GUPnPDLNAValueUnion *value_union G_GNUC_UNUSED)
 {
 
 }
 
 static gboolean
-fraction_is_equal (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+fraction_is_equal (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
                    GUPnPDLNAValueUnion *first,
                    GUPnPDLNAValueUnion *second)
 {
@@ -355,7 +355,7 @@ fraction_is_equal (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
 }
 
 static gboolean
-fraction_is_in_range (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+fraction_is_in_range (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
                       GUPnPDLNAValueUnion *min,
                       GUPnPDLNAValueUnion *max,
                       GUPnPDLNAValueUnion *value)
@@ -367,13 +367,13 @@ fraction_is_in_range (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
 }
 
 static const gchar *
-fraction_name (GUPnPDLNANativeValueType *type G_GNUC_UNUSED)
+fraction_name (GUPnPDLNAValueType *type G_GNUC_UNUSED)
 {
         return "fraction";
 }
 
 static gboolean
-fraction_verify_range (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+fraction_verify_range (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
                        GUPnPDLNAValueUnion *min,
                        GUPnPDLNAValueUnion *max)
 {
@@ -381,7 +381,7 @@ fraction_verify_range (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
 }
 
 static gchar *
-fraction_to_string (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+fraction_to_string (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
                     GUPnPDLNAValueUnion *value)
 {
         return g_strdup_printf ("%d/%d",
@@ -390,7 +390,7 @@ fraction_to_string (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
 }
 
 static gint
-fraction_compare (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+fraction_compare (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
                   GUPnPDLNAValueUnion *a,
                   GUPnPDLNAValueUnion *b)
 {
@@ -398,24 +398,24 @@ fraction_compare (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
 }
 
 static GType
-fraction_get_g_type (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED)
+fraction_get_g_type (GUPnPDLNAValueType *type G_GNUC_UNUSED)
 {
         return GUPNP_TYPE_DLNA_FRACTION;
 }
 
 static void
-fraction_to_g_value (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+fraction_to_g_value (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
                      GUPnPDLNAValueUnion *value,
-                     GValue                    *g_value)
+                     GValue              *g_value)
 {
         g_value_set_boxed (g_value, &value->fraction_value);
 }
 
 static gboolean
-fraction_flatten (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
-                  GValue                    *target,
-                  GValue                    *from,
-                  GValue                    *to)
+fraction_flatten (GUPnPDLNAValueType *type G_GNUC_UNUSED,
+                  GValue             *target,
+                  GValue             *from,
+                  GValue             *to)
 {
         GUPnPDLNAFraction *fraction_min =
                                  GUPNP_DLNA_FRACTION (g_value_get_boxed (from));
@@ -430,7 +430,7 @@ fraction_flatten (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
         return TRUE;
 }
 
-static GUPnPDLNANativeValueType fraction_type_impl = {
+static GUPnPDLNAValueType fraction_type_impl = {
         fraction_init,
         fraction_copy,
         fraction_clean,
@@ -447,9 +447,9 @@ static GUPnPDLNANativeValueType fraction_type_impl = {
 
 /* int */
 static gboolean
-int_init (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+int_init (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
           GUPnPDLNAValueUnion *value,
-          const gchar               *raw)
+          const gchar         *raw)
 {
         gint num;
 
@@ -462,7 +462,7 @@ int_init (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
 }
 
 static gboolean
-int_copy (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+int_copy (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
           GUPnPDLNAValueUnion *from,
           GUPnPDLNAValueUnion *to)
 {
@@ -472,14 +472,14 @@ int_copy (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
 }
 
 static void
-int_clean (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+int_clean (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
            GUPnPDLNAValueUnion *value_union G_GNUC_UNUSED)
 {
 
 }
 
 static gboolean
-int_is_equal (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+int_is_equal (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
               GUPnPDLNAValueUnion *first,
               GUPnPDLNAValueUnion *second)
 {
@@ -487,7 +487,7 @@ int_is_equal (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
 }
 
 static gboolean
-int_is_in_range (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+int_is_in_range (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
                  GUPnPDLNAValueUnion *min,
                  GUPnPDLNAValueUnion *max,
                  GUPnPDLNAValueUnion *value)
@@ -497,13 +497,13 @@ int_is_in_range (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
 }
 
 static const gchar *
-int_name (GUPnPDLNANativeValueType *type G_GNUC_UNUSED)
+int_name (GUPnPDLNAValueType *type G_GNUC_UNUSED)
 {
         return "int";
 }
 
 static gboolean
-int_verify_range (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+int_verify_range (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
                   GUPnPDLNAValueUnion *min,
                   GUPnPDLNAValueUnion *max)
 {
@@ -511,14 +511,14 @@ int_verify_range (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
 }
 
 static gchar *
-int_to_string (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+int_to_string (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
                GUPnPDLNAValueUnion *value)
 {
         return g_strdup_printf ("%d", value->int_value);
 }
 
 static gint
-int_compare (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+int_compare (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
              GUPnPDLNAValueUnion *a,
              GUPnPDLNAValueUnion *b)
 {
@@ -526,24 +526,24 @@ int_compare (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
 }
 
 static GType
-int_get_g_type (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED)
+int_get_g_type (GUPnPDLNAValueType *type G_GNUC_UNUSED)
 {
         return G_TYPE_INT;
 }
 
 static void
-int_to_g_value (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+int_to_g_value (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
                 GUPnPDLNAValueUnion *value,
-                GValue                    *g_value)
+                GValue              *g_value)
 {
         g_value_set_int (g_value, value->int_value);
 }
 
 static gboolean
-int_flatten (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
-             GValue                    *target,
-             GValue                    *from,
-             GValue                    *to)
+int_flatten (GUPnPDLNAValueType *type G_GNUC_UNUSED,
+             GValue             *target,
+             GValue             *from,
+             GValue             *to)
 {
         g_value_init (target, GUPNP_TYPE_DLNA_INT_RANGE);
         g_value_take_boxed (target,
@@ -553,7 +553,7 @@ int_flatten (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
         return TRUE;
 }
 
-static GUPnPDLNANativeValueType int_type_impl = {
+static GUPnPDLNAValueType int_type_impl = {
         int_init,
         int_copy,
         int_clean,
@@ -570,9 +570,9 @@ static GUPnPDLNANativeValueType int_type_impl = {
 
 /* string */
 static gboolean
-string_init (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+string_init (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
              GUPnPDLNAValueUnion *value,
-             const gchar               *raw)
+             const gchar         *raw)
 {
         value->string_value = g_strdup (raw);
 
@@ -580,7 +580,7 @@ string_init (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
 }
 
 static gboolean
-string_copy (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+string_copy (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
              GUPnPDLNAValueUnion *from,
              GUPnPDLNAValueUnion *to)
 {
@@ -590,14 +590,14 @@ string_copy (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
 }
 
 static void
-string_clean (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+string_clean (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
               GUPnPDLNAValueUnion *value_union)
 {
         g_free (value_union->string_value);
 }
 
 static gboolean
-string_is_equal (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+string_is_equal (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
                  GUPnPDLNAValueUnion *first,
                  GUPnPDLNAValueUnion *second)
 {
@@ -605,7 +605,7 @@ string_is_equal (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
 }
 
 static gboolean
-string_is_in_range (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+string_is_in_range (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
                     GUPnPDLNAValueUnion *min,
                     GUPnPDLNAValueUnion *max,
                     GUPnPDLNAValueUnion *value)
@@ -618,13 +618,13 @@ string_is_in_range (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
 }
 
 static const gchar *
-string_name (GUPnPDLNANativeValueType *type G_GNUC_UNUSED)
+string_name (GUPnPDLNAValueType *type G_GNUC_UNUSED)
 {
         return "string";
 }
 
 static gboolean
-string_verify_range (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+string_verify_range (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
                      GUPnPDLNAValueUnion *min G_GNUC_UNUSED,
                      GUPnPDLNAValueUnion *max G_GNUC_UNUSED)
 {
@@ -632,14 +632,14 @@ string_verify_range (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
 }
 
 static gchar *
-string_to_string (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+string_to_string (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
                   GUPnPDLNAValueUnion *value)
 {
         return g_strdup (value->string_value);
 }
 
 static gint
-string_compare (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+string_compare (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
                 GUPnPDLNAValueUnion *a,
                 GUPnPDLNAValueUnion *b)
 {
@@ -647,29 +647,29 @@ string_compare (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
 }
 
 static GType
-string_get_g_type (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED)
+string_get_g_type (GUPnPDLNAValueType *type G_GNUC_UNUSED)
 {
         return G_TYPE_STRING;
 }
 
 static void
-string_to_g_value (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
+string_to_g_value (GUPnPDLNAValueType  *type G_GNUC_UNUSED,
                    GUPnPDLNAValueUnion *value,
-                   GValue                    *g_value)
+                   GValue              *g_value)
 {
         g_value_set_string (g_value, value->string_value);
 }
 
 static gboolean
-string_flatten (GUPnPDLNANativeValueType  *type G_GNUC_UNUSED,
-                GValue                    *target G_GNUC_UNUSED,
-                GValue                    *from G_GNUC_UNUSED,
-                GValue                    *to G_GNUC_UNUSED)
+string_flatten (GUPnPDLNAValueType *type G_GNUC_UNUSED,
+                GValue             *target G_GNUC_UNUSED,
+                GValue             *from G_GNUC_UNUSED,
+                GValue             *to G_GNUC_UNUSED)
 {
         return FALSE;
 }
 
-static GUPnPDLNANativeValueType string_type_impl = {
+static GUPnPDLNAValueType string_type_impl = {
         string_init,
         string_copy,
         string_clean,
@@ -684,34 +684,34 @@ static GUPnPDLNANativeValueType string_type_impl = {
         string_flatten
 };
 
-GUPnPDLNANativeValueType *
-gupnp_dlna_native_value_type_bool (void)
+GUPnPDLNAValueType *
+gupnp_dlna_value_type_bool (void)
 {
         return &bool_type_impl;
 }
 
-GUPnPDLNANativeValueType *
-gupnp_dlna_native_value_type_fraction (void)
+GUPnPDLNAValueType *
+gupnp_dlna_value_type_fraction (void)
 {
         return &fraction_type_impl;
 }
 
-GUPnPDLNANativeValueType *
-gupnp_dlna_native_value_type_int (void)
+GUPnPDLNAValueType *
+gupnp_dlna_value_type_int (void)
 {
         return &int_type_impl;
 }
 
-GUPnPDLNANativeValueType *
-gupnp_dlna_native_value_type_string (void)
+GUPnPDLNAValueType *
+gupnp_dlna_value_type_string (void)
 {
         return &string_type_impl;
 }
 
 gboolean
-gupnp_dlna_native_value_type_init (GUPnPDLNANativeValueType  *type,
-                                   GUPnPDLNAValueUnion *value,
-                                   const gchar               *raw)
+gupnp_dlna_value_type_init (GUPnPDLNAValueType  *type,
+                            GUPnPDLNAValueUnion *value,
+                            const gchar         *raw)
 {
         g_return_val_if_fail (type != NULL, FALSE);
         g_return_val_if_fail (value != NULL, FALSE);
@@ -722,9 +722,9 @@ gupnp_dlna_native_value_type_init (GUPnPDLNANativeValueType  *type,
 }
 
 gboolean
-gupnp_dlna_native_value_type_copy (GUPnPDLNANativeValueType  *type,
-                                   GUPnPDLNAValueUnion *from,
-                                   GUPnPDLNAValueUnion *to)
+gupnp_dlna_value_type_copy (GUPnPDLNAValueType  *type,
+                            GUPnPDLNAValueUnion *from,
+                            GUPnPDLNAValueUnion *to)
 {
         g_return_val_if_fail (type != NULL, FALSE);
         g_return_val_if_fail (from != NULL, FALSE);
@@ -735,8 +735,8 @@ gupnp_dlna_native_value_type_copy (GUPnPDLNANativeValueType  *type,
 }
 
 void
-gupnp_dlna_native_value_type_clean (GUPnPDLNANativeValueType  *type,
-                                    GUPnPDLNAValueUnion *value)
+gupnp_dlna_value_type_clean (GUPnPDLNAValueType  *type,
+                             GUPnPDLNAValueUnion *value)
 {
         g_return_if_fail (type != NULL);
         g_return_if_fail (value != NULL);
@@ -746,9 +746,9 @@ gupnp_dlna_native_value_type_clean (GUPnPDLNANativeValueType  *type,
 }
 
 gboolean
-gupnp_dlna_native_value_type_is_equal (GUPnPDLNANativeValueType  *type,
-                                       GUPnPDLNAValueUnion *first,
-                                       GUPnPDLNAValueUnion *second)
+gupnp_dlna_value_type_is_equal (GUPnPDLNAValueType  *type,
+                                GUPnPDLNAValueUnion *first,
+                                GUPnPDLNAValueUnion *second)
 {
         g_return_val_if_fail (type != NULL, FALSE);
         g_return_val_if_fail (first != NULL, FALSE);
@@ -759,10 +759,10 @@ gupnp_dlna_native_value_type_is_equal (GUPnPDLNANativeValueType  *type,
 }
 
 gboolean
-gupnp_dlna_native_value_type_is_in_range (GUPnPDLNANativeValueType  *type,
-                                          GUPnPDLNAValueUnion *min,
-                                          GUPnPDLNAValueUnion *max,
-                                          GUPnPDLNAValueUnion *value)
+gupnp_dlna_value_type_is_in_range (GUPnPDLNAValueType  *type,
+                                   GUPnPDLNAValueUnion *min,
+                                   GUPnPDLNAValueUnion *max,
+                                   GUPnPDLNAValueUnion *value)
 {
         g_return_val_if_fail (type != NULL, FALSE);
         g_return_val_if_fail (min != NULL, FALSE);
@@ -774,7 +774,7 @@ gupnp_dlna_native_value_type_is_in_range (GUPnPDLNANativeValueType  *type,
 }
 
 const gchar *
-gupnp_dlna_native_value_type_name (GUPnPDLNANativeValueType *type)
+gupnp_dlna_value_type_name (GUPnPDLNAValueType *type)
 {
         g_return_val_if_fail (type != NULL, NULL);
         g_return_val_if_fail (type->name != NULL, NULL);
@@ -783,9 +783,9 @@ gupnp_dlna_native_value_type_name (GUPnPDLNANativeValueType *type)
 }
 
 gboolean
-gupnp_dlna_native_value_type_verify_range (GUPnPDLNANativeValueType  *type,
-                                           GUPnPDLNAValueUnion *min,
-                                           GUPnPDLNAValueUnion *max)
+gupnp_dlna_value_type_verify_range (GUPnPDLNAValueType  *type,
+                                    GUPnPDLNAValueUnion *min,
+                                    GUPnPDLNAValueUnion *max)
 {
         g_return_val_if_fail (type != NULL, FALSE);
         g_return_val_if_fail (min != NULL, FALSE);
@@ -796,8 +796,8 @@ gupnp_dlna_native_value_type_verify_range (GUPnPDLNANativeValueType  *type,
 }
 
 gchar *
-gupnp_dlna_native_value_type_to_string (GUPnPDLNANativeValueType  *type,
-                                        GUPnPDLNAValueUnion *value)
+gupnp_dlna_value_type_to_string (GUPnPDLNAValueType  *type,
+                                 GUPnPDLNAValueUnion *value)
 {
         g_return_val_if_fail (type != NULL, NULL);
         g_return_val_if_fail (value != NULL, NULL);
@@ -807,9 +807,9 @@ gupnp_dlna_native_value_type_to_string (GUPnPDLNANativeValueType  *type,
 }
 
 gint
-gupnp_dlna_native_value_type_compare (GUPnPDLNANativeValueType  *type,
-                                      GUPnPDLNAValueUnion *a,
-                                      GUPnPDLNAValueUnion *b)
+gupnp_dlna_value_type_compare (GUPnPDLNAValueType  *type,
+                               GUPnPDLNAValueUnion *a,
+                               GUPnPDLNAValueUnion *b)
 {
         g_return_val_if_fail (type != NULL, 0);
         g_return_val_if_fail (a != NULL, 0);
@@ -820,9 +820,9 @@ gupnp_dlna_native_value_type_compare (GUPnPDLNANativeValueType  *type,
 }
 
 void
-gupnp_dlna_native_value_type_to_g_value (GUPnPDLNANativeValueType  *type,
-                                         GUPnPDLNAValueUnion *value,
-                                         GValue                    *g_value)
+gupnp_dlna_value_type_to_g_value (GUPnPDLNAValueType  *type,
+                                  GUPnPDLNAValueUnion *value,
+                                  GValue              *g_value)
 {
         g_return_if_fail (type != NULL);
         g_return_if_fail (value != NULL);
@@ -836,12 +836,12 @@ gupnp_dlna_native_value_type_to_g_value (GUPnPDLNANativeValueType  *type,
 }
 
 gboolean
-gupnp_dlna_native_value_type_flatten (GUPnPDLNANativeValueType *type,
-                                      GValue *target,
-                                      GValue *from,
-                                      GValue *to)
+gupnp_dlna_value_type_flatten (GUPnPDLNAValueType *type,
+                               GValue             *target,
+                               GValue             *from,
+                               GValue             *to)
 {
-        GType native_value_type_g_type;
+        GType value_type_g_type;
 
         g_return_val_if_fail (type != NULL, FALSE);
         g_return_val_if_fail (target != NULL, FALSE);
@@ -851,11 +851,11 @@ gupnp_dlna_native_value_type_flatten (GUPnPDLNANativeValueType *type,
         g_return_val_if_fail (type->get_g_type != NULL, FALSE);
         g_return_val_if_fail (G_IS_VALUE (target) == FALSE, FALSE);
 
-        native_value_type_g_type = type->get_g_type (type);
+        value_type_g_type = type->get_g_type (type);
 
-        g_return_val_if_fail (G_VALUE_HOLDS (from, native_value_type_g_type),
+        g_return_val_if_fail (G_VALUE_HOLDS (from, value_type_g_type),
                               FALSE);
-        g_return_val_if_fail (G_VALUE_HOLDS (to, native_value_type_g_type),
+        g_return_val_if_fail (G_VALUE_HOLDS (to, value_type_g_type),
                               FALSE);
 
         return type->flatten (type, target, from, to);
diff --git a/libgupnp-dlna/gupnp-dlna-value-type.h b/libgupnp-dlna/gupnp-dlna-value-type.h
new file mode 100644
index 0000000..ac580e9
--- /dev/null
+++ b/libgupnp-dlna/gupnp-dlna-value-type.h
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2012, 2013 Intel Corporation.
+ *
+ * Authors: Krzesimir Nowak <krnowak@openismus.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __GUPNP_DLNA_VALUE_TYPE_H__
+#define __GUPNP_DLNA_VALUE_TYPE_H__
+
+#include <glib.h>
+#include <glib-object.h>
+
+#include "gupnp-dlna-value-union.h"
+
+G_BEGIN_DECLS
+
+typedef struct _GUPnPDLNAValueType GUPnPDLNAValueType;
+
+GUPnPDLNAValueType *
+gupnp_dlna_value_type_bool (void);
+
+GUPnPDLNAValueType *
+gupnp_dlna_value_type_fraction (void);
+
+GUPnPDLNAValueType *
+gupnp_dlna_value_type_int (void);
+
+GUPnPDLNAValueType *
+gupnp_dlna_value_type_string (void);
+
+gboolean
+gupnp_dlna_value_type_init (GUPnPDLNAValueType  *type,
+                            GUPnPDLNAValueUnion *value,
+                            const gchar         *raw);
+
+gboolean
+gupnp_dlna_value_type_copy (GUPnPDLNAValueType  *type,
+                            GUPnPDLNAValueUnion *from,
+                            GUPnPDLNAValueUnion *to);
+
+void
+gupnp_dlna_value_type_clean (GUPnPDLNAValueType  *type,
+                             GUPnPDLNAValueUnion *value_union);
+
+gboolean
+gupnp_dlna_value_type_is_equal (GUPnPDLNAValueType  *type,
+                                GUPnPDLNAValueUnion *first,
+                                GUPnPDLNAValueUnion *second);
+
+gboolean
+gupnp_dlna_value_type_is_in_range (GUPnPDLNAValueType  *type,
+                                   GUPnPDLNAValueUnion *min,
+                                   GUPnPDLNAValueUnion *max,
+                                   GUPnPDLNAValueUnion *value);
+
+const gchar *
+gupnp_dlna_value_type_name (GUPnPDLNAValueType *type);
+
+gboolean
+gupnp_dlna_value_type_verify_range (GUPnPDLNAValueType  *type,
+                                    GUPnPDLNAValueUnion *min,
+                                    GUPnPDLNAValueUnion *max);
+
+gchar *
+gupnp_dlna_value_type_to_string (GUPnPDLNAValueType  *type,
+                                 GUPnPDLNAValueUnion *value);
+
+gint
+gupnp_dlna_value_type_compare (GUPnPDLNAValueType  *type,
+                               GUPnPDLNAValueUnion *a,
+                               GUPnPDLNAValueUnion *b);
+
+void
+gupnp_dlna_value_type_to_g_value (GUPnPDLNAValueType  *type,
+                                  GUPnPDLNAValueUnion *value,
+                                  GValue              *g_value);
+
+gboolean
+gupnp_dlna_value_type_flatten (GUPnPDLNAValueType *type,
+                               GValue             *target,
+                               GValue             *from,
+                               GValue             *to);
+
+G_END_DECLS
+
+#endif /* __GUPNP_DLNA_VALUE_TYPE_H__ */
diff --git a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-info-value.c b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-info-value.c
index 4a2037b..bf87ccf 100644
--- a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-info-value.c
+++ b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-info-value.c
@@ -25,20 +25,20 @@
 
 /* private */
 struct _GUPnPDLNANativeInfoValue {
-        GUPnPDLNANativeValueType  *type;
+        GUPnPDLNAValueType  *type;
         GUPnPDLNAValueUnion  value;
         gboolean unsupported;
 };
 
 static GUPnPDLNANativeInfoValue *
-value_new (GUPnPDLNANativeValueType *type,
+value_new (GUPnPDLNAValueType *type,
            gchar *raw)
 {
         GUPnPDLNANativeInfoValue *info_value =
                                         g_slice_new (GUPnPDLNANativeInfoValue);
 
         info_value->type = type;
-        if (!gupnp_dlna_native_value_type_init (type,
+        if (!gupnp_dlna_value_type_init (type,
                                                 &info_value->value,
                                                 raw)) {
                 g_slice_free (GUPnPDLNANativeInfoValue, info_value);
@@ -52,7 +52,7 @@ value_new (GUPnPDLNANativeValueType *type,
 }
 
 static GUPnPDLNANativeInfoValue *
-value_unsupported (GUPnPDLNANativeValueType *type)
+value_unsupported (GUPnPDLNAValueType *type)
 {
         GUPnPDLNANativeInfoValue *info_value =
                                         g_slice_new (GUPnPDLNANativeInfoValue);
@@ -67,21 +67,21 @@ value_unsupported (GUPnPDLNANativeValueType *type)
 GUPnPDLNANativeInfoValue *
 gupnp_dlna_native_info_value_new_bool (gboolean value)
 {
-        return value_new (gupnp_dlna_native_value_type_bool (),
+        return value_new (gupnp_dlna_value_type_bool (),
                           g_strdup (value ? "true" : "false"));
 }
 
 GUPnPDLNANativeInfoValue *
 gupnp_dlna_native_info_value_new_unsupported_bool (void)
 {
-        return value_unsupported (gupnp_dlna_native_value_type_bool ());
+        return value_unsupported (gupnp_dlna_value_type_bool ());
 }
 
 GUPnPDLNANativeInfoValue *
 gupnp_dlna_native_info_value_new_fraction (gint numerator,
                                            gint denominator)
 {
-        return value_new (gupnp_dlna_native_value_type_fraction (),
+        return value_new (gupnp_dlna_value_type_fraction (),
                           g_strdup_printf ("%d/%d",
                                            numerator,
                                            denominator));
@@ -90,33 +90,33 @@ gupnp_dlna_native_info_value_new_fraction (gint numerator,
 GUPnPDLNANativeInfoValue *
 gupnp_dlna_native_info_value_new_unsupported_fraction (void)
 {
-        return value_unsupported (gupnp_dlna_native_value_type_fraction ());
+        return value_unsupported (gupnp_dlna_value_type_fraction ());
 }
 
 GUPnPDLNANativeInfoValue *
 gupnp_dlna_native_info_value_new_int (gint value)
 {
-        return value_new (gupnp_dlna_native_value_type_int (),
+        return value_new (gupnp_dlna_value_type_int (),
                           g_strdup_printf ("%d", value));
 }
 
 GUPnPDLNANativeInfoValue *
 gupnp_dlna_native_info_value_new_unsupported_int (void)
 {
-        return value_unsupported (gupnp_dlna_native_value_type_int ());
+        return value_unsupported (gupnp_dlna_value_type_int ());
 }
 
 GUPnPDLNANativeInfoValue *
 gupnp_dlna_native_info_value_new_string (const gchar *value)
 {
-        return value_new (gupnp_dlna_native_value_type_string (),
+        return value_new (gupnp_dlna_value_type_string (),
                           g_strdup (value));
 }
 
 GUPnPDLNANativeInfoValue *
 gupnp_dlna_native_info_value_new_unsupported_string (void)
 {
-        return value_unsupported (gupnp_dlna_native_value_type_string ());
+        return value_unsupported (gupnp_dlna_value_type_string ());
 }
 
 void
@@ -126,12 +126,12 @@ gupnp_dlna_native_info_value_free (GUPnPDLNANativeInfoValue *info_value)
                 return;
 
         if (!info_value->unsupported)
-                gupnp_dlna_native_value_type_clean (info_value->type,
+                gupnp_dlna_value_type_clean (info_value->type,
                                                     &info_value->value);
         g_slice_free (GUPnPDLNANativeInfoValue, info_value);
 }
 
-GUPnPDLNANativeValueType *
+GUPnPDLNAValueType *
 gupnp_dlna_native_info_value_get_type (GUPnPDLNANativeInfoValue *info)
 {
         g_return_val_if_fail (info != NULL, NULL);
@@ -159,11 +159,11 @@ gupnp_dlna_native_info_value_to_string (GUPnPDLNANativeInfoValue *info)
 
         g_return_val_if_fail (info != NULL, NULL);
 
-        type = gupnp_dlna_native_value_type_name (info->type);
+        type = gupnp_dlna_value_type_name (info->type);
         if (info->unsupported)
                 raw = g_strdup ("<UNSUPPORTED>");
         else
-                raw = gupnp_dlna_native_value_type_to_string (info->type,
+                raw = gupnp_dlna_value_type_to_string (info->type,
                                                               &info->value);
         str = g_strdup_printf ("(%s)%s", type, raw);
         g_free (raw);
diff --git a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-info-value.h b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-info-value.h
index a07fb7a..938147c 100644
--- a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-info-value.h
+++ b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-info-value.h
@@ -24,7 +24,7 @@
 
 #include <glib.h>
 
-#include "gupnp-dlna-native-value-type.h"
+#include "gupnp-dlna-value-type.h"
 #include "gupnp-dlna-value-union.h"
 
 G_BEGIN_DECLS
@@ -65,7 +65,7 @@ gupnp_dlna_native_info_value_to_string (GUPnPDLNANativeInfoValue *info_value);
 gboolean
 gupnp_dlna_native_info_value_is_unsupported (GUPnPDLNANativeInfoValue *info);
 
-GUPnPDLNANativeValueType *
+GUPnPDLNAValueType *
 gupnp_dlna_native_info_value_get_type (GUPnPDLNANativeInfoValue *info);
 
 GUPnPDLNAValueUnion *
diff --git a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value-type.h b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value-type.h
deleted file mode 100644
index 3bef5cb..0000000
--- a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value-type.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2012, 2013 Intel Corporation.
- *
- * Authors: Krzesimir Nowak <krnowak@openismus.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __GUPNP_DLNA_NATIVE_VALUE_TYPE_H__
-#define __GUPNP_DLNA_NATIVE_VALUE_TYPE_H__
-
-#include <glib.h>
-#include <glib-object.h>
-
-#include "gupnp-dlna-value-union.h"
-
-G_BEGIN_DECLS
-
-typedef struct _GUPnPDLNANativeValueType GUPnPDLNANativeValueType;
-
-GUPnPDLNANativeValueType *
-gupnp_dlna_native_value_type_bool (void);
-
-GUPnPDLNANativeValueType *
-gupnp_dlna_native_value_type_fraction (void);
-
-GUPnPDLNANativeValueType *
-gupnp_dlna_native_value_type_int (void);
-
-GUPnPDLNANativeValueType *
-gupnp_dlna_native_value_type_string (void);
-
-gboolean
-gupnp_dlna_native_value_type_init (GUPnPDLNANativeValueType  *type,
-                                   GUPnPDLNAValueUnion *value,
-                                   const gchar               *raw);
-
-gboolean
-gupnp_dlna_native_value_type_copy (GUPnPDLNANativeValueType  *type,
-                                   GUPnPDLNAValueUnion *from,
-                                   GUPnPDLNAValueUnion *to);
-
-void
-gupnp_dlna_native_value_type_clean (GUPnPDLNANativeValueType  *type,
-                                    GUPnPDLNAValueUnion *value_union);
-
-gboolean
-gupnp_dlna_native_value_type_is_equal (GUPnPDLNANativeValueType  *type,
-                                       GUPnPDLNAValueUnion *first,
-                                       GUPnPDLNAValueUnion *second);
-
-gboolean
-gupnp_dlna_native_value_type_is_in_range (GUPnPDLNANativeValueType  *type,
-                                          GUPnPDLNAValueUnion *min,
-                                          GUPnPDLNAValueUnion *max,
-                                          GUPnPDLNAValueUnion *value);
-
-const gchar *
-gupnp_dlna_native_value_type_name (GUPnPDLNANativeValueType *type);
-
-gboolean
-gupnp_dlna_native_value_type_verify_range (GUPnPDLNANativeValueType  *type,
-                                           GUPnPDLNAValueUnion *min,
-                                           GUPnPDLNAValueUnion *max);
-
-gchar *
-gupnp_dlna_native_value_type_to_string (GUPnPDLNANativeValueType  *type,
-                                        GUPnPDLNAValueUnion *value);
-
-gint
-gupnp_dlna_native_value_type_compare (GUPnPDLNANativeValueType  *type,
-                                      GUPnPDLNAValueUnion *a,
-                                      GUPnPDLNAValueUnion *b);
-
-void
-gupnp_dlna_native_value_type_to_g_value (GUPnPDLNANativeValueType  *type,
-                                         GUPnPDLNAValueUnion *value,
-                                         GValue                    *g_value);
-
-gboolean
-gupnp_dlna_native_value_type_flatten (GUPnPDLNANativeValueType *type,
-                                      GValue *target,
-                                      GValue *from,
-                                      GValue *to);
-
-G_END_DECLS
-
-#endif /* __GUPNP_DLNA_NATIVE_VALUE_TYPE_H__ */
diff --git a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value.c b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value.c
index 96cff18..c1862b8 100644
--- a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value.c
+++ b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value.c
@@ -29,22 +29,22 @@ struct _GUPnPDLNANativeValueVTable {
 
         GUPnPDLNANativeValue *
         (* copy) (GUPnPDLNANativeValue     *base,
-                  GUPnPDLNANativeValueType *type);
+                  GUPnPDLNAValueType *type);
 
         void
         (* free) (GUPnPDLNANativeValue     *base,
-                  GUPnPDLNANativeValueType *type);
+                  GUPnPDLNAValueType *type);
 
         gchar *
         (* to_string) (GUPnPDLNANativeValue     *base,
-                       GUPnPDLNANativeValueType *type);
+                       GUPnPDLNAValueType *type);
 
         GUPnPDLNAValueUnion *
         (* get_sort_value) (GUPnPDLNANativeValue *base);
 
         gboolean
         (* to_g_value) (GUPnPDLNANativeValue     *base,
-                        GUPnPDLNANativeValueType *type,
+                        GUPnPDLNAValueType *type,
                         GValue                   *g_value);
 };
 
@@ -62,22 +62,22 @@ single_is_superset (GUPnPDLNANativeValue     *base,
 
 static GUPnPDLNANativeValue *
 single_copy (GUPnPDLNANativeValue     *base,
-             GUPnPDLNANativeValueType *type);
+             GUPnPDLNAValueType *type);
 
 static void
 single_free (GUPnPDLNANativeValue     *base,
-             GUPnPDLNANativeValueType *type);
+             GUPnPDLNAValueType *type);
 
 static gchar *
 single_to_string (GUPnPDLNANativeValue     *base,
-                  GUPnPDLNANativeValueType *type);
+                  GUPnPDLNAValueType *type);
 
 static GUPnPDLNAValueUnion *
 single_get_sort_value (GUPnPDLNANativeValue *base);
 
 static gboolean
 single_to_g_value (GUPnPDLNANativeValue     *base,
-                   GUPnPDLNANativeValueType *type,
+                   GUPnPDLNAValueType *type,
                    GValue                   *g_value);
 
 static GUPnPDLNANativeValueVTable single_vtable = {
@@ -94,26 +94,26 @@ single_is_superset (GUPnPDLNANativeValue     *base,
                     GUPnPDLNANativeInfoValue *info)
 {
         GUPnPDLNANativeValueSingle *value = (GUPnPDLNANativeValueSingle *) base;
-        GUPnPDLNANativeValueType *info_type =
+        GUPnPDLNAValueType *info_type =
                                    gupnp_dlna_native_info_value_get_type (info);
         GUPnPDLNAValueUnion *info_value =
                                   gupnp_dlna_native_info_value_get_value (info);
 
-        return gupnp_dlna_native_value_type_is_equal (info_type,
+        return gupnp_dlna_value_type_is_equal (info_type,
                                                       &value->value,
                                                       info_value);
 }
 
 static GUPnPDLNANativeValue *
 single_copy (GUPnPDLNANativeValue     *base,
-             GUPnPDLNANativeValueType *type)
+             GUPnPDLNAValueType *type)
 {
         GUPnPDLNANativeValueSingle *value = (GUPnPDLNANativeValueSingle *) base;
         GUPnPDLNANativeValueSingle *dup =
                                        g_slice_new (GUPnPDLNANativeValueSingle);
 
         dup->base.vtable = &single_vtable;
-        if (!gupnp_dlna_native_value_type_copy (type,
+        if (!gupnp_dlna_value_type_copy (type,
                                                 &value->value,
                                                 &dup->value)) {
                 g_slice_free (GUPnPDLNANativeValueSingle, dup);
@@ -125,21 +125,21 @@ single_copy (GUPnPDLNANativeValue     *base,
 
 static void
 single_free (GUPnPDLNANativeValue     *base,
-             GUPnPDLNANativeValueType *type)
+             GUPnPDLNAValueType *type)
 {
         GUPnPDLNANativeValueSingle *value = (GUPnPDLNANativeValueSingle *) base;
 
-        gupnp_dlna_native_value_type_clean (type, &value->value);
+        gupnp_dlna_value_type_clean (type, &value->value);
         g_slice_free (GUPnPDLNANativeValueSingle, value);
 }
 
 static gchar *
 single_to_string (GUPnPDLNANativeValue     *base,
-                  GUPnPDLNANativeValueType *type)
+                  GUPnPDLNAValueType *type)
 {
         GUPnPDLNANativeValueSingle *value = (GUPnPDLNANativeValueSingle *) base;
 
-        return gupnp_dlna_native_value_type_to_string (type,
+        return gupnp_dlna_value_type_to_string (type,
                                                        &value->value);
 }
 
@@ -153,12 +153,12 @@ single_get_sort_value (GUPnPDLNANativeValue *base)
 
 static gboolean
 single_to_g_value (GUPnPDLNANativeValue     *base,
-                   GUPnPDLNANativeValueType *type,
+                   GUPnPDLNAValueType *type,
                    GValue                   *g_value)
 {
         GUPnPDLNANativeValueSingle *value = (GUPnPDLNANativeValueSingle *) base;
 
-        gupnp_dlna_native_value_type_to_g_value (type, &value->value, g_value);
+        gupnp_dlna_value_type_to_g_value (type, &value->value, g_value);
 
         return TRUE;
 }
@@ -178,22 +178,22 @@ range_is_superset (GUPnPDLNANativeValue     *base,
 
 static GUPnPDLNANativeValue *
 range_copy (GUPnPDLNANativeValue     *base,
-            GUPnPDLNANativeValueType *type);
+            GUPnPDLNAValueType *type);
 
 static void
 range_free (GUPnPDLNANativeValue     *base,
-            GUPnPDLNANativeValueType *type);
+            GUPnPDLNAValueType *type);
 
 static gchar *
 range_to_string (GUPnPDLNANativeValue     *base,
-                 GUPnPDLNANativeValueType *type);
+                 GUPnPDLNAValueType *type);
 
 static GUPnPDLNAValueUnion *
 range_get_sort_value (GUPnPDLNANativeValue *base);
 
 static gboolean
 range_to_g_value (GUPnPDLNANativeValue     *base,
-                  GUPnPDLNANativeValueType *type,
+                  GUPnPDLNAValueType *type,
                   GValue                   *g_value);
 
 static GUPnPDLNANativeValueVTable range_vtable = {
@@ -210,12 +210,12 @@ range_is_superset (GUPnPDLNANativeValue     *base,
                    GUPnPDLNANativeInfoValue *info)
 {
         GUPnPDLNANativeValueRange *range = (GUPnPDLNANativeValueRange *) base;
-        GUPnPDLNANativeValueType *info_type =
+        GUPnPDLNAValueType *info_type =
                                    gupnp_dlna_native_info_value_get_type (info);
         GUPnPDLNAValueUnion *info_value =
                                   gupnp_dlna_native_info_value_get_value (info);
 
-        return gupnp_dlna_native_value_type_is_in_range (info_type,
+        return gupnp_dlna_value_type_is_in_range (info_type,
                                                          &range->min,
                                                          &range->max,
                                                          info_value);
@@ -223,24 +223,24 @@ range_is_superset (GUPnPDLNANativeValue     *base,
 
 static GUPnPDLNANativeValue *
 range_copy (GUPnPDLNANativeValue     *base,
-            GUPnPDLNANativeValueType *type)
+            GUPnPDLNAValueType *type)
 {
         GUPnPDLNANativeValueRange *range = (GUPnPDLNANativeValueRange *) base;
         GUPnPDLNANativeValueRange *dup =
                                         g_slice_new (GUPnPDLNANativeValueRange);
 
         dup->base.vtable = &range_vtable;
-        if (!gupnp_dlna_native_value_type_copy (type,
+        if (!gupnp_dlna_value_type_copy (type,
                                                 &range->min,
                                                 &dup->min)) {
                 g_slice_free (GUPnPDLNANativeValueRange, dup);
                 dup = NULL;
         }
         if (dup &&
-            !gupnp_dlna_native_value_type_copy (type,
+            !gupnp_dlna_value_type_copy (type,
                                                 &range->max,
                                                 &dup->max)) {
-                gupnp_dlna_native_value_type_clean (type,
+                gupnp_dlna_value_type_clean (type,
                                                     &dup->min);
                 g_slice_free (GUPnPDLNANativeValueRange, dup);
                 dup = NULL;
@@ -251,24 +251,24 @@ range_copy (GUPnPDLNANativeValue     *base,
 
 static void
 range_free (GUPnPDLNANativeValue     *base,
-            GUPnPDLNANativeValueType *type)
+            GUPnPDLNAValueType *type)
 {
         GUPnPDLNANativeValueRange *range = (GUPnPDLNANativeValueRange *) base;
 
-        gupnp_dlna_native_value_type_clean (type, &range->min);
-        gupnp_dlna_native_value_type_clean (type, &range->max);
+        gupnp_dlna_value_type_clean (type, &range->min);
+        gupnp_dlna_value_type_clean (type, &range->max);
         g_slice_free (GUPnPDLNANativeValueRange, range);
 }
 
 static gchar *
 range_to_string (GUPnPDLNANativeValue     *base,
-                 GUPnPDLNANativeValueType *type)
+                 GUPnPDLNAValueType *type)
 {
         GUPnPDLNANativeValueRange *range = (GUPnPDLNANativeValueRange *) base;
         gchar *str;
-        gchar *min = gupnp_dlna_native_value_type_to_string (type,
+        gchar *min = gupnp_dlna_value_type_to_string (type,
                                                              &range->min);
-        gchar *max = gupnp_dlna_native_value_type_to_string (type,
+        gchar *max = gupnp_dlna_value_type_to_string (type,
                                                              &range->max);
 
         str = g_strdup_printf ("[ %s, %s ]", min, max);
@@ -288,7 +288,7 @@ range_get_sort_value (GUPnPDLNANativeValue *base)
 
 static gboolean
 range_to_g_value (GUPnPDLNANativeValue     *base,
-                  GUPnPDLNANativeValueType *type,
+                  GUPnPDLNAValueType *type,
                   GValue                   *g_value)
 {
         GValue from = G_VALUE_INIT;
@@ -296,9 +296,9 @@ range_to_g_value (GUPnPDLNANativeValue     *base,
         GUPnPDLNANativeValueRange *range = (GUPnPDLNANativeValueRange *) base;
         gboolean result;
 
-        gupnp_dlna_native_value_type_to_g_value (type, &range->min, &from);
-        gupnp_dlna_native_value_type_to_g_value (type, &range->max, &to);
-        result = gupnp_dlna_native_value_type_flatten (type,
+        gupnp_dlna_value_type_to_g_value (type, &range->min, &from);
+        gupnp_dlna_value_type_to_g_value (type, &range->max, &to);
+        result = gupnp_dlna_value_type_flatten (type,
                                                        g_value,
                                                        &from,
                                                        &to);
@@ -311,7 +311,7 @@ range_to_g_value (GUPnPDLNANativeValue     *base,
 /* API */
 
 GUPnPDLNANativeValue *
-gupnp_dlna_native_value_new_single (GUPnPDLNANativeValueType *type,
+gupnp_dlna_native_value_new_single (GUPnPDLNAValueType *type,
                                     const gchar              *raw)
 {
         GUPnPDLNANativeValueSingle *value;
@@ -321,7 +321,7 @@ gupnp_dlna_native_value_new_single (GUPnPDLNANativeValueType *type,
 
         value = g_slice_new (GUPnPDLNANativeValueSingle);
         value->base.vtable = &single_vtable;
-        if (!gupnp_dlna_native_value_type_init (type, &value->value, raw)) {
+        if (!gupnp_dlna_value_type_init (type, &value->value, raw)) {
                 g_slice_free (GUPnPDLNANativeValueSingle, value);
                 value = NULL;
         }
@@ -330,7 +330,7 @@ gupnp_dlna_native_value_new_single (GUPnPDLNANativeValueType *type,
 }
 
 GUPnPDLNANativeValue *
-gupnp_dlna_native_value_new_ranged (GUPnPDLNANativeValueType *type,
+gupnp_dlna_native_value_new_ranged (GUPnPDLNAValueType *type,
                                     const gchar              *min,
                                     const gchar              *max)
 {
@@ -342,22 +342,22 @@ gupnp_dlna_native_value_new_ranged (GUPnPDLNANativeValueType *type,
 
         range = g_slice_new (GUPnPDLNANativeValueRange);
         range->base.vtable = &range_vtable;
-        if (!gupnp_dlna_native_value_type_init (type, &range->min, min)) {
+        if (!gupnp_dlna_value_type_init (type, &range->min, min)) {
                 g_slice_free (GUPnPDLNANativeValueRange, range);
                 range = NULL;
         }
         if (range &&
-            !gupnp_dlna_native_value_type_init (type, &range->max, max)) {
-                gupnp_dlna_native_value_type_clean (type, &range->min);
+            !gupnp_dlna_value_type_init (type, &range->max, max)) {
+                gupnp_dlna_value_type_clean (type, &range->min);
                 g_slice_free (GUPnPDLNANativeValueRange, range);
                 range = NULL;
         }
         if (range &&
-            !gupnp_dlna_native_value_type_verify_range (type,
+            !gupnp_dlna_value_type_verify_range (type,
                                                         &range->min,
                                                         &range->max)) {
-                gupnp_dlna_native_value_type_clean (type, &range->min);
-                gupnp_dlna_native_value_type_clean (type, &range->max);
+                gupnp_dlna_value_type_clean (type, &range->min);
+                gupnp_dlna_value_type_clean (type, &range->max);
                 g_slice_free (GUPnPDLNANativeValueRange, range);
                 range = NULL;
         }
@@ -379,7 +379,7 @@ gupnp_dlna_native_value_is_superset (GUPnPDLNANativeValue     *base,
 
 GUPnPDLNANativeValue *
 gupnp_dlna_native_value_copy (GUPnPDLNANativeValue     *base,
-                              GUPnPDLNANativeValueType *type)
+                              GUPnPDLNAValueType *type)
 {
         g_return_val_if_fail (base != NULL, NULL);
         g_return_val_if_fail (type != NULL, NULL);
@@ -391,7 +391,7 @@ gupnp_dlna_native_value_copy (GUPnPDLNANativeValue     *base,
 
 void
 gupnp_dlna_native_value_free (GUPnPDLNANativeValue     *base,
-                              GUPnPDLNANativeValueType *type)
+                              GUPnPDLNAValueType *type)
 {
         if (base == NULL)
                 return;
@@ -405,7 +405,7 @@ gupnp_dlna_native_value_free (GUPnPDLNANativeValue     *base,
 
 gchar *
 gupnp_dlna_native_value_to_string (GUPnPDLNANativeValue     *base,
-                                   GUPnPDLNANativeValueType *type)
+                                   GUPnPDLNAValueType *type)
 {
         g_return_val_if_fail (base != NULL, NULL);
         g_return_val_if_fail (type != NULL, NULL);
@@ -427,7 +427,7 @@ gupnp_dlna_native_value_get_sort_value (GUPnPDLNANativeValue *base)
 gint
 gupnp_dlna_native_value_compare (GUPnPDLNANativeValue     *base,
                                  GUPnPDLNANativeValue     *other,
-                                 GUPnPDLNANativeValueType *type)
+                                 GUPnPDLNAValueType *type)
 {
         GUPnPDLNAValueUnion *base_union;
         GUPnPDLNAValueUnion *other_union;
@@ -439,7 +439,7 @@ gupnp_dlna_native_value_compare (GUPnPDLNANativeValue     *base,
         base_union = gupnp_dlna_native_value_get_sort_value (base);
         other_union = gupnp_dlna_native_value_get_sort_value (other);
 
-        return gupnp_dlna_native_value_type_compare (type,
+        return gupnp_dlna_value_type_compare (type,
                                                      base_union,
                                                      other_union);
 
@@ -447,7 +447,7 @@ gupnp_dlna_native_value_compare (GUPnPDLNANativeValue     *base,
 
 GValue *
 gupnp_dlna_native_value_to_g_value (GUPnPDLNANativeValue     *base,
-                                    GUPnPDLNANativeValueType *type)
+                                    GUPnPDLNAValueType *type)
 {
         GValue *g_value;
 
diff --git a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value.h b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value.h
index d049508..708160c 100644
--- a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value.h
+++ b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value.h
@@ -26,7 +26,7 @@
 #include <glib-object.h>
 
 #include "gupnp-dlna-native-info-value.h"
-#include "gupnp-dlna-native-value-type.h"
+#include "gupnp-dlna-value-type.h"
 
 G_BEGIN_DECLS
 
@@ -38,11 +38,11 @@ struct _GUPnPDLNANativeValue {
 };
 
 GUPnPDLNANativeValue *
-gupnp_dlna_native_value_new_single (GUPnPDLNANativeValueType *type,
+gupnp_dlna_native_value_new_single (GUPnPDLNAValueType *type,
                                     const gchar              *single);
 
 GUPnPDLNANativeValue *
-gupnp_dlna_native_value_new_ranged (GUPnPDLNANativeValueType *type,
+gupnp_dlna_native_value_new_ranged (GUPnPDLNAValueType *type,
                                     const gchar              *min,
                                     const gchar              *max);
 
@@ -52,24 +52,24 @@ gupnp_dlna_native_value_is_superset (GUPnPDLNANativeValue     *base,
 
 GUPnPDLNANativeValue *
 gupnp_dlna_native_value_copy (GUPnPDLNANativeValue     *base,
-                              GUPnPDLNANativeValueType *type);
+                              GUPnPDLNAValueType *type);
 
 void
 gupnp_dlna_native_value_free (GUPnPDLNANativeValue     *base,
-                              GUPnPDLNANativeValueType *type);
+                              GUPnPDLNAValueType *type);
 
 gchar *
 gupnp_dlna_native_value_to_string (GUPnPDLNANativeValue     *base,
-                                   GUPnPDLNANativeValueType *type);
+                                   GUPnPDLNAValueType *type);
 
 gint
 gupnp_dlna_native_value_compare (GUPnPDLNANativeValue     *base,
                                  GUPnPDLNANativeValue     *other,
-                                 GUPnPDLNANativeValueType *type);
+                                 GUPnPDLNAValueType *type);
 
 GValue *
 gupnp_dlna_native_value_to_g_value (GUPnPDLNANativeValue     *base,
-                                    GUPnPDLNANativeValueType *type);
+                                    GUPnPDLNAValueType *type);
 
 G_END_DECLS
 
diff --git a/libgupnp-dlna/profile-backends/native/sets/sets.am b/libgupnp-dlna/profile-backends/native/sets/sets.am
index 33229c5..e1de012 100644
--- a/libgupnp-dlna/profile-backends/native/sets/sets.am
+++ b/libgupnp-dlna/profile-backends/native/sets/sets.am
@@ -4,6 +4,4 @@ sets_sources = \
 	profile-backends/native/sets/gupnp-dlna-native-info-value.c \
 	profile-backends/native/sets/gupnp-dlna-native-info-value.h \
 	profile-backends/native/sets/gupnp-dlna-native-value.c \
-	profile-backends/native/sets/gupnp-dlna-native-value.h \
-	profile-backends/native/sets/gupnp-dlna-native-value-type.c \
-	profile-backends/native/sets/gupnp-dlna-native-value-type.h
+	profile-backends/native/sets/gupnp-dlna-native-value.h
diff --git a/tests/sets.c b/tests/sets.c
index 378da41..9d2f7f4 100644
--- a/tests/sets.c
+++ b/tests/sets.c
@@ -21,7 +21,7 @@
 
 #include <glib.h>
 
-#include "gupnp-dlna-native-value-type.h"
+#include "gupnp-dlna-value-type.h"
 #include "gupnp-dlna-value-list-private.h"
 #include "gupnp-dlna-restriction-private.h"
 #include "gupnp-dlna-native-info-set.h"
@@ -29,10 +29,10 @@
 static void
 value_type_not_null (void)
 {
-        g_assert (gupnp_dlna_native_value_type_bool () != NULL);
-        g_assert (gupnp_dlna_native_value_type_fraction () != NULL);
-        g_assert (gupnp_dlna_native_value_type_int () != NULL);
-        g_assert (gupnp_dlna_native_value_type_string () != NULL);
+        g_assert (gupnp_dlna_value_type_bool () != NULL);
+        g_assert (gupnp_dlna_value_type_fraction () != NULL);
+        g_assert (gupnp_dlna_value_type_int () != NULL);
+        g_assert (gupnp_dlna_value_type_string () != NULL);
 }
 
 static void
@@ -43,7 +43,7 @@ value_list_single (void)
 
         /* bool */
         list = gupnp_dlna_value_list_new
-                                     (gupnp_dlna_native_value_type_bool ());
+                                     (gupnp_dlna_value_type_bool ());
         g_assert (list != NULL);
         result = gupnp_dlna_value_list_add_single (list, "true");
         g_assert (result == TRUE);
@@ -55,7 +55,7 @@ value_list_single (void)
 
         /* fraction */
         list = gupnp_dlna_value_list_new
-                                 (gupnp_dlna_native_value_type_fraction ());
+                                 (gupnp_dlna_value_type_fraction ());
         g_assert (list != NULL);
         result = gupnp_dlna_value_list_add_single (list, "1/2");
         g_assert (result == TRUE);
@@ -73,7 +73,7 @@ value_list_single (void)
 
         /* int */
         list = gupnp_dlna_value_list_new
-                                      (gupnp_dlna_native_value_type_int ());
+                                      (gupnp_dlna_value_type_int ());
         g_assert (list != NULL);
         result = gupnp_dlna_value_list_add_single (list, "1");
         g_assert (result == TRUE);
@@ -87,7 +87,7 @@ value_list_single (void)
 
         /* string */
         list = gupnp_dlna_value_list_new
-                                   (gupnp_dlna_native_value_type_string ());
+                                   (gupnp_dlna_value_type_string ());
         g_assert (list != NULL);
         result = gupnp_dlna_value_list_add_single (list, "1");
         g_assert (result == TRUE);
@@ -108,7 +108,7 @@ value_list_range (void)
 
         /* bool ranges have no sense. */
         list = gupnp_dlna_value_list_new
-                                     (gupnp_dlna_native_value_type_bool ());
+                                     (gupnp_dlna_value_type_bool ());
         g_assert (list != NULL);
         result = gupnp_dlna_value_list_add_range (list, "true", "true");
         g_assert (result == FALSE);
@@ -128,7 +128,7 @@ value_list_range (void)
 
         /* fraction */
         list = gupnp_dlna_value_list_new
-                                 (gupnp_dlna_native_value_type_fraction ());
+                                 (gupnp_dlna_value_type_fraction ());
         g_assert (list != NULL);
         result = gupnp_dlna_value_list_add_range (list, "1/2", "3/4");
         g_assert (result == TRUE);
@@ -150,7 +150,7 @@ value_list_range (void)
 
         /* int */
         list = gupnp_dlna_value_list_new
-                                      (gupnp_dlna_native_value_type_int ());
+                                      (gupnp_dlna_value_type_int ());
         g_assert (list != NULL);
         result = gupnp_dlna_value_list_add_range (list, "1", "3");
         g_assert (result == TRUE);
@@ -166,7 +166,7 @@ value_list_range (void)
 
         /* string ranges have no sense */
         list = gupnp_dlna_value_list_new
-                                   (gupnp_dlna_native_value_type_string ());
+                                   (gupnp_dlna_value_type_string ());
         g_assert (list != NULL);
         result = gupnp_dlna_value_list_add_range (list, "1", "3");
         g_assert (result == FALSE);
@@ -203,7 +203,7 @@ restriction_empty (void)
         GUPnPDLNARestriction *r =
                                        gupnp_dlna_restriction_new (NULL);
         GUPnPDLNAValueList *list = gupnp_dlna_value_list_new
-                                         (gupnp_dlna_native_value_type_bool ());
+                                         (gupnp_dlna_value_type_bool ());
 
         g_assert (gupnp_dlna_restriction_is_empty (r));
         gupnp_dlna_value_list_add_single (list, "true");
@@ -223,7 +223,7 @@ restriction_adding_value_lists (void)
         GUPnPDLNARestriction *r =
                                        gupnp_dlna_restriction_new (NULL);
         GUPnPDLNAValueList *list = gupnp_dlna_value_list_new
-                                         (gupnp_dlna_native_value_type_bool ());
+                                         (gupnp_dlna_value_type_bool ());
 
         g_assert (gupnp_dlna_restriction_is_empty (r));
         /* adding empty value list should fail */
@@ -237,7 +237,7 @@ restriction_adding_value_lists (void)
                                                                 list));
         g_assert (!gupnp_dlna_restriction_is_empty (r));
         list = gupnp_dlna_value_list_new
-                                         (gupnp_dlna_native_value_type_bool ());
+                                         (gupnp_dlna_value_type_bool ());
         gupnp_dlna_value_list_add_single (list, "false");
         /* adding value list with already existing name should fail */
         g_assert (!gupnp_dlna_restriction_add_value_list (r,
@@ -284,30 +284,30 @@ info_set_fit (void)
         GUPnPDLNARestriction *r =
                                      gupnp_dlna_restriction_new ("mime");
         GUPnPDLNAValueList *v = gupnp_dlna_value_list_new
-                                          (gupnp_dlna_native_value_type_bool());
+                                          (gupnp_dlna_value_type_bool());
         GUPnPDLNANativeInfoSet *s;
 
         /* restriction */
         g_assert (gupnp_dlna_value_list_add_single (v, "true"));
         g_assert (gupnp_dlna_restriction_add_value_list (r, "b1", v));
         v = gupnp_dlna_value_list_new
-                                      (gupnp_dlna_native_value_type_fraction());
+                                      (gupnp_dlna_value_type_fraction());
         g_assert (gupnp_dlna_value_list_add_single (v, "1/2"));
         g_assert (gupnp_dlna_restriction_add_value_list (r, "f1", v));
         v = gupnp_dlna_value_list_new
-                                      (gupnp_dlna_native_value_type_fraction());
+                                      (gupnp_dlna_value_type_fraction());
         g_assert (gupnp_dlna_value_list_add_range (v, "1/4", "2/3"));
         g_assert (gupnp_dlna_restriction_add_value_list (r, "f2", v));
         v = gupnp_dlna_value_list_new
-                                           (gupnp_dlna_native_value_type_int());
+                                           (gupnp_dlna_value_type_int());
         g_assert (gupnp_dlna_value_list_add_single (v, "13"));
         g_assert (gupnp_dlna_restriction_add_value_list (r, "i1", v));
         v = gupnp_dlna_value_list_new
-                                           (gupnp_dlna_native_value_type_int());
+                                           (gupnp_dlna_value_type_int());
         g_assert (gupnp_dlna_value_list_add_range (v, "42", "55"));
         g_assert (gupnp_dlna_restriction_add_value_list (r, "i2", v));
         v = gupnp_dlna_value_list_new
-                                        (gupnp_dlna_native_value_type_string());
+                                        (gupnp_dlna_value_type_string());
         g_assert (gupnp_dlna_value_list_add_single (v, "aaa"));
         g_assert (gupnp_dlna_restriction_add_value_list (r, "s1", v));