diff --git a/ges/Makefile.am b/ges/Makefile.am
index a98678ce6f..0ee9ca9982 100644
--- a/ges/Makefile.am
+++ b/ges/Makefile.am
@@ -1,10 +1,8 @@
-built_header_make = gesmarshal.h
-built_source_make = gesmarshal.c
+built_header_make =
+built_source_make =
 
 lib_LTLIBRARIES = libges-@GST_MAJORMINOR@.la
 
-EXTRA_libges_@GST_MAJORMINOR@_la_SOURCES = gesmarshal.list 
-
 CLEANFILES = $(BUILT_SOURCES) $(built_header_make) $(built_source_make)
 
 libges_@GST_MAJORMINOR@_la_SOURCES = 		\
@@ -107,15 +105,6 @@ BUILT_SOURCES =			\
 	$(built_header_make)	\
 	$(built_source_make)
 
-gesmarshal.h: gesmarshal.list
-	glib-genmarshal --header --prefix=ges_marshal $^ > gesmarshal.h.tmp
-	mv gesmarshal.h.tmp gesmarshal.h
-
-gesmarshal.c: gesmarshal.list
-	echo "#include \"glib-object.h\"" >gesmarshal.c.tmp
-	echo "#include \"gesmarshal.h\"" >> gesmarshal.c.tmp
-	glib-genmarshal --body --prefix=ges_marshal $^ >> gesmarshal.c.tmp
-	mv gesmarshal.c.tmp gesmarshal.c
 include $(top_srcdir)/common/gst-glib-gen.mak
 
 if HAVE_INTROSPECTION
diff --git a/ges/ges-formatter.c b/ges/ges-formatter.c
index 0daa653a3a..7860d53bab 100644
--- a/ges/ges-formatter.c
+++ b/ges/ges-formatter.c
@@ -46,7 +46,6 @@
 #include <gst/gst.h>
 #include <stdlib.h>
 
-#include "gesmarshal.h"
 #include "ges-formatter.h"
 #include "ges-keyfile-formatter.h"
 #include "ges-internal.h"
@@ -102,7 +101,7 @@ ges_formatter_class_init (GESFormatterClass * klass)
    */
   ges_formatter_signals[SOURCE_MOVED_SIGNAL] =
       g_signal_new ("source-moved", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL, ges_marshal_VOID__OBJECT, G_TYPE_NONE,
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE,
       1, GES_TYPE_TIMELINE_FILE_SOURCE);
 
   /**
@@ -111,7 +110,7 @@ ges_formatter_class_init (GESFormatterClass * klass)
    */
   ges_formatter_signals[LOADED_SIGNAL] =
       g_signal_new ("loaded", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL, ges_marshal_VOID__OBJECT, G_TYPE_NONE,
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE,
       1, GES_TYPE_TIMELINE);
 
   object_class->dispose = ges_formatter_dispose;
diff --git a/ges/ges-simple-timeline-layer.c b/ges/ges-simple-timeline-layer.c
index 6a38170ae6..884c6b5345 100644
--- a/ges/ges-simple-timeline-layer.c
+++ b/ges/ges-simple-timeline-layer.c
@@ -35,7 +35,6 @@
 
 #include <ges/ges.h>
 #include "ges-internal.h"
-#include "gesmarshal.h"
 
 static void
 ges_simple_timeline_layer_object_removed (GESTimelineLayer * layer,
@@ -145,8 +144,7 @@ ges_simple_timeline_layer_class_init (GESSimpleTimelineLayerClass * klass)
       g_signal_new ("object-moved", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GESSimpleTimelineLayerClass,
           object_moved),
-      NULL, NULL,
-      ges_marshal_VOID__OBJECT_INT_INT, G_TYPE_NONE, 3,
+      NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 3,
       GES_TYPE_TIMELINE_OBJECT, G_TYPE_INT, G_TYPE_INT);
 }
 
diff --git a/ges/ges-timeline-layer.c b/ges/ges-timeline-layer.c
index 1f4d063f73..130e0f43ea 100644
--- a/ges/ges-timeline-layer.c
+++ b/ges/ges-timeline-layer.c
@@ -30,7 +30,6 @@
  */
 
 #include "ges-internal.h"
-#include "gesmarshal.h"
 #include "ges-timeline-layer.h"
 #include "ges.h"
 #include "ges-timeline-source.h"
@@ -187,7 +186,7 @@ ges_timeline_layer_class_init (GESTimelineLayerClass * klass)
   ges_timeline_layer_signals[OBJECT_ADDED] =
       g_signal_new ("object-added", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GESTimelineLayerClass, object_added),
