diff --git a/ext/dtls/gstdtlsconnection.c b/ext/dtls/gstdtlsconnection.c
index 244ec997c5..577a69e5bc 100644
--- a/ext/dtls/gstdtlsconnection.c
+++ b/ext/dtls/gstdtlsconnection.c
@@ -134,20 +134,17 @@ gst_dtls_connection_class_init (GstDtlsConnectionClass * klass)
 
   signals[SIGNAL_ON_DECODER_KEY] =
       g_signal_new ("on-decoder-key", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_generic, G_TYPE_NONE, 3,
-      G_TYPE_POINTER, G_TYPE_UINT, G_TYPE_UINT);
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL,
+      G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_UINT, G_TYPE_UINT);
 
   signals[SIGNAL_ON_ENCODER_KEY] =
       g_signal_new ("on-encoder-key", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_generic, G_TYPE_NONE, 3,
-      G_TYPE_POINTER, G_TYPE_UINT, G_TYPE_UINT);
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL,
+      G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_UINT, G_TYPE_UINT);
 
   signals[SIGNAL_ON_PEER_CERTIFICATE] =
       g_signal_new ("on-peer-certificate", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_generic, G_TYPE_BOOLEAN, 1, G_TYPE_STRING);
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_BOOLEAN, 1, G_TYPE_STRING);
 
   properties[PROP_AGENT] =
       g_param_spec_object ("agent",
diff --git a/ext/dtls/gstdtlsdec.c b/ext/dtls/gstdtlsdec.c
index 6360e2426a..0d4ffe7826 100644
--- a/ext/dtls/gstdtlsdec.c
+++ b/ext/dtls/gstdtlsdec.c
@@ -128,8 +128,7 @@ gst_dtls_dec_class_init (GstDtlsDecClass * klass)
 
   signals[SIGNAL_ON_KEY_RECEIVED] =
       g_signal_new ("on-key-received", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_generic, G_TYPE_NONE, 0);
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0);
 
   properties[PROP_CONNECTION_ID] =
       g_param_spec_string ("connection-id",
diff --git a/ext/dtls/gstdtlsenc.c b/ext/dtls/gstdtlsenc.c
index 5b3bb26aff..f992af0ab8 100644
--- a/ext/dtls/gstdtlsenc.c
+++ b/ext/dtls/gstdtlsenc.c
@@ -122,8 +122,7 @@ gst_dtls_enc_class_init (GstDtlsEncClass * klass)
 
   signals[SIGNAL_ON_KEY_RECEIVED] =
       g_signal_new ("on-key-received", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_generic, G_TYPE_NONE, 0);
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0);
 
   properties[PROP_CONNECTION_ID] =
       g_param_spec_string ("connection-id",
diff --git a/ext/dtls/gstdtlssrtpenc.c b/ext/dtls/gstdtlssrtpenc.c
index 237aec5169..5a2db432d6 100644
--- a/ext/dtls/gstdtlssrtpenc.c
+++ b/ext/dtls/gstdtlssrtpenc.c
@@ -126,8 +126,7 @@ gst_dtls_srtp_enc_class_init (GstDtlsSrtpEncClass * klass)
 
   signals[SIGNAL_ON_KEY_SET] =
       g_signal_new ("on-key-set", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_generic, G_TYPE_NONE, 0);
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0);
 
   properties[PROP_IS_CLIENT] =
       g_param_spec_boolean ("is-client",
diff --git a/ext/resindvd/rsninputselector.c b/ext/resindvd/rsninputselector.c
index debee91ec7..e489f15b0a 100644
--- a/ext/resindvd/rsninputselector.c
+++ b/ext/resindvd/rsninputselector.c
@@ -1221,8 +1221,8 @@ gst_input_selector_class_init (RsnInputSelectorClass * klass)
   gst_input_selector_signals[SIGNAL_BLOCK] =
       g_signal_new ("block", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-      G_STRUCT_OFFSET (RsnInputSelectorClass, block), NULL, NULL,
-      g_cclosure_marshal_generic, G_TYPE_INT64, 0);
+      G_STRUCT_OFFSET (RsnInputSelectorClass, block), NULL, NULL, NULL,
+      G_TYPE_INT64, 0);
 
   gst_element_class_set_static_metadata (gstelement_class, "Input selector",
       "Generic", "N-to-1 input stream selector",
diff --git a/ext/sctp/gstsctpdec.c b/ext/sctp/gstsctpdec.c
index 870a3ba00b..48a0175874 100644
--- a/ext/sctp/gstsctpdec.c
+++ b/ext/sctp/gstsctpdec.c
@@ -208,7 +208,7 @@ gst_sctp_dec_class_init (GstSctpDecClass * klass)
   signals[SIGNAL_RESET_STREAM] = g_signal_new ("reset-stream",
       G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
       G_STRUCT_OFFSET (GstSctpDecClass, on_reset_stream), NULL, NULL,
-      g_cclosure_marshal_generic, G_TYPE_NONE, 1, G_TYPE_UINT);
+      NULL, G_TYPE_NONE, 1, G_TYPE_UINT);
 
   gst_element_class_set_static_metadata (element_class,
       "SCTP Decoder",
diff --git a/ext/sctp/gstsctpenc.c b/ext/sctp/gstsctpenc.c
index ec33ca9aef..0122c52cd3 100644
--- a/ext/sctp/gstsctpenc.c
+++ b/ext/sctp/gstsctpenc.c
@@ -217,12 +217,12 @@ gst_sctp_enc_class_init (GstSctpEncClass * klass)
       g_signal_new ("sctp-association-established",
       G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST,
       G_STRUCT_OFFSET (GstSctpEncClass, on_sctp_association_is_established),
-      NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+      NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 
   signals[SIGNAL_GET_STREAM_BYTES_SENT] = g_signal_new ("bytes-sent",
       G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
       G_STRUCT_OFFSET (GstSctpEncClass, on_get_stream_bytes_sent), NULL, NULL,
-      g_cclosure_marshal_generic, G_TYPE_UINT64, 1, G_TYPE_UINT);
+      NULL, G_TYPE_UINT64, 1, G_TYPE_UINT);
 
   klass->on_get_stream_bytes_sent =
       GST_DEBUG_FUNCPTR (on_get_stream_bytes_sent);
diff --git a/ext/sctp/sctpassociation.c b/ext/sctp/sctpassociation.c
index 50a3ed3747..2ae4781217 100644
--- a/ext/sctp/sctpassociation.c
+++ b/ext/sctp/sctpassociation.c
@@ -141,8 +141,7 @@ gst_sctp_association_class_init (GstSctpAssociationClass * klass)
   signals[SIGNAL_STREAM_RESET] =
       g_signal_new ("stream-reset", G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GstSctpAssociationClass,
-          on_sctp_stream_reset), NULL, NULL, g_cclosure_marshal_generic,
-      G_TYPE_NONE, 1, G_TYPE_UINT);
+          on_sctp_stream_reset), NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_UINT);
 
   properties[PROP_ASSOCIATION_ID] = g_param_spec_uint ("association-id",
       "The SCTP association-id", "The SCTP association-id.", 0, G_MAXUSHORT,
diff --git a/ext/srt/gstsrtsink.c b/ext/srt/gstsrtsink.c
index 591f414730..a7249e01b0 100644
--- a/ext/srt/gstsrtsink.c
+++ b/ext/srt/gstsrtsink.c
@@ -309,8 +309,7 @@ gst_srt_sink_class_init (GstSRTSinkClass * klass)
   signals[SIG_CALLER_ADDED] =
       g_signal_new ("caller-added", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstSRTSinkClass, caller_added),
-      NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE,
-      2, G_TYPE_INT, G_TYPE_SOCKET_ADDRESS);
+      NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_SOCKET_ADDRESS);
 
   /**
    * GstSRTSink::caller-removed:
@@ -323,7 +322,7 @@ gst_srt_sink_class_init (GstSRTSinkClass * klass)
   signals[SIG_CALLER_REMOVED] =
       g_signal_new ("caller-removed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstSRTSinkClass,
-          caller_added), NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE,
+          caller_added), NULL, NULL, NULL, G_TYPE_NONE,
       2, G_TYPE_INT, G_TYPE_SOCKET_ADDRESS);
 
   gst_srt_object_install_properties_helper (gobject_class);
diff --git a/ext/srt/gstsrtsrc.c b/ext/srt/gstsrtsrc.c
index 59103fe39d..f229778bc5 100644
--- a/ext/srt/gstsrtsrc.c
+++ b/ext/srt/gstsrtsrc.c
@@ -278,8 +278,7 @@ gst_srt_src_class_init (GstSRTSrcClass * klass)
   signals[SIG_CALLER_ADDED] =
       g_signal_new ("caller-added", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstSRTSrcClass, caller_added),
-      NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE,
-      2, G_TYPE_INT, G_TYPE_SOCKET_ADDRESS);
+      NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_SOCKET_ADDRESS);
 
   /**
    * GstSRTSrc::caller-removed:
@@ -292,7 +291,7 @@ gst_srt_src_class_init (GstSRTSrcClass * klass)
   signals[SIG_CALLER_REMOVED] =
       g_signal_new ("caller-removed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstSRTSrcClass,
-          caller_added), NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE,
+          caller_added), NULL, NULL, NULL, G_TYPE_NONE,
       2, G_TYPE_INT, G_TYPE_SOCKET_ADDRESS);
 
   gst_srt_object_install_properties_helper (gobject_class);
diff --git a/ext/webrtc/gstwebrtcbin.c b/ext/webrtc/gstwebrtcbin.c
index bd9cd0908b..c7928f62a8 100644
--- a/ext/webrtc/gstwebrtcbin.c
+++ b/ext/webrtc/gstwebrtcbin.c
@@ -5647,9 +5647,8 @@ gst_webrtc_bin_class_init (GstWebRTCBinClass * klass)
   gst_webrtc_bin_signals[CREATE_OFFER_SIGNAL] =
       g_signal_new_class_handler ("create-offer", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-      G_CALLBACK (gst_webrtc_bin_create_offer), NULL, NULL,
-      g_cclosure_marshal_generic, G_TYPE_NONE, 2, GST_TYPE_STRUCTURE,
-      GST_TYPE_PROMISE);
+      G_CALLBACK (gst_webrtc_bin_create_offer), NULL, NULL, NULL,
+      G_TYPE_NONE, 2, GST_TYPE_STRUCTURE, GST_TYPE_PROMISE);
 
   /**
    * GstWebRTCBin::create-answer:
@@ -5660,9 +5659,8 @@ gst_webrtc_bin_class_init (GstWebRTCBinClass * klass)
   gst_webrtc_bin_signals[CREATE_ANSWER_SIGNAL] =
       g_signal_new_class_handler ("create-answer", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-      G_CALLBACK (gst_webrtc_bin_create_answer), NULL, NULL,
-      g_cclosure_marshal_generic, G_TYPE_NONE, 2, GST_TYPE_STRUCTURE,
-      GST_TYPE_PROMISE);
+      G_CALLBACK (gst_webrtc_bin_create_answer), NULL, NULL, NULL,
+      G_TYPE_NONE, 2, GST_TYPE_STRUCTURE, GST_TYPE_PROMISE);
 
   /**
    * GstWebRTCBin::set-local-description:
@@ -5673,9 +5671,8 @@ gst_webrtc_bin_class_init (GstWebRTCBinClass * klass)
   gst_webrtc_bin_signals[SET_LOCAL_DESCRIPTION_SIGNAL] =
       g_signal_new_class_handler ("set-local-description",
       G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-      G_CALLBACK (gst_webrtc_bin_set_local_description), NULL, NULL,
-      g_cclosure_marshal_generic, G_TYPE_NONE, 2,
-      GST_TYPE_WEBRTC_SESSION_DESCRIPTION, GST_TYPE_PROMISE);
+      G_CALLBACK (gst_webrtc_bin_set_local_description), NULL, NULL, NULL,
+      G_TYPE_NONE, 2, GST_TYPE_WEBRTC_SESSION_DESCRIPTION, GST_TYPE_PROMISE);
 
   /**
    * GstWebRTCBin::set-remote-description:
@@ -5686,9 +5683,8 @@ gst_webrtc_bin_class_init (GstWebRTCBinClass * klass)
   gst_webrtc_bin_signals[SET_REMOTE_DESCRIPTION_SIGNAL] =
       g_signal_new_class_handler ("set-remote-description",
       G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-      G_CALLBACK (gst_webrtc_bin_set_remote_description), NULL, NULL,
-      g_cclosure_marshal_generic, G_TYPE_NONE, 2,
-      GST_TYPE_WEBRTC_SESSION_DESCRIPTION, GST_TYPE_PROMISE);
+      G_CALLBACK (gst_webrtc_bin_set_remote_description), NULL, NULL, NULL,
+      G_TYPE_NONE, 2, GST_TYPE_WEBRTC_SESSION_DESCRIPTION, GST_TYPE_PROMISE);
 
   /**
    * GstWebRTCBin::add-ice-candidate:
@@ -5699,8 +5695,8 @@ gst_webrtc_bin_class_init (GstWebRTCBinClass * klass)
   gst_webrtc_bin_signals[ADD_ICE_CANDIDATE_SIGNAL] =
       g_signal_new_class_handler ("add-ice-candidate",
       G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-      G_CALLBACK (gst_webrtc_bin_add_ice_candidate), NULL, NULL,
-      g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
+      G_CALLBACK (gst_webrtc_bin_add_ice_candidate), NULL, NULL, NULL,
+      G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
 
   /**
    * GstWebRTCBin::get-stats:
@@ -5775,9 +5771,8 @@ gst_webrtc_bin_class_init (GstWebRTCBinClass * klass)
   gst_webrtc_bin_signals[GET_STATS_SIGNAL] =
       g_signal_new_class_handler ("get-stats",
       G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-      G_CALLBACK (gst_webrtc_bin_get_stats), NULL, NULL,
-      g_cclosure_marshal_generic, G_TYPE_NONE, 2, GST_TYPE_PAD,
-      GST_TYPE_PROMISE);
+      G_CALLBACK (gst_webrtc_bin_get_stats), NULL, NULL, NULL,
+      G_TYPE_NONE, 2, GST_TYPE_PAD, GST_TYPE_PROMISE);
 
   /**
    * GstWebRTCBin::on-negotiation-needed:
@@ -5785,8 +5780,7 @@ gst_webrtc_bin_class_init (GstWebRTCBinClass * klass)
    */
   gst_webrtc_bin_signals[ON_NEGOTIATION_NEEDED_SIGNAL] =
       g_signal_new ("on-negotiation-needed", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic,
-      G_TYPE_NONE, 0);
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0);
 
   /**
    * GstWebRTCBin::on-ice-candidate:
@@ -5796,7 +5790,7 @@ gst_webrtc_bin_class_init (GstWebRTCBinClass * klass)
    */
   gst_webrtc_bin_signals[ON_ICE_CANDIDATE_SIGNAL] =
       g_signal_new ("on-ice-candidate", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic,
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL,
       G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
 
   /**
@@ -5806,7 +5800,7 @@ gst_webrtc_bin_class_init (GstWebRTCBinClass * klass)
    */
   gst_webrtc_bin_signals[ON_NEW_TRANSCEIVER_SIGNAL] =
       g_signal_new ("on-new-transceiver", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic,
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL,
       G_TYPE_NONE, 1, GST_TYPE_WEBRTC_RTP_TRANSCEIVER);
 
   /**
@@ -5816,7 +5810,7 @@ gst_webrtc_bin_class_init (GstWebRTCBinClass * klass)
    */
   gst_webrtc_bin_signals[ON_DATA_CHANNEL_SIGNAL] =
       g_signal_new ("on-data-channel", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic,
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL,
       G_TYPE_NONE, 1, GST_TYPE_WEBRTC_DATA_CHANNEL);
 
   /**
@@ -5831,7 +5825,7 @@ gst_webrtc_bin_class_init (GstWebRTCBinClass * klass)
       g_signal_new_class_handler ("add-transceiver", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
       G_CALLBACK (gst_webrtc_bin_add_transceiver), NULL, NULL,
-      g_cclosure_marshal_generic, GST_TYPE_WEBRTC_RTP_TRANSCEIVER, 2,
+      NULL, GST_TYPE_WEBRTC_RTP_TRANSCEIVER, 2,
       GST_TYPE_WEBRTC_RTP_TRANSCEIVER_DIRECTION, GST_TYPE_CAPS);
 
   /**
@@ -5843,8 +5837,8 @@ gst_webrtc_bin_class_init (GstWebRTCBinClass * klass)
   gst_webrtc_bin_signals[GET_TRANSCEIVERS_SIGNAL] =
       g_signal_new_class_handler ("get-transceivers", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-      G_CALLBACK (gst_webrtc_bin_get_transceivers), NULL, NULL,
-      g_cclosure_marshal_generic, G_TYPE_ARRAY, 0);
+      G_CALLBACK (gst_webrtc_bin_get_transceivers), NULL, NULL, NULL,
+      G_TYPE_ARRAY, 0);
 
   /**
    * GstWebRTCBin::get-transceiver:
@@ -5857,9 +5851,8 @@ gst_webrtc_bin_class_init (GstWebRTCBinClass * klass)
   gst_webrtc_bin_signals[GET_TRANSCEIVER_SIGNAL] =
       g_signal_new_class_handler ("get-transceiver", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-      G_CALLBACK (gst_webrtc_bin_get_transceiver), NULL, NULL,
-      g_cclosure_marshal_generic, GST_TYPE_WEBRTC_RTP_TRANSCEIVER, 1,
-      G_TYPE_INT);
+      G_CALLBACK (gst_webrtc_bin_get_transceiver), NULL, NULL, NULL,
+      GST_TYPE_WEBRTC_RTP_TRANSCEIVER, 1, G_TYPE_INT);
 
   /**
    * GstWebRTCBin::add-turn-server:
@@ -5871,8 +5864,8 @@ gst_webrtc_bin_class_init (GstWebRTCBinClass * klass)
   gst_webrtc_bin_signals[ADD_TURN_SERVER_SIGNAL] =
       g_signal_new_class_handler ("add-turn-server", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-      G_CALLBACK (gst_webrtc_bin_add_turn_server), NULL, NULL,
-      g_cclosure_marshal_generic, G_TYPE_BOOLEAN, 1, G_TYPE_STRING);
+      G_CALLBACK (gst_webrtc_bin_add_turn_server), NULL, NULL, NULL,
+      G_TYPE_BOOLEAN, 1, G_TYPE_STRING);
 
   /*
    * GstWebRTCBin::create-data-channel:
@@ -5898,8 +5891,7 @@ gst_webrtc_bin_class_init (GstWebRTCBinClass * klass)
       g_signal_new_class_handler ("create-data-channel",
       G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
       G_CALLBACK (gst_webrtc_bin_create_data_channel), NULL, NULL,
-      g_cclosure_marshal_generic, GST_TYPE_WEBRTC_DATA_CHANNEL, 2,
-      G_TYPE_STRING, GST_TYPE_STRUCTURE);
+      NULL, GST_TYPE_WEBRTC_DATA_CHANNEL, 2, G_TYPE_STRING, GST_TYPE_STRUCTURE);
 }
 
 static void
diff --git a/ext/webrtc/gstwebrtcice.c b/ext/webrtc/gstwebrtcice.c
index 17e3f25d3a..e503bbfea6 100644
--- a/ext/webrtc/gstwebrtcice.c
+++ b/ext/webrtc/gstwebrtcice.c
@@ -948,7 +948,7 @@ gst_webrtc_ice_class_init (GstWebRTCICEClass * klass)
    */
   gst_webrtc_ice_signals[ON_ICE_CANDIDATE_SIGNAL] =
       g_signal_new ("on-ice-candidate", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic,
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL,
       G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
 }
 
diff --git a/ext/webrtc/sctptransport.c b/ext/webrtc/sctptransport.c
index f5643e9fe0..0ad6b59e2b 100644
--- a/ext/webrtc/sctptransport.c
+++ b/ext/webrtc/sctptransport.c
@@ -254,8 +254,7 @@ gst_webrtc_sctp_transport_class_init (GstWebRTCSCTPTransportClass * klass)
    */
   gst_webrtc_sctp_transport_signals[ON_RESET_STREAM_SIGNAL] =
       g_signal_new ("stream-reset", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic,
-      G_TYPE_NONE, 1, G_TYPE_UINT);
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_UINT);
 }
 
 static void
