diff --git a/sample/valtest/Makefile.am b/sample/valtest/Makefile.am
index d113a1e13..fb43fea85 100644
--- a/sample/valtest/Makefile.am
+++ b/sample/valtest/Makefile.am
@@ -17,14 +17,13 @@ libvalobj_la_LIBADD = $(GTK_LIBS)
 
 INCLUDES = $(GTK_CFLAGS)
 
-Valobj.cs: valobj-api.xml
+Valobj.cs:
 	$(RUNTIME) ../../generator/gapi_codegen.exe --generate valobj-api.xml --include ../../gtk/gtk-api.xml ../../gdk/gdk-api.xml --outdir=. --assembly-name=valobj-sharp
 
-valobj-api.xml: valobj.c valobj.h valobj-sources.xml ../../parser/gapi-parser.exe
+api:
 	PATH=../../parser:$PATH $(RUNTIME) ../../parser/gapi-parser.exe valobj-sources.xml
 
 install:
 
 CLEANFILES =		\
-	valobj-api.xml	\
 	Valobj.cs
diff --git a/sample/valtest/valobj-api.xml b/sample/valtest/valobj-api.xml
new file mode 100644
index 000000000..35ba3d578
--- /dev/null
+++ b/sample/valtest/valobj-api.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0"?>
+<api>
+  <!--
+
+        This file was automatically generated.
+        Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
+
+-->
+  <namespace name="Gtksharp" library="libvalobj.dll">
+    <object name="Valobj" cname="GtksharpValobj" parent="GObject">
+      <field name="TheBoolean" cname="the_boolean" type="gboolean" />
+      <field name="TheInt" cname="the_int" type="int" />
+      <field name="TheUint" cname="the_uint" type="guint" />
+      <field name="TheInt64" cname="the_int64" type="gint64" />
+      <field name="TheUint64" cname="the_uint64" type="guint64" />
+      <field name="TheUnichar" cname="the_unichar" type="gunichar" />
+      <field name="TheEnum" cname="the_enum" type="GtkArrowType" />
+      <field name="TheFlags" cname="the_flags" type="GtkAttachOptions" />
+      <field name="TheFloat" cname="the_float" type="float" />
+      <field name="TheDouble" cname="the_double" type="double" />
+      <field name="TheString" cname="the_string" type="char*" />
+      <field name="TheRect" cname="the_rect" type="GdkRectangle" />
+      <field name="ThePointer" cname="the_pointer" type="gpointer" />
+      <field name="TheObject" cname="the_object" type="GtkWidget*" />
+      <property name="BooleanProp" cname="boolean_prop" type="gboolean" readable="true" writeable="true" construct="true" />
+      <property name="IntProp" cname="int_prop" type="gint" readable="true" writeable="true" construct="true" />
+      <property name="UintProp" cname="uint_prop" type="guint" readable="true" writeable="true" construct="true" />
+      <property name="Int64Prop" cname="int64_prop" type="gint64" readable="true" writeable="true" construct="true" />
+      <property name="Uint64Prop" cname="uint64_prop" type="guint64" readable="true" writeable="true" construct="true" />
+      <property name="UnicharProp" cname="unichar_prop" type="gunichar" readable="true" writeable="true" construct="true" />
+      <property name="EnumProp" cname="enum_prop" type="GtkArrowType" readable="true" writeable="true" construct="true" />
+      <property name="FlagsProp" cname="flags_prop" type="GtkAttachOptions" readable="true" writeable="true" construct="true" />
+      <property name="FloatProp" cname="float_prop" type="gfloat" readable="true" writeable="true" construct="true" />
+      <property name="DoubleProp" cname="double_prop" type="gdouble" readable="true" writeable="true" construct="true" />
+      <property name="StringProp" cname="string_prop" type="gchar*" readable="true" writeable="true" construct="true" />
+      <property name="BoxedProp" cname="boxed_prop" type="GdkRectangle" readable="true" writeable="true" />
+      <property name="PointerProp" cname="pointer_prop" type="gpointer" readable="true" writeable="true" />
+      <property name="ObjectProp" cname="object_prop" type="GtkWidget" readable="true" writeable="true" />
+      <method name="GetBoolean" cname="gtksharp_valobj_get_boolean">
+        <return-type type="gboolean" />
+      </method>
+      <method name="GetBoxed" cname="gtksharp_valobj_get_boxed">
+        <return-type type="GdkRectangle*" />
+      </method>
+      <method name="GetDouble" cname="gtksharp_valobj_get_double">
+        <return-type type="double" />
+      </method>
+      <method name="GetEnum" cname="gtksharp_valobj_get_enum">
+        <return-type type="GtkArrowType" />
+      </method>
+      <method name="GetFlags" cname="gtksharp_valobj_get_flags">
+        <return-type type="GtkAttachOptions" />
+      </method>
+      <method name="GetFloat" cname="gtksharp_valobj_get_float">
+        <return-type type="float" />
+      </method>
+      <method name="GetInt" cname="gtksharp_valobj_get_int">
+        <return-type type="int" />
+      </method>
+      <method name="GetInt64" cname="gtksharp_valobj_get_int64">
+        <return-type type="gint64" />
+      </method>
+      <method name="GetObject" cname="gtksharp_valobj_get_object">
+        <return-type type="GtkWidget*" />
+      </method>
+      <method name="GetPointer" cname="gtksharp_valobj_get_pointer">
+        <return-type type="gpointer" />
+      </method>
+      <method name="GetString" cname="gtksharp_valobj_get_string">
+        <return-type type="char*" />
+      </method>
+      <method name="GetType" cname="gtksharp_valobj_get_type" shared="true">
+        <return-type type="GType" />
+      </method>
+      <method name="GetUint" cname="gtksharp_valobj_get_uint">
+        <return-type type="guint" />
+      </method>
+      <method name="GetUint64" cname="gtksharp_valobj_get_uint64">
+        <return-type type="guint64" />
+      </method>
+      <method name="GetUnichar" cname="gtksharp_valobj_get_unichar">
+        <return-type type="gunichar" />
+      </method>
+      <constructor cname="gtksharp_valobj_new" />
+      <method name="SetBoolean" cname="gtksharp_valobj_set_boolean">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="gboolean" name="val" />
+        </parameters>
+      </method>
+      <method name="SetBoxed" cname="gtksharp_valobj_set_boxed">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GdkRectangle*" name="val" />
+        </parameters>
+      </method>
+      <method name="SetDouble" cname="gtksharp_valobj_set_double">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="double" name="val" />
+        </parameters>
+      </method>
+      <method name="SetEnum" cname="gtksharp_valobj_set_enum">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkArrowType" name="val" />
+        </parameters>
+      </method>
+      <method name="SetFlags" cname="gtksharp_valobj_set_flags">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkAttachOptions" name="val" />
+        </parameters>
+      </method>
+      <method name="SetFloat" cname="gtksharp_valobj_set_float">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="float" name="val" />
+        </parameters>
+      </method>
+      <method name="SetInt" cname="gtksharp_valobj_set_int">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="int" name="val" />
+        </parameters>
+      </method>
+      <method name="SetInt64" cname="gtksharp_valobj_set_int64">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="gint64" name="val" />
+        </parameters>
+      </method>
+      <method name="SetObject" cname="gtksharp_valobj_set_object">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkWidget*" name="val" />
+        </parameters>
+      </method>
+      <method name="SetPointer" cname="gtksharp_valobj_set_pointer">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="gpointer" name="val" />
+        </parameters>
+      </method>
+      <method name="SetString" cname="gtksharp_valobj_set_string">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="const-char*" name="val" />
+        </parameters>
+      </method>
+      <method name="SetUint" cname="gtksharp_valobj_set_uint">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="guint" name="val" />
+        </parameters>
+      </method>
+      <method name="SetUint64" cname="gtksharp_valobj_set_uint64">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="guint64" name="val" />
+        </parameters>
+      </method>
+      <method name="SetUnichar" cname="gtksharp_valobj_set_unichar">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="gunichar" name="val" />
+        </parameters>
+      </method>
+    </object>
+  </namespace>
+</api>
\ No newline at end of file