-      NULL, NULL, ges_marshal_VOID__OBJECT, G_TYPE_NONE, 1,
+      NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1,
       GES_TYPE_TIMELINE_OBJECT);
 
   /**
@@ -200,8 +199,8 @@ ges_timeline_layer_class_init (GESTimelineLayerClass * klass)
   ges_timeline_layer_signals[OBJECT_REMOVED] =
       g_signal_new ("object-removed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GESTimelineLayerClass,
-          object_removed), NULL, NULL, ges_marshal_VOID__OBJECT, G_TYPE_NONE, 1,
-      GES_TYPE_TIMELINE_OBJECT);
+          object_removed), NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE,
+      1, GES_TYPE_TIMELINE_OBJECT);
 }
 
 static void
diff --git a/ges/ges-timeline-object.c b/ges/ges-timeline-object.c
index 154ecdf5ec..e500c09665 100644
--- a/ges/ges-timeline-object.c
+++ b/ges/ges-timeline-object.c
@@ -31,9 +31,10 @@
 
 #include "ges-timeline-object.h"
 #include "ges.h"
-#include "gesmarshal.h"
 #include "ges-internal.h"
 
+#include <string.h>
+
 gboolean
 ges_timeline_object_fill_track_object_func (GESTimelineObject * object,
     GESTrackObject * trackobj, GstElement * gnlobj);
@@ -327,7 +328,7 @@ ges_timeline_object_class_init (GESTimelineObjectClass * klass)
    */
   ges_timeline_object_signals[EFFECT_ADDED] =
       g_signal_new ("effect-added", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_FIRST, 0, NULL, NULL, ges_marshal_VOID__OBJECT,
+      G_SIGNAL_RUN_FIRST, 0, NULL, NULL, g_cclosure_marshal_generic,
       G_TYPE_NONE, 1, GES_TYPE_TRACK_EFFECT);
 
   /**
@@ -341,7 +342,7 @@ ges_timeline_object_class_init (GESTimelineObjectClass * klass)
    */
   ges_timeline_object_signals[EFFECT_REMOVED] =
       g_signal_new ("effect-removed", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_FIRST, 0, NULL, NULL, ges_marshal_VOID__OBJECT,
+      G_SIGNAL_RUN_FIRST, 0, NULL, NULL, g_cclosure_marshal_generic,
       G_TYPE_NONE, 1, GES_TYPE_TRACK_EFFECT);
 
   /**
@@ -355,7 +356,7 @@ ges_timeline_object_class_init (GESTimelineObjectClass * klass)
    */
   ges_timeline_object_signals[TRACK_OBJECT_ADDED] =
       g_signal_new ("track-object-added", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_FIRST, 0, NULL, NULL, ges_marshal_VOID__OBJECT,
+      G_SIGNAL_RUN_FIRST, 0, NULL, NULL, g_cclosure_marshal_generic,
       G_TYPE_NONE, 1, GES_TYPE_TRACK_OBJECT);
 
   /**
@@ -369,7 +370,7 @@ ges_timeline_object_class_init (GESTimelineObjectClass * klass)
    */
   ges_timeline_object_signals[TRACK_OBJECT_REMOVED] =
       g_signal_new ("track-object-removed", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_FIRST, 0, NULL, NULL, ges_marshal_VOID__OBJECT,
+      G_SIGNAL_RUN_FIRST, 0, NULL, NULL, g_cclosure_marshal_generic,
       G_TYPE_NONE, 1, GES_TYPE_TRACK_OBJECT);
 
   klass->need_fill_track = TRUE;
diff --git a/ges/ges-timeline.c b/ges/ges-timeline.c
index a927d9e155..adaa4be4af 100644
--- a/ges/ges-timeline.c
+++ b/ges/ges-timeline.c
@@ -36,7 +36,6 @@
  * documentation about #GESFormatter.
  */
 
-#include "gesmarshal.h"
 #include "ges-internal.h"
 #include "ges-timeline.h"
 #include "ges-track.h"
@@ -225,7 +224,7 @@ ges_timeline_class_init (GESTimelineClass * klass)
   ges_timeline_signals[TRACK_ADDED] =
       g_signal_new ("track-added", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GESTimelineClass, track_added), NULL,