diff --git a/ext/webrtc/webrtcdatachannel.c b/ext/webrtc/webrtcdatachannel.c
index 693e626cd7..3acb7c11b5 100644
--- a/ext/webrtc/webrtcdatachannel.c
+++ b/ext/webrtc/webrtcdatachannel.c
@@ -1212,8 +1212,7 @@ gst_webrtc_data_channel_class_init (GstWebRTCDataChannelClass * klass)
    */
   gst_webrtc_data_channel_signals[SIGNAL_ON_OPEN] =
       g_signal_new ("on-open", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic,
-      G_TYPE_NONE, 0);
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0);
 
   /**
    * GstWebRTCDataChannel::on-close:
@@ -1221,8 +1220,7 @@ gst_webrtc_data_channel_class_init (GstWebRTCDataChannelClass * klass)
    */
   gst_webrtc_data_channel_signals[SIGNAL_ON_CLOSE] =
       g_signal_new ("on-close", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic,
-      G_TYPE_NONE, 0);
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0);
 
   /**
    * GstWebRTCDataChannel::on-error:
@@ -1231,8 +1229,7 @@ gst_webrtc_data_channel_class_init (GstWebRTCDataChannelClass * klass)
    */
   gst_webrtc_data_channel_signals[SIGNAL_ON_ERROR] =
       g_signal_new ("on-error", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic,
-      G_TYPE_NONE, 1, G_TYPE_ERROR);
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_ERROR);
 
   /**
    * GstWebRTCDataChannel::on-message-data:
@@ -1241,8 +1238,7 @@ gst_webrtc_data_channel_class_init (GstWebRTCDataChannelClass * klass)
    */
   gst_webrtc_data_channel_signals[SIGNAL_ON_MESSAGE_DATA] =
       g_signal_new ("on-message-data", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic,
-      G_TYPE_NONE, 1, G_TYPE_BYTES);
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_BYTES);
 
   /**
    * GstWebRTCDataChannel::on-message-string:
@@ -1251,8 +1247,7 @@ gst_webrtc_data_channel_class_init (GstWebRTCDataChannelClass * klass)
    */
   gst_webrtc_data_channel_signals[SIGNAL_ON_MESSAGE_STRING] =
       g_signal_new ("on-message-string", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic,
-      G_TYPE_NONE, 1, G_TYPE_STRING);
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_STRING);
 
   /**
    * GstWebRTCDataChannel::on-buffered-amount-low:
@@ -1260,8 +1255,7 @@ gst_webrtc_data_channel_class_init (GstWebRTCDataChannelClass * klass)
    */
   gst_webrtc_data_channel_signals[SIGNAL_ON_BUFFERED_AMOUNT_LOW] =
       g_signal_new ("on-buffered-amount-low", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic,
-      G_TYPE_NONE, 0);
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0);
 
   /**
    * GstWebRTCDataChannel::send-data:
@@ -1271,8 +1265,8 @@ gst_webrtc_data_channel_class_init (GstWebRTCDataChannelClass * klass)
   gst_webrtc_data_channel_signals[SIGNAL_SEND_DATA] =
       g_signal_new_class_handler ("send-data", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-      G_CALLBACK (gst_webrtc_data_channel_send_data), NULL, NULL,
-      g_cclosure_marshal_generic, G_TYPE_NONE, 1, G_TYPE_BYTES);
+      G_CALLBACK (gst_webrtc_data_channel_send_data), NULL, NULL, NULL,
+      G_TYPE_NONE, 1, G_TYPE_BYTES);
 
   /**
    * GstWebRTCDataChannel::send-string:
@@ -1282,8 +1276,8 @@ gst_webrtc_data_channel_class_init (GstWebRTCDataChannelClass * klass)
   gst_webrtc_data_channel_signals[SIGNAL_SEND_STRING] =
       g_signal_new_class_handler ("send-string", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-      G_CALLBACK (gst_webrtc_data_channel_send_string), NULL, NULL,
-      g_cclosure_marshal_generic, G_TYPE_NONE, 1, G_TYPE_STRING);
+      G_CALLBACK (gst_webrtc_data_channel_send_string), NULL, NULL, NULL,
+      G_TYPE_NONE, 1, G_TYPE_STRING);
 
   /**
    * GstWebRTCDataChannel::close:
@@ -1294,8 +1288,8 @@ gst_webrtc_data_channel_class_init (GstWebRTCDataChannelClass * klass)
   gst_webrtc_data_channel_signals[SIGNAL_CLOSE] =
       g_signal_new_class_handler ("close", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-      G_CALLBACK (gst_webrtc_data_channel_close), NULL, NULL,
-      g_cclosure_marshal_generic, G_TYPE_NONE, 0);
+      G_CALLBACK (gst_webrtc_data_channel_close), NULL, NULL, NULL,
+      G_TYPE_NONE, 0);
 }
 
 static void
diff --git a/ext/wpe/gstwpesrc.cpp b/ext/wpe/gstwpesrc.cpp
index 09cb77fe74..8ef816c3a7 100644
--- a/ext/wpe/gstwpesrc.cpp
+++ b/ext/wpe/gstwpesrc.cpp
@@ -502,8 +502,7 @@ gst_wpe_src_class_init (GstWpeSrcClass * klass)
    */
   gst_wpe_src_signals[SIGNAL_CONFIGURE_WEB_VIEW] =
       g_signal_new ("configure-web-view", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic,
-      G_TYPE_NONE, 1, G_TYPE_OBJECT);
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_OBJECT);
 
   /**
    * GstWpeSrc::load-bytes:
@@ -515,8 +514,8 @@ gst_wpe_src_class_init (GstWpeSrcClass * klass)
   gst_wpe_src_signals[SIGNAL_LOAD_BYTES] =
       g_signal_new_class_handler ("load-bytes", G_TYPE_FROM_CLASS (klass),
       static_cast < GSignalFlags > (G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
-      G_CALLBACK (gst_wpe_src_load_bytes), NULL, NULL,
-      g_cclosure_marshal_generic, G_TYPE_NONE, 1, G_TYPE_BYTES);
+      G_CALLBACK (gst_wpe_src_load_bytes), NULL, NULL, NULL,
+      G_TYPE_NONE, 1, G_TYPE_BYTES);
 }
 
 static gboolean
diff --git a/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.c b/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.c
index 889355e693..c63fcbe1b0 100644
--- a/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.c
+++ b/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.c
@@ -532,14 +532,14 @@ gst_base_camera_src_class_init (GstBaseCameraSrcClass * klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
       G_CALLBACK (gst_base_camera_src_start_capture),
-      NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+      NULL, NULL, NULL, G_TYPE_NONE, 0);
 
   basecamerasrc_signals[STOP_CAPTURE_SIGNAL] =
       g_signal_new_class_handler ("stop-capture",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
       G_CALLBACK (gst_base_camera_src_stop_capture),
-      NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+      NULL, NULL, NULL, G_TYPE_NONE, 0);
 
   gstelement_class->change_state = gst_base_camera_src_change_state;
 
diff --git a/gst-libs/gst/vulkan/gstvkinstance.c b/gst-libs/gst/vulkan/gstvkinstance.c
index 3c7db6a5c3..60334aab96 100644
--- a/gst-libs/gst/vulkan/gstvkinstance.c
+++ b/gst-libs/gst/vulkan/gstvkinstance.c
@@ -116,8 +116,7 @@ gst_vulkan_instance_class_init (GstVulkanInstanceClass * klass)
    */
   gst_vulkan_instance_signals[SIGNAL_CREATE_DEVICE] =
       g_signal_new ("create-device", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic,
-      GST_TYPE_VULKAN_DEVICE, 0);
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, GST_TYPE_VULKAN_DEVICE, 0);
 
   G_OBJECT_CLASS (klass)->finalize = gst_vulkan_instance_finalize;
 }
diff --git a/gst-libs/gst/webrtc/icetransport.c b/gst-libs/gst/webrtc/icetransport.c
index d7e77d90f2..21e2cbe9b0 100644
--- a/gst-libs/gst/webrtc/icetransport.c
+++ b/gst-libs/gst/webrtc/icetransport.c
@@ -189,8 +189,8 @@ gst_webrtc_ice_transport_class_init (GstWebRTCICETransportClass * klass)
    */
   gst_webrtc_ice_transport_signals[ON_SELECTED_CANDIDATE_PAIR_CHANGE_SIGNAL] =
       g_signal_new ("on-selected-candidate-pair-change",
-      G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_generic, G_TYPE_NONE, 0);
+      G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL,
+      G_TYPE_NONE, 0);
 
   /**
    * GstWebRTC::on-new-candidate:
@@ -198,8 +198,8 @@ gst_webrtc_ice_transport_class_init (GstWebRTCICETransportClass * klass)
    */
   gst_webrtc_ice_transport_signals[ON_NEW_CANDIDATE_SIGNAL] =
       g_signal_new ("on-new-candidate",
-      G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_generic, G_TYPE_NONE, 1, G_TYPE_STRING);
+      G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL,
+      G_TYPE_NONE, 1, G_TYPE_STRING);
 }
 
 static void