-      NULL, ges_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GES_TYPE_TRACK);
+      NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1, GES_TYPE_TRACK);
 
   /**
    * GESTimeline::track-removed
@@ -237,7 +236,7 @@ ges_timeline_class_init (GESTimelineClass * klass)
   ges_timeline_signals[TRACK_REMOVED] =
       g_signal_new ("track-removed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GESTimelineClass, track_removed),
-      NULL, NULL, ges_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GES_TYPE_TRACK);
+      NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1, GES_TYPE_TRACK);
 
   /**
    * GESTimeline::layer-added
@@ -249,7 +248,8 @@ ges_timeline_class_init (GESTimelineClass * klass)
   ges_timeline_signals[LAYER_ADDED] =
       g_signal_new ("layer-added", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GESTimelineClass, layer_added), NULL,
-      NULL, ges_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GES_TYPE_TIMELINE_LAYER);
+      NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1,
+      GES_TYPE_TIMELINE_LAYER);
 
   /**
    * GESTimeline::layer-removed
@@ -261,7 +261,7 @@ ges_timeline_class_init (GESTimelineClass * klass)
   ges_timeline_signals[LAYER_REMOVED] =
       g_signal_new ("layer-removed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GESTimelineClass, layer_removed),
-      NULL, NULL, ges_marshal_VOID__OBJECT, G_TYPE_NONE, 1,
+      NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1,
       GES_TYPE_TIMELINE_LAYER);
 
   /**
@@ -273,8 +273,8 @@ ges_timeline_class_init (GESTimelineClass * klass)
    */
   ges_timeline_signals[DISCOVERY_ERROR] =
       g_signal_new ("discovery-error", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_FIRST, 0, NULL, NULL, gst_marshal_VOID__OBJECT_BOXED,
-      G_TYPE_NONE, 2, GES_TYPE_TIMELINE_FILE_SOURCE, GST_TYPE_G_ERROR);
+      G_SIGNAL_RUN_FIRST, 0, NULL, NULL, g_cclosure_marshal_generic,
+      G_TYPE_NONE, 2, GES_TYPE_TIMELINE_FILE_SOURCE, G_TYPE_ERROR);
 }
 
 static void
diff --git a/ges/ges-track-object.c b/ges/ges-track-object.c
index 5702967842..d026e2ed02 100644
--- a/ges/ges-track-object.c
+++ b/ges/ges-track-object.c
@@ -31,7 +31,6 @@
  */
 
 #include "ges-internal.h"
-#include "gesmarshal.h"
 #include "ges-track-object.h"
 #include "ges-timeline-object.h"
 #include <gobject/gvaluecollector.h>
@@ -305,7 +304,7 @@ ges_track_object_class_init (GESTrackObjectClass * klass)
   ges_track_object_signals[DEEP_NOTIFY] =
       g_signal_new ("deep-notify", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE | G_SIGNAL_DETAILED |
-      G_SIGNAL_NO_HOOKS, 0, NULL, NULL, gst_marshal_VOID__OBJECT_PARAM,
+      G_SIGNAL_NO_HOOKS, 0, NULL, NULL, g_cclosure_marshal_generic,
       G_TYPE_NONE, 2, GST_TYPE_ELEMENT, G_TYPE_PARAM);
 
   klass->create_gnl_object = ges_track_object_create_gnl_object_func;
diff --git a/ges/ges-track.c b/ges/ges-track.c
index e28c4d4e68..d967a8152c 100644
--- a/ges/ges-track.c
+++ b/ges/ges-track.c
@@ -32,7 +32,6 @@
 #include "ges-internal.h"
 #include "ges-track.h"
 #include "ges-track-object.h"
-#include "gesmarshal.h"
 
 G_DEFINE_TYPE (GESTrack, ges_track, GST_TYPE_BIN);
 
@@ -259,7 +258,7 @@ ges_track_class_init (GESTrackClass * klass)
    */
   ges_track_signals[TRACK_OBJECT_ADDED] =
       g_signal_new ("track-object-added", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_FIRST, 0, NULL, NULL, ges_marshal_VOID__OBJECT,
+      G_SIGNAL_RUN_FIRST, 0, NULL, NULL, g_cclosure_marshal_generic,
       G_TYPE_NONE, 1, GES_TYPE_TRACK_OBJECT);
 
   /**
@@ -273,7 +272,7 @@ ges_track_class_init (GESTrackClass * klass)
    */
   ges_track_signals[TRACK_OBJECT_REMOVED] =
       g_signal_new ("track-object-removed", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_FIRST, 0, NULL, NULL, ges_marshal_VOID__OBJECT,
+      G_SIGNAL_RUN_FIRST, 0, NULL, NULL, g_cclosure_marshal_generic,
       G_TYPE_NONE, 1, GES_TYPE_TRACK_OBJECT);
 }
 
diff --git a/ges/ges-utils.c b/ges/ges-utils.c
index 90cd58208a..41c83506b5 100644
--- a/ges/ges-utils.c
+++ b/ges/ges-utils.c
@@ -23,7 +23,6 @@
  *
  */
 
-#include "gesmarshal.h"
 #include "ges-internal.h"
 #include "ges-timeline.h"
 #include "ges-track.h"