diff --git a/gst/camerabin2/gstcamerabin2.c b/gst/camerabin2/gstcamerabin2.c
index 83210f4bbd..5dbf2d8504 100644
--- a/gst/camerabin2/gstcamerabin2.c
+++ b/gst/camerabin2/gstcamerabin2.c
@@ -833,7 +833,7 @@ gst_camera_bin_class_init (GstCameraBin2Class * klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
       G_STRUCT_OFFSET (GstCameraBin2Class, start_capture),
-      NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+      NULL, NULL, NULL, G_TYPE_NONE, 0);
 
   /**
    * GstCameraBin2::capture-stop:
@@ -844,7 +844,7 @@ gst_camera_bin_class_init (GstCameraBin2Class * klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
       G_STRUCT_OFFSET (GstCameraBin2Class, stop_capture),
-      NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+      NULL, NULL, NULL, G_TYPE_NONE, 0);
 }
 
 static void
diff --git a/sys/d3d11/gstd3d11window.c b/sys/d3d11/gstd3d11window.c
index 022701dd91..5a784fff26 100644
--- a/sys/d3d11/gstd3d11window.c
+++ b/sys/d3d11/gstd3d11window.c
@@ -110,18 +110,17 @@ gst_d3d11_window_class_init (GstD3D11WindowClass * klass)
 
   d3d11_window_signals[SIGNAL_KEY_EVENT] =
       g_signal_new ("key-event", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic,
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL,
       G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
 
   d3d11_window_signals[SIGNAL_MOUSE_EVENT] =
       g_signal_new ("mouse-event", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic,
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL,
       G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_INT, G_TYPE_DOUBLE, G_TYPE_DOUBLE);
 
   d3d11_window_signals[SIGNAL_GOT_WINDOW_HANDLE] =
       g_signal_new ("got-window-handle", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic,
-      G_TYPE_NONE, 1, G_TYPE_POINTER);
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_POINTER);
 
   GST_DEBUG_CATEGORY_INIT (gst_d3d11_window_debug, "d3d11window", 0,
       "d3d11 window");
diff --git a/sys/dvb/dvbbasebin.c b/sys/dvb/dvbbasebin.c
index f7e2fa547c..6f74a09913 100644
--- a/sys/dvb/dvbbasebin.c
+++ b/sys/dvb/dvbbasebin.c
@@ -458,8 +458,8 @@ dvb_base_bin_class_init (DvbBaseBinClass * klass)
   dvb_base_bin_signals[SIGNAL_TUNE] =
       g_signal_new ("tune", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-      G_STRUCT_OFFSET (DvbBaseBinClass, do_tune),
-      NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+      G_STRUCT_OFFSET (DvbBaseBinClass, do_tune), NULL, NULL, NULL,
+      G_TYPE_NONE, 0);
 }
 
 static void
diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c
index 4831fca9a2..6379ac67e4 100644
--- a/sys/dvb/gstdvbsrc.c
+++ b/sys/dvb/gstdvbsrc.c
@@ -1009,8 +1009,8 @@ gst_dvbsrc_class_init (GstDvbSrcClass * klass)
   gst_dvbsrc_signals[SIGNAL_TUNE] =
       g_signal_new ("tune", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-      G_STRUCT_OFFSET (GstDvbSrcClass, do_tune),
-      NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+      G_STRUCT_OFFSET (GstDvbSrcClass, do_tune), NULL, NULL, NULL,
+      G_TYPE_NONE, 0);
 
 }
 
diff --git a/sys/ipcpipeline/gstipcpipelinesink.c b/sys/ipcpipeline/gstipcpipelinesink.c
index 30c0df479e..398bbf8e67 100644
--- a/sys/ipcpipeline/gstipcpipelinesink.c
+++ b/sys/ipcpipeline/gstipcpipelinesink.c
@@ -180,7 +180,7 @@ gst_ipc_pipeline_sink_class_init (GstIpcPipelineSinkClass * klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
       G_STRUCT_OFFSET (GstIpcPipelineSinkClass, disconnect),
-      NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+      NULL, NULL, NULL, G_TYPE_NONE, 0);
 
   gst_element_class_set_static_metadata (gstelement_class,
       "Inter-process Pipeline Sink",
diff --git a/sys/ipcpipeline/gstipcpipelinesrc.c b/sys/ipcpipeline/gstipcpipelinesrc.c
index 3f5525d239..4a2abcbe98 100644
--- a/sys/ipcpipeline/gstipcpipelinesrc.c
+++ b/sys/ipcpipeline/gstipcpipelinesrc.c
@@ -163,13 +163,13 @@ gst_ipc_pipeline_src_class_init (GstIpcPipelineSrcClass * klass)
       g_signal_new ("forward-message", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
       G_STRUCT_OFFSET (GstIpcPipelineSrcClass, forward_message), NULL, NULL,
-      g_cclosure_marshal_generic, G_TYPE_BOOLEAN, 1, GST_TYPE_MESSAGE);
+      NULL, G_TYPE_BOOLEAN, 1, GST_TYPE_MESSAGE);
 
   gst_ipc_pipeline_src_signals[SIGNAL_DISCONNECT] =
       g_signal_new ("disconnect", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-      G_STRUCT_OFFSET (GstIpcPipelineSrcClass, disconnect),
-      NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+      G_STRUCT_OFFSET (GstIpcPipelineSrcClass, disconnect), NULL, NULL, NULL,
+      G_TYPE_NONE, 0);
 
   gst_element_class_set_static_metadata (gstelement_class,
       "Inter-process Pipeline Source",
diff --git a/sys/shm/gstshmsink.c b/sys/shm/gstshmsink.c
index 7a0bcebc97..b171367df8 100644
--- a/sys/shm/gstshmsink.c
+++ b/sys/shm/gstshmsink.c
@@ -418,12 +418,12 @@ gst_shm_sink_class_init (GstShmSinkClass * klass)
           G_PARAM_CONSTRUCT | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   signals[SIGNAL_CLIENT_CONNECTED] = g_signal_new ("client-connected",
-      GST_TYPE_SHM_SINK, G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
+      GST_TYPE_SHM_SINK, G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL,
+      G_TYPE_NONE, 1, G_TYPE_INT);
 
   signals[SIGNAL_CLIENT_DISCONNECTED] = g_signal_new ("client-disconnected",
-      GST_TYPE_SHM_SINK, G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
+      GST_TYPE_SHM_SINK, G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL,
+      G_TYPE_NONE, 1, G_TYPE_INT);
 
   gst_element_class_add_static_pad_template (gstelement_class, &sinktemplate);