diff --git a/gobject/gmarshal.c b/gobject/gmarshal.c
index 0bb2da5d5..b979a438e 100644
--- a/gobject/gmarshal.c
+++ b/gobject/gmarshal.c
@@ -1,3 +1,18 @@
+/* GObject - GLib Type, Object, Parameter and Signal Library
+ *
+ * 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.1 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, see <http://www.gnu.org/licenses/>.
+ */
 
 #include "config.h"
 
@@ -6,795 +21,6 @@
 #include "gboxed.h"
 #include "gvaluetypes.h"
 
-/**
- * g_cclosure_marshal_VOID__VOID:
- * @closure: A #GClosure.
- * @return_value: A #GValue to store the return value. May be %NULL
- *   if the callback of closure doesn't return a value.
- * @n_param_values: The length of the @param_values array.
- * @param_values: An array of #GValues holding the arguments
- *   on which to invoke the callback of closure.
- * @invocation_hint: The invocation hint given as the last argument to
- *   g_closure_invoke().
- * @marshal_data: Additional data specified when registering the
- *   marshaller, see g_closure_set_marshal() and
- *   g_closure_set_meta_marshal()
- *
- * A #GClosureMarshal function for use with signals with no arguments.
- */
-/**
- * g_cclosure_marshal_VOID__BOOLEAN:
- * @closure: A #GClosure.
- * @return_value: A #GValue to store the return value. May be %NULL
- *   if the callback of closure doesn't return a value.
- * @n_param_values: The length of the @param_values array.
- * @param_values: An array of #GValues holding the arguments
- *   on which to invoke the callback of closure.
- * @invocation_hint: The invocation hint given as the last argument to
- *   g_closure_invoke().
- * @marshal_data: Additional data specified when registering the
- *   marshaller, see g_closure_set_marshal() and
- *   g_closure_set_meta_marshal()
- *
- * A #GClosureMarshal function for use with signals with a single
- * boolean argument.
- */
-/**
- * g_cclosure_marshal_VOID__CHAR:
- * @closure: A #GClosure.
- * @return_value: A #GValue to store the return value. May be %NULL
- *   if the callback of closure doesn't return a value.
- * @n_param_values: The length of the @param_values array.
- * @param_values: An array of #GValues holding the arguments
- *   on which to invoke the callback of closure.
- * @invocation_hint: The invocation hint given as the last argument to
- *   g_closure_invoke().
- * @marshal_data: Additional data specified when registering the
- *   marshaller, see g_closure_set_marshal() and
- *   g_closure_set_meta_marshal()
- *
- * A #GClosureMarshal function for use with signals with a single
- * character argument.
- */
-/**
- * g_cclosure_marshal_VOID__UCHAR:
- * @closure: A #GClosure.
- * @return_value: A #GValue to store the return value. May be %NULL
- *   if the callback of closure doesn't return a value.
- * @n_param_values: The length of the @param_values array.
- * @param_values: An array of #GValues holding the arguments
- *   on which to invoke the callback of closure.
- * @invocation_hint: The invocation hint given as the last argument to
- *   g_closure_invoke().
- * @marshal_data: Additional data specified when registering the
- *   marshaller, see g_closure_set_marshal() and
- *   g_closure_set_meta_marshal()
- *
- * A #GClosureMarshal function for use with signals with a single
- * unsigned character argument.
- */
-/**
- * g_cclosure_marshal_VOID__INT:
- * @closure: A #GClosure.
- * @return_value: A #GValue to store the return value. May be %NULL
- *   if the callback of closure doesn't return a value.
- * @n_param_values: The length of the @param_values array.
- * @param_values: An array of #GValues holding the arguments
- *   on which to invoke the callback of closure.
- * @invocation_hint: The invocation hint given as the last argument to
- *   g_closure_invoke().
- * @marshal_data: Additional data specified when registering the
- *   marshaller, see g_closure_set_marshal() and
- *   g_closure_set_meta_marshal()
- *
- * A #GClosureMarshal function for use with signals with a single
- * integer argument.
- */
-/**
- * g_cclosure_marshal_VOID__UINT:
- * @closure: A #GClosure.
- * @return_value: A #GValue to store the return value. May be %NULL
- *   if the callback of closure doesn't return a value.
- * @n_param_values: The length of the @param_values array.
- * @param_values: An array of #GValues holding the arguments
- *   on which to invoke the callback of closure.
- * @invocation_hint: The invocation hint given as the last argument to
- *   g_closure_invoke().
- * @marshal_data: Additional data specified when registering the
- *   marshaller, see g_closure_set_marshal() and
- *   g_closure_set_meta_marshal()
- *
- * A #GClosureMarshal function for use with signals with with a single
- * unsigned integer argument.
- */
-/**
- * g_cclosure_marshal_VOID__LONG:
- * @closure: A #GClosure.
- * @return_value: A #GValue to store the return value. May be %NULL
- *   if the callback of closure doesn't return a value.
- * @n_param_values: The length of the @param_values array.
- * @param_values: An array of #GValues holding the arguments
- *   on which to invoke the callback of closure.
- * @invocation_hint: The invocation hint given as the last argument to
- *   g_closure_invoke().
- * @marshal_data: Additional data specified when registering the
- *   marshaller, see g_closure_set_marshal() and
- *   g_closure_set_meta_marshal()
- *
- * A #GClosureMarshal function for use with signals with with a single
- * long integer argument.
- */
-/**
- * g_cclosure_marshal_VOID__ULONG:
- * @closure: A #GClosure.
- * @return_value: A #GValue to store the return value. May be %NULL
- *   if the callback of closure doesn't return a value.
- * @n_param_values: The length of the @param_values array.
- * @param_values: An array of #GValues holding the arguments
- *   on which to invoke the callback of closure.
- * @invocation_hint: The invocation hint given as the last argument to
- *   g_closure_invoke().
- * @marshal_data: Additional data specified when registering the
- *   marshaller, see g_closure_set_marshal() and
- *   g_closure_set_meta_marshal()
- *
- * A #GClosureMarshal function for use with signals with a single
- * unsigned long integer argument.
- */
-/**
- * g_cclosure_marshal_VOID__ENUM:
- * @closure: A #GClosure.
- * @return_value: A #GValue to store the return value. May be %NULL
- *   if the callback of closure doesn't return a value.
- * @n_param_values: The length of the @param_values array.
- * @param_values: An array of #GValues holding the arguments
- *   on which to invoke the callback of closure.
- * @invocation_hint: The invocation hint given as the last argument to
- *   g_closure_invoke().
- * @marshal_data: Additional data specified when registering the
- *   marshaller, see g_closure_set_marshal() and
- *   g_closure_set_meta_marshal()
- *
- * A #GClosureMarshal function for use with signals with a single
- * argument with an enumerated type.
- */
-/**
- * g_cclosure_marshal_VOID__FLAGS:
- * @closure: A #GClosure.
- * @return_value: A #GValue to store the return value. May be %NULL
- *   if the callback of closure doesn't return a value.
- * @n_param_values: The length of the @param_values array.
- * @param_values: An array of #GValues holding the arguments
- *   on which to invoke the callback of closure.
- * @invocation_hint: The invocation hint given as the last argument to
- *   g_closure_invoke().
- * @marshal_data: Additional data specified when registering the
- *   marshaller, see g_closure_set_marshal() and
- *   g_closure_set_meta_marshal()
- *
- * A #GClosureMarshal function for use with signals with a single
- * argument with a flags types.
- */
-/**
- * g_cclosure_marshal_VOID__FLOAT:
- * @closure: A #GClosure.
- * @return_value: A #GValue to store the return value. May be %NULL
- *   if the callback of closure doesn't return a value.
- * @n_param_values: The length of the @param_values array.
- * @param_values: An array of #GValues holding the arguments
- *   on which to invoke the callback of closure.
- * @invocation_hint: The invocation hint given as the last argument to
- *   g_closure_invoke().
- * @marshal_data: Additional data specified when registering the
- *   marshaller, see g_closure_set_marshal() and
- *   g_closure_set_meta_marshal()
- *
- * A #GClosureMarshal function for use with signals with one
- * single-precision floating point argument.
- */
-/**
- * g_cclosure_marshal_VOID__DOUBLE:
- * @closure: A #GClosure.
- * @return_value: A #GValue to store the return value. May be %NULL
- *   if the callback of closure doesn't return a value.
- * @n_param_values: The length of the @param_values array.
- * @param_values: An array of #GValues holding the arguments
- *   on which to invoke the callback of closure.
- * @invocation_hint: The invocation hint given as the last argument to
- *   g_closure_invoke().
- * @marshal_data: Additional data specified when registering the
- *   marshaller, see g_closure_set_marshal() and
- *   g_closure_set_meta_marshal()
- *
- * A #GClosureMarshal function for use with signals with one
- * double-precision floating point argument.
- */
-/**
- * g_cclosure_marshal_VOID__STRING:
- * @closure: A #GClosure.
- * @return_value: A #GValue to store the return value. May be %NULL
- *   if the callback of closure doesn't return a value.
- * @n_param_values: The length of the @param_values array.
- * @param_values: An array of #GValues holding the arguments
- *   on which to invoke the callback of closure.
- * @invocation_hint: The invocation hint given as the last argument to
- *   g_closure_invoke().
- * @marshal_data: Additional data specified when registering the
- *   marshaller, see g_closure_set_marshal() and
- *   g_closure_set_meta_marshal()
- *
- * A #GClosureMarshal function for use with signals with a single string
- * argument.
- */
-/**
- * g_cclosure_marshal_VOID__PARAM:
- * @closure: A #GClosure.
- * @return_value: A #GValue to store the return value. May be %NULL
- *   if the callback of closure doesn't return a value.
- * @n_param_values: The length of the @param_values array.
- * @param_values: An array of #GValues holding the arguments
- *   on which to invoke the callback of closure.
- * @invocation_hint: The invocation hint given as the last argument to
- *   g_closure_invoke().
- * @marshal_data: Additional data specified when registering the
- *   marshaller, see g_closure_set_marshal() and
- *   g_closure_set_meta_marshal()
- *
- * A #GClosureMarshal function for use with signals with a single
- * argument of type #GParamSpec.
- */
-/**
- * g_cclosure_marshal_VOID__BOXED:
- * @closure: A #GClosure.
- * @return_value: A #GValue to store the return value. May be %NULL
- *   if the callback of closure doesn't return a value.
- * @n_param_values: The length of the @param_values array.
- * @param_values: An array of #GValues holding the arguments
- *   on which to invoke the callback of closure.
- * @invocation_hint: The invocation hint given as the last argument to
- *   g_closure_invoke().
- * @marshal_data: Additional data specified when registering the
- *   marshaller, see g_closure_set_marshal() and
- *   g_closure_set_meta_marshal()
- *
- * A #GClosureMarshal function for use with signals with a single
- * argument which is any boxed pointer type.
- */
-/**
- * g_cclosure_marshal_VOID__POINTER:
- * @closure: A #GClosure.
- * @return_value: A #GValue to store the return value. May be %NULL
- *   if the callback of closure doesn't return a value.
- * @n_param_values: The length of the @param_values array.
- * @param_values: An array of #GValues holding the arguments
- *   on which to invoke the callback of closure.
- * @invocation_hint: The invocation hint given as the last argument to
- *   g_closure_invoke().
- * @marshal_data: Additional data specified when registering the
- *   marshaller, see g_closure_set_marshal() and
- *   g_closure_set_meta_marshal()
- *
- * A #GClosureMarshal function for use with signals with a single raw
- * pointer argument type.
- *
- * If it is possible, it is better to use one of the more specific
- * functions such as g_cclosure_marshal_VOID__OBJECT() or
- * g_cclosure_marshal_VOID__OBJECT().
- */
-/**
- * g_cclosure_marshal_VOID__OBJECT:
- * @closure: A #GClosure.
- * @return_value: A #GValue to store the return value. May be %NULL
- *   if the callback of closure doesn't return a value.
- * @n_param_values: The length of the @param_values array.
- * @param_values: An array of #GValues holding the arguments
- *   on which to invoke the callback of closure.
- * @invocation_hint: The invocation hint given as the last argument to
- *   g_closure_invoke().
- * @marshal_data: Additional data specified when registering the
- *   marshaller, see g_closure_set_marshal() and
- *   g_closure_set_meta_marshal()
- *
- * A #GClosureMarshal function for use with signals with a single
- * #GObject argument.
- */
-/**
- * g_cclosure_marshal_VOID__VARIANT:
- * @closure: A #GClosure.
- * @return_value: A #GValue to store the return value. May be %NULL
- *   if the callback of closure doesn't return a value.
- * @n_param_values: The length of the @param_values array.
- * @param_values: An array of #GValues holding the arguments
- *   on which to invoke the callback of closure.
- * @invocation_hint: The invocation hint given as the last argument to
- *   g_closure_invoke().
- * @marshal_data: Additional data specified when registering the
- *   marshaller, see g_closure_set_marshal() and
- *   g_closure_set_meta_marshal()
- *
- * A #GClosureMarshal function for use with signals with a single
- * #GVariant argument.
- */
-/**
- * g_cclosure_marshal_STRING__OBJECT_POINTER:
- * @closure: A #GClosure.
- * @return_value: A #GValue to store the return value. May be %NULL
- *   if the callback of closure doesn't return a value.
- * @n_param_values: The length of the @param_values array.
- * @param_values: An array of #GValues holding the arguments
- *   on which to invoke the callback of closure.
- * @invocation_hint: The invocation hint given as the last argument to
- *   g_closure_invoke().
- * @marshal_data: Additional data specified when registering the
- *   marshaller, see g_closure_set_marshal() and
- *   g_closure_set_meta_marshal()
- *
- * A #GClosureMarshal function for use with signals with handlers that
- * take a #GObject and a pointer and produce a string.  It is highly
- * unlikely that your signal handler fits this description.
- */
-/**
- * g_cclosure_marshal_VOID__UINT_POINTER:
- * @closure: A #GClosure.
- * @return_value: A #GValue to store the return value. May be %NULL
- *   if the callback of closure doesn't return a value.
- * @n_param_values: The length of the @param_values array.
- * @param_values: An array of #GValues holding the arguments
- *   on which to invoke the callback of closure.
- * @invocation_hint: The invocation hint given as the last argument to
- *   g_closure_invoke().
- * @marshal_data: Additional data specified when registering the
- *   marshaller, see g_closure_set_marshal() and
- *   g_closure_set_meta_marshal()
- *
- * A #GClosureMarshal function for use with signals with a unsigned int
- * and a pointer as arguments.
- */
-/**
- * g_cclosure_marshal_BOOLEAN__FLAGS:
- * @closure: A #GClosure.
- * @return_value: A #GValue to store the return value. May be %NULL
- *   if the callback of closure doesn't return a value.
- * @n_param_values: The length of the @param_values array.
- * @param_values: An array of #GValues holding the arguments
- *   on which to invoke the callback of closure.
- * @invocation_hint: The invocation hint given as the last argument to
- *   g_closure_invoke().
- * @marshal_data: Additional data specified when registering the
- *   marshaller, see g_closure_set_marshal() and
- *   g_closure_set_meta_marshal()
- *
- * A #GClosureMarshal function for use with signals with handlers that
- * take a flags type as an argument and return a boolean.  If you have
- * such a signal, you will probably also need to use an accumulator,
- * such as g_signal_accumulator_true_handled().
- */
-/**
- * g_cclosure_marshal_BOOL__FLAGS:
- * @closure: A #GClosure.
- * @return_value: A #GValue to store the return value. May be %NULL
- *   if the callback of closure doesn't return a value.
- * @n_param_values: The length of the @param_values array.
- * @param_values: An array of #GValues holding the arguments
- *   on which to invoke the callback of closure.
- * @invocation_hint: The invocation hint given as the last argument to
- *   g_closure_invoke().
- * @marshal_data: Additional data specified when registering the
- *   marshaller, see g_closure_set_marshal() and
- *   g_closure_set_meta_marshal()
- *
- * An old alias for g_cclosure_marshal_BOOLEAN__FLAGS().
- */
-/**
- * g_cclosure_marshal_BOOLEAN__BOXED_BOXED:
- * @closure: A #GClosure.
- * @return_value: A #GValue to store the return value. May be %NULL
- *   if the callback of closure doesn't return a value.
- * @n_param_values: The length of the @param_values array.
- * @param_values: An array of #GValues holding the arguments
- *   on which to invoke the callback of closure.
- * @invocation_hint: The invocation hint given as the last argument to
- *   g_closure_invoke().
- * @marshal_data: Additional data specified when registering the
- *   marshaller, see g_closure_set_marshal() and
- *   g_closure_set_meta_marshal()
- *
- * A #GClosureMarshal function for use with signals with handlers that
- * take two boxed pointers as arguments and return a boolean.  If you
- * have such a signal, you will probably also need to use an
- * accumulator, such as g_signal_accumulator_true_handled().
- */
-/**
- * g_cclosure_marshal_BOOL__BOXED_BOXED:
- * @closure: A #GClosure.
- * @return_value: A #GValue to store the return value. May be %NULL
- *   if the callback of closure doesn't return a value.
- * @n_param_values: The length of the @param_values array.
- * @param_values: An array of #GValues holding the arguments
- *   on which to invoke the callback of closure.
- * @invocation_hint: The invocation hint given as the last argument to
- *   g_closure_invoke().
- * @marshal_data: Additional data specified when registering the
- *   marshaller, see g_closure_set_marshal() and
- *   g_closure_set_meta_marshal()
- *
- * An old alias for g_cclosure_marshal_BOOLEAN__BOXED_BOXED().
- */
-/**
- * g_cclosure_marshal_VOID__VOIDv:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: (nullable): a #GValue to store the return
- *  value. May be %NULL if the callback of @closure doesn't return a
- *  value.
- * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
- * @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (nullable): additional data specified when
- *  registering the marshaller, see g_closure_set_marshal() and
- *  g_closure_set_meta_marshal()
- * @n_params: the length of the @param_types array
- * @param_types: (array length=n_params): the #GType of each argument from
- *  @args.
- *
- * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__VOID().
- */
-
-/**
- * g_cclosure_marshal_VOID__BOOLEANv:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: (nullable): a #GValue to store the return
- *  value. May be %NULL if the callback of @closure doesn't return a
- *  value.
- * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
- * @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (nullable): additional data specified when
- *  registering the marshaller, see g_closure_set_marshal() and
- *  g_closure_set_meta_marshal()
- * @n_params: the length of the @param_types array
- * @param_types: (array length=n_params): the #GType of each argument from
- *  @args.
- *
- * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__BOOLEAN().
- */
-/**
- * g_cclosure_marshal_VOID__CHARv:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: (nullable): a #GValue to store the return
- *  value. May be %NULL if the callback of @closure doesn't return a
- *  value.
- * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
- * @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (nullable): additional data specified when
- *  registering the marshaller, see g_closure_set_marshal() and
- *  g_closure_set_meta_marshal()
- * @n_params: the length of the @param_types array
- * @param_types: (array length=n_params): the #GType of each argument from
- *  @args.
- *
- * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__CHAR().
- */
-/**
- * g_cclosure_marshal_VOID__UCHARv:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: (nullable): a #GValue to store the return
- *  value. May be %NULL if the callback of @closure doesn't return a
- *  value.
- * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
- * @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (nullable): additional data specified when
- *  registering the marshaller, see g_closure_set_marshal() and
- *  g_closure_set_meta_marshal()
- * @n_params: the length of the @param_types array
- * @param_types: (array length=n_params): the #GType of each argument from
- *  @args.
- *
- * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__UCHAR().
- */
-/**
- * g_cclosure_marshal_VOID__INTv:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: (nullable): a #GValue to store the return
- *  value. May be %NULL if the callback of @closure doesn't return a
- *  value.
- * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
- * @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (nullable): additional data specified when
- *  registering the marshaller, see g_closure_set_marshal() and
- *  g_closure_set_meta_marshal()
- * @n_params: the length of the @param_types array
- * @param_types: (array length=n_params): the #GType of each argument from
- *  @args.
- *
- * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__INT().
- */
-/**
- * g_cclosure_marshal_VOID__UINTv:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: (nullable): a #GValue to store the return
- *  value. May be %NULL if the callback of @closure doesn't return a
- *  value.
- * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
- * @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (nullable): additional data specified when
- *  registering the marshaller, see g_closure_set_marshal() and
- *  g_closure_set_meta_marshal()
- * @n_params: the length of the @param_types array
- * @param_types: (array length=n_params): the #GType of each argument from
- *  @args.
- *
- * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__UINT().
- */
-/**
- * g_cclosure_marshal_VOID__LONGv:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: (nullable): a #GValue to store the return
- *  value. May be %NULL if the callback of @closure doesn't return a
- *  value.
- * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
- * @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (nullable): additional data specified when
- *  registering the marshaller, see g_closure_set_marshal() and
- *  g_closure_set_meta_marshal()
- * @n_params: the length of the @param_types array
- * @param_types: (array length=n_params): the #GType of each argument from
- *  @args.
- *
- * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__LONG().
- */
-/**
- * g_cclosure_marshal_VOID__ULONGv:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: (nullable): a #GValue to store the return
- *  value. May be %NULL if the callback of @closure doesn't return a
- *  value.
- * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
- * @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (nullable): additional data specified when
- *  registering the marshaller, see g_closure_set_marshal() and
- *  g_closure_set_meta_marshal()
- * @n_params: the length of the @param_types array
- * @param_types: (array length=n_params): the #GType of each argument from
- *  @args.
- *
- * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__ULONG().
- */
-/**
- * g_cclosure_marshal_VOID__ENUMv:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: (nullable): a #GValue to store the return
- *  value. May be %NULL if the callback of @closure doesn't return a
- *  value.
- * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
- * @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (nullable): additional data specified when
- *  registering the marshaller, see g_closure_set_marshal() and
- *  g_closure_set_meta_marshal()
- * @n_params: the length of the @param_types array
- * @param_types: (array length=n_params): the #GType of each argument from
- *  @args.
- *
- * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__ENUM().
- */
-/**
- * g_cclosure_marshal_VOID__FLAGSv:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: (nullable): a #GValue to store the return
- *  value. May be %NULL if the callback of @closure doesn't return a
- *  value.
- * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
- * @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (nullable): additional data specified when
- *  registering the marshaller, see g_closure_set_marshal() and
- *  g_closure_set_meta_marshal()
- * @n_params: the length of the @param_types array
- * @param_types: (array length=n_params): the #GType of each argument from
- *  @args.
- *
- * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__FLAGS().
- */
-/**
- * g_cclosure_marshal_VOID__FLOATv:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: (nullable): a #GValue to store the return
- *  value. May be %NULL if the callback of @closure doesn't return a
- *  value.
- * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
- * @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (nullable): additional data specified when
- *  registering the marshaller, see g_closure_set_marshal() and
- *  g_closure_set_meta_marshal()
- * @n_params: the length of the @param_types array
- * @param_types: (array length=n_params): the #GType of each argument from
- *  @args.
- *
- * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__FLOAT().
- */
-/**
- * g_cclosure_marshal_VOID__DOUBLEv:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: (nullable): a #GValue to store the return
- *  value. May be %NULL if the callback of @closure doesn't return a
- *  value.
- * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
- * @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (nullable): additional data specified when
- *  registering the marshaller, see g_closure_set_marshal() and
- *  g_closure_set_meta_marshal()
- * @n_params: the length of the @param_types array
- * @param_types: (array length=n_params): the #GType of each argument from
- *  @args.
- *
- * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__DOUBLE().
- */
-/**
- * g_cclosure_marshal_VOID__STRINGv:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: (nullable): a #GValue to store the return
- *  value. May be %NULL if the callback of @closure doesn't return a
- *  value.
- * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
- * @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (nullable): additional data specified when
- *  registering the marshaller, see g_closure_set_marshal() and
- *  g_closure_set_meta_marshal()
- * @n_params: the length of the @param_types array
- * @param_types: (array length=n_params): the #GType of each argument from
- *  @args.
- *
- * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__STRING().
- */
-/**
- * g_cclosure_marshal_VOID__PARAMv:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: (nullable): a #GValue to store the return
- *  value. May be %NULL if the callback of @closure doesn't return a
- *  value.
- * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
- * @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (nullable): additional data specified when
- *  registering the marshaller, see g_closure_set_marshal() and
- *  g_closure_set_meta_marshal()
- * @n_params: the length of the @param_types array
- * @param_types: (array length=n_params): the #GType of each argument from
- *  @args.
- *
- * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__PARAM().
- */
-/**
- * g_cclosure_marshal_VOID__BOXEDv:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: (nullable): a #GValue to store the return
- *  value. May be %NULL if the callback of @closure doesn't return a
- *  value.
- * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
- * @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (nullable): additional data specified when
- *  registering the marshaller, see g_closure_set_marshal() and
- *  g_closure_set_meta_marshal()
- * @n_params: the length of the @param_types array
- * @param_types: (array length=n_params): the #GType of each argument from
- *  @args.
- *
- * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__BOXED().
- */
-/**
- * g_cclosure_marshal_VOID__POINTERv:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: (nullable): a #GValue to store the return
- *  value. May be %NULL if the callback of @closure doesn't return a
- *  value.
- * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
- * @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (nullable): additional data specified when
- *  registering the marshaller, see g_closure_set_marshal() and
- *  g_closure_set_meta_marshal()
- * @n_params: the length of the @param_types array
- * @param_types: (array length=n_params): the #GType of each argument from
- *  @args.
- *
- * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__POINTER().
- */
-/**
- * g_cclosure_marshal_VOID__OBJECTv:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: (nullable): a #GValue to store the return
- *  value. May be %NULL if the callback of @closure doesn't return a
- *  value.
- * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
- * @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (nullable): additional data specified when
- *  registering the marshaller, see g_closure_set_marshal() and
- *  g_closure_set_meta_marshal()
- * @n_params: the length of the @param_types array
- * @param_types: (array length=n_params): the #GType of each argument from
- *  @args.
- *
- * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__OBJECT().
- */
-/**
- * g_cclosure_marshal_VOID__VARIANTv:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: (nullable): a #GValue to store the return
- *  value. May be %NULL if the callback of @closure doesn't return a
- *  value.
- * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
- * @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (nullable): additional data specified when
- *  registering the marshaller, see g_closure_set_marshal() and
- *  g_closure_set_meta_marshal()
- * @n_params: the length of the @param_types array
- * @param_types: (array length=n_params): the #GType of each argument from
- *  @args.
- *
- * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__VARIANT().
- */
-/**
- * g_cclosure_marshal_STRING__OBJECT_POINTERv:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: (nullable): a #GValue to store the return
- *  value. May be %NULL if the callback of @closure doesn't return a
- *  value.
- * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
- * @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (nullable): additional data specified when
- *  registering the marshaller, see g_closure_set_marshal() and
- *  g_closure_set_meta_marshal()
- * @n_params: the length of the @param_types array
- * @param_types: (array length=n_params): the #GType of each argument from
- *  @args.
- *
- * The #GVaClosureMarshal equivalent to g_cclosure_marshal_STRING__OBJECT_POINTER().
- */
-/**
- * g_cclosure_marshal_VOID__UINT_POINTERv:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: (nullable): a #GValue to store the return
- *  value. May be %NULL if the callback of @closure doesn't return a
- *  value.
- * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
- * @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (nullable): additional data specified when
- *  registering the marshaller, see g_closure_set_marshal() and
- *  g_closure_set_meta_marshal()
- * @n_params: the length of the @param_types array
- * @param_types: (array length=n_params): the #GType of each argument from
- *  @args.
- *
- * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__UINT_POINTER().
- */
-/**
- * g_cclosure_marshal_BOOLEAN__FLAGSv:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: (nullable): a #GValue to store the return
- *  value. May be %NULL if the callback of @closure doesn't return a
- *  value.
- * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
- * @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (nullable): additional data specified when
- *  registering the marshaller, see g_closure_set_marshal() and
- *  g_closure_set_meta_marshal()
- * @n_params: the length of the @param_types array
- * @param_types: (array length=n_params): the #GType of each argument from
- *  @args.
- *
- * The #GVaClosureMarshal equivalent to g_cclosure_marshal_BOOLEAN__FLAGS().
- */
-/**
- * g_cclosure_marshal_BOOLEAN__BOXED_BOXEDv:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: (nullable): a #GValue to store the return
- *  value. May be %NULL if the callback of @closure doesn't return a
- *  value.
- * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
- * @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (nullable): additional data specified when
- *  registering the marshaller, see g_closure_set_marshal() and
- *  g_closure_set_meta_marshal()
- * @n_params: the length of the @param_types array
- * @param_types: (array length=n_params): the #GType of each argument from
- *  @args.
- *
- * The #GVaClosureMarshal equivalent to g_cclosure_marshal_BOOLEAN__BOXED_BOXED().
- */
 
 #ifdef G_ENABLE_DEBUG
 #define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
@@ -843,7 +69,23 @@
 #endif /* !G_ENABLE_DEBUG */
 
 
-/* VOID:VOID (./gmarshal.list:6) */
+/**
+ * g_cclosure_marshal_VOID__VOID:
+ * @closure: A #GClosure.
+ * @return_value: A #GValue to store the return value. May be %NULL
+ *   if the callback of closure doesn't return a value.
+ * @n_param_values: The length of the @param_values array.
+ * @param_values: An array of #GValues holding the arguments
+ *   on which to invoke the callback of closure.
+ * @invocation_hint: The invocation hint given as the last argument to
+ *   g_closure_invoke().
+ * @marshal_data: Additional data specified when registering the
+ *   marshaller, see g_closure_set_marshal() and
+ *   g_closure_set_meta_marshal()
+ *
+ * A #GClosureMarshal function for use with signals with no arguments.
+ */
+/* VOID:VOID */
 void
 g_cclosure_marshal_VOID__VOID (GClosure     *closure,
                                GValue       *return_value G_GNUC_UNUSED,
@@ -875,6 +117,24 @@ g_cclosure_marshal_VOID__VOID (GClosure     *closure,
   callback (data1,
             data2);
 }
+
+/**
+ * g_cclosure_marshal_VOID__VOIDv:
+ * @closure: the #GClosure to which the marshaller belongs
+ * @return_value: (nullable): a #GValue to store the return
+ *  value. May be %NULL if the callback of @closure doesn't return a
+ *  value.
+ * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
+ * @args: va_list of arguments to be passed to the closure.
+ * @marshal_data: (nullable): additional data specified when
+ *  registering the marshaller, see g_closure_set_marshal() and
+ *  g_closure_set_meta_marshal()
+ * @n_params: the length of the @param_types array
+ * @param_types: (array length=n_params): the #GType of each argument from
+ *  @args.
+ *
+ * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__VOID().
+ */
 void
 g_cclosure_marshal_VOID__VOIDv (GClosure     *closure,
                                 GValue       *return_value,
@@ -906,8 +166,24 @@ g_cclosure_marshal_VOID__VOIDv (GClosure     *closure,
             data2);
 }
 
-
-/* VOID:BOOLEAN (./gmarshal.list:7) */
+/**
+ * g_cclosure_marshal_VOID__BOOLEAN:
+ * @closure: A #GClosure.
+ * @return_value: A #GValue to store the return value. May be %NULL
+ *   if the callback of closure doesn't return a value.
+ * @n_param_values: The length of the @param_values array.
+ * @param_values: An array of #GValues holding the arguments
+ *   on which to invoke the callback of closure.
+ * @invocation_hint: The invocation hint given as the last argument to
+ *   g_closure_invoke().
+ * @marshal_data: Additional data specified when registering the
+ *   marshaller, see g_closure_set_marshal() and
+ *   g_closure_set_meta_marshal()
+ *
+ * A #GClosureMarshal function for use with signals with a single
+ * boolean argument.
+ */
+/* VOID:BOOLEAN */
 void
 g_cclosure_marshal_VOID__BOOLEAN (GClosure     *closure,
                                   GValue       *return_value G_GNUC_UNUSED,
@@ -941,6 +217,24 @@ g_cclosure_marshal_VOID__BOOLEAN (GClosure     *closure,
             g_marshal_value_peek_boolean (param_values + 1),
             data2);
 }
+
+/**
+ * g_cclosure_marshal_VOID__BOOLEANv:
+ * @closure: the #GClosure to which the marshaller belongs
+ * @return_value: (nullable): a #GValue to store the return
+ *  value. May be %NULL if the callback of @closure doesn't return a
+ *  value.
+ * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
+ * @args: va_list of arguments to be passed to the closure.
+ * @marshal_data: (nullable): additional data specified when
+ *  registering the marshaller, see g_closure_set_marshal() and
+ *  g_closure_set_meta_marshal()
+ * @n_params: the length of the @param_types array
+ * @param_types: (array length=n_params): the #GType of each argument from
+ *  @args.
+ *
+ * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__BOOLEAN().
+ */
 void
 g_cclosure_marshal_VOID__BOOLEANv (GClosure     *closure,
                                    GValue       *return_value,
@@ -980,8 +274,24 @@ g_cclosure_marshal_VOID__BOOLEANv (GClosure     *closure,
             data2);
 }
 
-
-/* VOID:CHAR (./gmarshal.list:8) */
+/**
+ * g_cclosure_marshal_VOID__CHAR:
+ * @closure: A #GClosure.
+ * @return_value: A #GValue to store the return value. May be %NULL
+ *   if the callback of closure doesn't return a value.
+ * @n_param_values: The length of the @param_values array.
+ * @param_values: An array of #GValues holding the arguments
+ *   on which to invoke the callback of closure.
+ * @invocation_hint: The invocation hint given as the last argument to
+ *   g_closure_invoke().
+ * @marshal_data: Additional data specified when registering the
+ *   marshaller, see g_closure_set_marshal() and
+ *   g_closure_set_meta_marshal()
+ *
+ * A #GClosureMarshal function for use with signals with a single
+ * character argument.
+ */
+/* VOID:CHAR */
 void
 g_cclosure_marshal_VOID__CHAR (GClosure     *closure,
                                GValue       *return_value G_GNUC_UNUSED,
@@ -1015,6 +325,24 @@ g_cclosure_marshal_VOID__CHAR (GClosure     *closure,
             g_marshal_value_peek_char (param_values + 1),
             data2);
 }
+
+/**
+ * g_cclosure_marshal_VOID__CHARv:
+ * @closure: the #GClosure to which the marshaller belongs
+ * @return_value: (nullable): a #GValue to store the return
+ *  value. May be %NULL if the callback of @closure doesn't return a
+ *  value.
+ * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
+ * @args: va_list of arguments to be passed to the closure.
+ * @marshal_data: (nullable): additional data specified when
+ *  registering the marshaller, see g_closure_set_marshal() and
+ *  g_closure_set_meta_marshal()
+ * @n_params: the length of the @param_types array
+ * @param_types: (array length=n_params): the #GType of each argument from
+ *  @args.
+ *
+ * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__CHAR().
+ */
 void
 g_cclosure_marshal_VOID__CHARv (GClosure     *closure,
                                 GValue       *return_value,
@@ -1054,8 +382,24 @@ g_cclosure_marshal_VOID__CHARv (GClosure     *closure,
             data2);
 }
 
-
-/* VOID:UCHAR (./gmarshal.list:9) */
+/**
+ * g_cclosure_marshal_VOID__UCHAR:
+ * @closure: A #GClosure.
+ * @return_value: A #GValue to store the return value. May be %NULL
+ *   if the callback of closure doesn't return a value.
+ * @n_param_values: The length of the @param_values array.
+ * @param_values: An array of #GValues holding the arguments
+ *   on which to invoke the callback of closure.
+ * @invocation_hint: The invocation hint given as the last argument to
+ *   g_closure_invoke().
+ * @marshal_data: Additional data specified when registering the
+ *   marshaller, see g_closure_set_marshal() and
+ *   g_closure_set_meta_marshal()
+ *
+ * A #GClosureMarshal function for use with signals with a single
+ * unsigned character argument.
+ */
+/* VOID:UCHAR */
 void
 g_cclosure_marshal_VOID__UCHAR (GClosure     *closure,
                                 GValue       *return_value G_GNUC_UNUSED,
@@ -1089,6 +433,24 @@ g_cclosure_marshal_VOID__UCHAR (GClosure     *closure,
             g_marshal_value_peek_uchar (param_values + 1),
             data2);
 }
+
+/**
+ * g_cclosure_marshal_VOID__UCHARv:
+ * @closure: the #GClosure to which the marshaller belongs
+ * @return_value: (nullable): a #GValue to store the return
+ *  value. May be %NULL if the callback of @closure doesn't return a
+ *  value.
+ * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
+ * @args: va_list of arguments to be passed to the closure.
+ * @marshal_data: (nullable): additional data specified when
+ *  registering the marshaller, see g_closure_set_marshal() and
+ *  g_closure_set_meta_marshal()
+ * @n_params: the length of the @param_types array
+ * @param_types: (array length=n_params): the #GType of each argument from
+ *  @args.
+ *
+ * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__UCHAR().
+ */
 void
 g_cclosure_marshal_VOID__UCHARv (GClosure     *closure,
                                  GValue       *return_value,
@@ -1128,8 +490,24 @@ g_cclosure_marshal_VOID__UCHARv (GClosure     *closure,
             data2);
 }
 
-
-/* VOID:INT (./gmarshal.list:10) */
+/**
+ * g_cclosure_marshal_VOID__INT:
+ * @closure: A #GClosure.
+ * @return_value: A #GValue to store the return value. May be %NULL
+ *   if the callback of closure doesn't return a value.
+ * @n_param_values: The length of the @param_values array.
+ * @param_values: An array of #GValues holding the arguments
+ *   on which to invoke the callback of closure.
+ * @invocation_hint: The invocation hint given as the last argument to
+ *   g_closure_invoke().
+ * @marshal_data: Additional data specified when registering the
+ *   marshaller, see g_closure_set_marshal() and
+ *   g_closure_set_meta_marshal()
+ *
+ * A #GClosureMarshal function for use with signals with a single
+ * integer argument.
+ */
+/* VOID:INT */
 void
 g_cclosure_marshal_VOID__INT (GClosure     *closure,
                               GValue       *return_value G_GNUC_UNUSED,
@@ -1163,6 +541,24 @@ g_cclosure_marshal_VOID__INT (GClosure     *closure,
             g_marshal_value_peek_int (param_values + 1),
             data2);
 }
+
+/**
+ * g_cclosure_marshal_VOID__INTv:
+ * @closure: the #GClosure to which the marshaller belongs
+ * @return_value: (nullable): a #GValue to store the return
+ *  value. May be %NULL if the callback of @closure doesn't return a
+ *  value.
+ * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
+ * @args: va_list of arguments to be passed to the closure.
+ * @marshal_data: (nullable): additional data specified when
+ *  registering the marshaller, see g_closure_set_marshal() and
+ *  g_closure_set_meta_marshal()
+ * @n_params: the length of the @param_types array
+ * @param_types: (array length=n_params): the #GType of each argument from
+ *  @args.
+ *
+ * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__INT().
+ */
 void
 g_cclosure_marshal_VOID__INTv (GClosure     *closure,
                                GValue       *return_value,
@@ -1202,8 +598,24 @@ g_cclosure_marshal_VOID__INTv (GClosure     *closure,
             data2);
 }
 
-
-/* VOID:UINT (./gmarshal.list:11) */
+/**
+ * g_cclosure_marshal_VOID__UINT:
+ * @closure: A #GClosure.
+ * @return_value: A #GValue to store the return value. May be %NULL
+ *   if the callback of closure doesn't return a value.
+ * @n_param_values: The length of the @param_values array.
+ * @param_values: An array of #GValues holding the arguments
+ *   on which to invoke the callback of closure.
+ * @invocation_hint: The invocation hint given as the last argument to
+ *   g_closure_invoke().
+ * @marshal_data: Additional data specified when registering the
+ *   marshaller, see g_closure_set_marshal() and
+ *   g_closure_set_meta_marshal()
+ *
+ * A #GClosureMarshal function for use with signals with with a single
+ * unsigned integer argument.
+ */
+/* VOID:UINT */
 void
 g_cclosure_marshal_VOID__UINT (GClosure     *closure,
                                GValue       *return_value G_GNUC_UNUSED,
@@ -1237,6 +649,24 @@ g_cclosure_marshal_VOID__UINT (GClosure     *closure,
             g_marshal_value_peek_uint (param_values + 1),
             data2);
 }
+
+/**
+ * g_cclosure_marshal_VOID__UINTv:
+ * @closure: the #GClosure to which the marshaller belongs
+ * @return_value: (nullable): a #GValue to store the return
+ *  value. May be %NULL if the callback of @closure doesn't return a
+ *  value.
+ * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
+ * @args: va_list of arguments to be passed to the closure.
+ * @marshal_data: (nullable): additional data specified when
+ *  registering the marshaller, see g_closure_set_marshal() and
+ *  g_closure_set_meta_marshal()
+ * @n_params: the length of the @param_types array
+ * @param_types: (array length=n_params): the #GType of each argument from
+ *  @args.
+ *
+ * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__UINT().
+ */
 void
 g_cclosure_marshal_VOID__UINTv (GClosure     *closure,
                                 GValue       *return_value,
@@ -1276,8 +706,24 @@ g_cclosure_marshal_VOID__UINTv (GClosure     *closure,
             data2);
 }
 
-
-/* VOID:LONG (./gmarshal.list:12) */
+/**
+ * g_cclosure_marshal_VOID__LONG:
+ * @closure: A #GClosure.
+ * @return_value: A #GValue to store the return value. May be %NULL
+ *   if the callback of closure doesn't return a value.
+ * @n_param_values: The length of the @param_values array.
+ * @param_values: An array of #GValues holding the arguments
+ *   on which to invoke the callback of closure.
+ * @invocation_hint: The invocation hint given as the last argument to
+ *   g_closure_invoke().
+ * @marshal_data: Additional data specified when registering the
+ *   marshaller, see g_closure_set_marshal() and
+ *   g_closure_set_meta_marshal()
+ *
+ * A #GClosureMarshal function for use with signals with with a single
+ * long integer argument.
+ */
+/* VOID:LONG */
 void
 g_cclosure_marshal_VOID__LONG (GClosure     *closure,
                                GValue       *return_value G_GNUC_UNUSED,
@@ -1311,6 +757,24 @@ g_cclosure_marshal_VOID__LONG (GClosure     *closure,
             g_marshal_value_peek_long (param_values + 1),
             data2);
 }
+
+/**
+ * g_cclosure_marshal_VOID__LONGv:
+ * @closure: the #GClosure to which the marshaller belongs
+ * @return_value: (nullable): a #GValue to store the return
+ *  value. May be %NULL if the callback of @closure doesn't return a
+ *  value.
+ * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
+ * @args: va_list of arguments to be passed to the closure.
+ * @marshal_data: (nullable): additional data specified when
+ *  registering the marshaller, see g_closure_set_marshal() and
+ *  g_closure_set_meta_marshal()
+ * @n_params: the length of the @param_types array
+ * @param_types: (array length=n_params): the #GType of each argument from
+ *  @args.
+ *
+ * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__LONG().
+ */
 void
 g_cclosure_marshal_VOID__LONGv (GClosure     *closure,
                                 GValue       *return_value,
@@ -1350,8 +814,24 @@ g_cclosure_marshal_VOID__LONGv (GClosure     *closure,
             data2);
 }
 
-
-/* VOID:ULONG (./gmarshal.list:13) */
+/**
+ * g_cclosure_marshal_VOID__ULONG:
+ * @closure: A #GClosure.
+ * @return_value: A #GValue to store the return value. May be %NULL
+ *   if the callback of closure doesn't return a value.
+ * @n_param_values: The length of the @param_values array.
+ * @param_values: An array of #GValues holding the arguments
+ *   on which to invoke the callback of closure.
+ * @invocation_hint: The invocation hint given as the last argument to
+ *   g_closure_invoke().
+ * @marshal_data: Additional data specified when registering the
+ *   marshaller, see g_closure_set_marshal() and
+ *   g_closure_set_meta_marshal()
+ *
+ * A #GClosureMarshal function for use with signals with a single
+ * unsigned long integer argument.
+ */
+/* VOID:ULONG */
 void
 g_cclosure_marshal_VOID__ULONG (GClosure     *closure,
                                 GValue       *return_value G_GNUC_UNUSED,
@@ -1385,6 +865,24 @@ g_cclosure_marshal_VOID__ULONG (GClosure     *closure,
             g_marshal_value_peek_ulong (param_values + 1),
             data2);
 }
+
+/**
+ * g_cclosure_marshal_VOID__ULONGv:
+ * @closure: the #GClosure to which the marshaller belongs
+ * @return_value: (nullable): a #GValue to store the return
+ *  value. May be %NULL if the callback of @closure doesn't return a
+ *  value.
+ * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
+ * @args: va_list of arguments to be passed to the closure.
+ * @marshal_data: (nullable): additional data specified when
+ *  registering the marshaller, see g_closure_set_marshal() and
+ *  g_closure_set_meta_marshal()
+ * @n_params: the length of the @param_types array
+ * @param_types: (array length=n_params): the #GType of each argument from
+ *  @args.
+ *
+ * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__ULONG().
+ */
 void
 g_cclosure_marshal_VOID__ULONGv (GClosure     *closure,
                                  GValue       *return_value,
@@ -1424,8 +922,24 @@ g_cclosure_marshal_VOID__ULONGv (GClosure     *closure,
             data2);
 }
 
-
-/* VOID:ENUM (./gmarshal.list:14) */
+/**
+ * g_cclosure_marshal_VOID__ENUM:
+ * @closure: A #GClosure.
+ * @return_value: A #GValue to store the return value. May be %NULL
+ *   if the callback of closure doesn't return a value.
+ * @n_param_values: The length of the @param_values array.
+ * @param_values: An array of #GValues holding the arguments
+ *   on which to invoke the callback of closure.
+ * @invocation_hint: The invocation hint given as the last argument to
+ *   g_closure_invoke().
+ * @marshal_data: Additional data specified when registering the
+ *   marshaller, see g_closure_set_marshal() and
+ *   g_closure_set_meta_marshal()
+ *
+ * A #GClosureMarshal function for use with signals with a single
+ * argument with an enumerated type.
+ */
+/* VOID:ENUM */
 void
 g_cclosure_marshal_VOID__ENUM (GClosure     *closure,
                                GValue       *return_value G_GNUC_UNUSED,
@@ -1459,6 +973,24 @@ g_cclosure_marshal_VOID__ENUM (GClosure     *closure,
             g_marshal_value_peek_enum (param_values + 1),
             data2);
 }
+
+/**
+ * g_cclosure_marshal_VOID__ENUMv:
+ * @closure: the #GClosure to which the marshaller belongs
+ * @return_value: (nullable): a #GValue to store the return
+ *  value. May be %NULL if the callback of @closure doesn't return a
+ *  value.
+ * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
+ * @args: va_list of arguments to be passed to the closure.
+ * @marshal_data: (nullable): additional data specified when
+ *  registering the marshaller, see g_closure_set_marshal() and
+ *  g_closure_set_meta_marshal()
+ * @n_params: the length of the @param_types array
+ * @param_types: (array length=n_params): the #GType of each argument from
+ *  @args.
+ *
+ * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__ENUM().
+ */
 void
 g_cclosure_marshal_VOID__ENUMv (GClosure     *closure,
                                 GValue       *return_value,
@@ -1498,8 +1030,24 @@ g_cclosure_marshal_VOID__ENUMv (GClosure     *closure,
             data2);
 }
 
-
-/* VOID:FLAGS (./gmarshal.list:15) */
+/**
+ * g_cclosure_marshal_VOID__FLAGS:
+ * @closure: A #GClosure.
+ * @return_value: A #GValue to store the return value. May be %NULL
+ *   if the callback of closure doesn't return a value.
+ * @n_param_values: The length of the @param_values array.
+ * @param_values: An array of #GValues holding the arguments
+ *   on which to invoke the callback of closure.
+ * @invocation_hint: The invocation hint given as the last argument to
+ *   g_closure_invoke().
+ * @marshal_data: Additional data specified when registering the
+ *   marshaller, see g_closure_set_marshal() and
+ *   g_closure_set_meta_marshal()
+ *
+ * A #GClosureMarshal function for use with signals with a single
+ * argument with a flags types.
+ */
+/* VOID:FLAGS */
 void
 g_cclosure_marshal_VOID__FLAGS (GClosure     *closure,
                                 GValue       *return_value G_GNUC_UNUSED,
@@ -1533,6 +1081,24 @@ g_cclosure_marshal_VOID__FLAGS (GClosure     *closure,
             g_marshal_value_peek_flags (param_values + 1),
             data2);
 }
+
+/**
+ * g_cclosure_marshal_VOID__FLAGSv:
+ * @closure: the #GClosure to which the marshaller belongs
+ * @return_value: (nullable): a #GValue to store the return
+ *  value. May be %NULL if the callback of @closure doesn't return a
+ *  value.
+ * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
+ * @args: va_list of arguments to be passed to the closure.
+ * @marshal_data: (nullable): additional data specified when
+ *  registering the marshaller, see g_closure_set_marshal() and
+ *  g_closure_set_meta_marshal()
+ * @n_params: the length of the @param_types array
+ * @param_types: (array length=n_params): the #GType of each argument from
+ *  @args.
+ *
+ * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__FLAGS().
+ */
 void
 g_cclosure_marshal_VOID__FLAGSv (GClosure     *closure,
                                  GValue       *return_value,
@@ -1572,8 +1138,24 @@ g_cclosure_marshal_VOID__FLAGSv (GClosure     *closure,
             data2);
 }
 
-
-/* VOID:FLOAT (./gmarshal.list:16) */
+/**
+ * g_cclosure_marshal_VOID__FLOAT:
+ * @closure: A #GClosure.
+ * @return_value: A #GValue to store the return value. May be %NULL
+ *   if the callback of closure doesn't return a value.
+ * @n_param_values: The length of the @param_values array.
+ * @param_values: An array of #GValues holding the arguments
+ *   on which to invoke the callback of closure.
+ * @invocation_hint: The invocation hint given as the last argument to
+ *   g_closure_invoke().
+ * @marshal_data: Additional data specified when registering the
+ *   marshaller, see g_closure_set_marshal() and
+ *   g_closure_set_meta_marshal()
+ *
+ * A #GClosureMarshal function for use with signals with one
+ * single-precision floating point argument.
+ */
+/* VOID:FLOAT */
 void
 g_cclosure_marshal_VOID__FLOAT (GClosure     *closure,
                                 GValue       *return_value G_GNUC_UNUSED,
@@ -1607,6 +1189,24 @@ g_cclosure_marshal_VOID__FLOAT (GClosure     *closure,
             g_marshal_value_peek_float (param_values + 1),
             data2);
 }
+
+/**
+ * g_cclosure_marshal_VOID__FLOATv:
+ * @closure: the #GClosure to which the marshaller belongs
+ * @return_value: (nullable): a #GValue to store the return
+ *  value. May be %NULL if the callback of @closure doesn't return a
+ *  value.
+ * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
+ * @args: va_list of arguments to be passed to the closure.
+ * @marshal_data: (nullable): additional data specified when
+ *  registering the marshaller, see g_closure_set_marshal() and
+ *  g_closure_set_meta_marshal()
+ * @n_params: the length of the @param_types array
+ * @param_types: (array length=n_params): the #GType of each argument from
+ *  @args.
+ *
+ * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__FLOAT().
+ */
 void
 g_cclosure_marshal_VOID__FLOATv (GClosure     *closure,
                                  GValue       *return_value,
@@ -1646,8 +1246,24 @@ g_cclosure_marshal_VOID__FLOATv (GClosure     *closure,
             data2);
 }
 
-
-/* VOID:DOUBLE (./gmarshal.list:17) */
+/**
+ * g_cclosure_marshal_VOID__DOUBLE:
+ * @closure: A #GClosure.
+ * @return_value: A #GValue to store the return value. May be %NULL
+ *   if the callback of closure doesn't return a value.
+ * @n_param_values: The length of the @param_values array.
+ * @param_values: An array of #GValues holding the arguments
+ *   on which to invoke the callback of closure.
+ * @invocation_hint: The invocation hint given as the last argument to
+ *   g_closure_invoke().
+ * @marshal_data: Additional data specified when registering the
+ *   marshaller, see g_closure_set_marshal() and
+ *   g_closure_set_meta_marshal()
+ *
+ * A #GClosureMarshal function for use with signals with one
+ * double-precision floating point argument.
+ */
+/* VOID:DOUBLE */
 void
 g_cclosure_marshal_VOID__DOUBLE (GClosure     *closure,
                                  GValue       *return_value G_GNUC_UNUSED,
@@ -1681,6 +1297,24 @@ g_cclosure_marshal_VOID__DOUBLE (GClosure     *closure,
             g_marshal_value_peek_double (param_values + 1),
             data2);
 }
+
+/**
+ * g_cclosure_marshal_VOID__DOUBLEv:
+ * @closure: the #GClosure to which the marshaller belongs
+ * @return_value: (nullable): a #GValue to store the return
+ *  value. May be %NULL if the callback of @closure doesn't return a
+ *  value.
+ * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
+ * @args: va_list of arguments to be passed to the closure.
+ * @marshal_data: (nullable): additional data specified when
+ *  registering the marshaller, see g_closure_set_marshal() and
+ *  g_closure_set_meta_marshal()
+ * @n_params: the length of the @param_types array
+ * @param_types: (array length=n_params): the #GType of each argument from
+ *  @args.
+ *
+ * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__DOUBLE().
+ */
 void
 g_cclosure_marshal_VOID__DOUBLEv (GClosure     *closure,
                                   GValue       *return_value,
@@ -1720,8 +1354,24 @@ g_cclosure_marshal_VOID__DOUBLEv (GClosure     *closure,
             data2);
 }
 
-
-/* VOID:STRING (./gmarshal.list:18) */
+/**
+ * g_cclosure_marshal_VOID__STRING:
+ * @closure: A #GClosure.
+ * @return_value: A #GValue to store the return value. May be %NULL
+ *   if the callback of closure doesn't return a value.
+ * @n_param_values: The length of the @param_values array.
+ * @param_values: An array of #GValues holding the arguments
+ *   on which to invoke the callback of closure.
+ * @invocation_hint: The invocation hint given as the last argument to
+ *   g_closure_invoke().
+ * @marshal_data: Additional data specified when registering the
+ *   marshaller, see g_closure_set_marshal() and
+ *   g_closure_set_meta_marshal()
+ *
+ * A #GClosureMarshal function for use with signals with a single string
+ * argument.
+ */
+/* VOID:STRING */
 void
 g_cclosure_marshal_VOID__STRING (GClosure     *closure,
                                  GValue       *return_value G_GNUC_UNUSED,
@@ -1755,6 +1405,24 @@ g_cclosure_marshal_VOID__STRING (GClosure     *closure,
             g_marshal_value_peek_string (param_values + 1),
             data2);
 }
+
+/**
+ * g_cclosure_marshal_VOID__STRINGv:
+ * @closure: the #GClosure to which the marshaller belongs
+ * @return_value: (nullable): a #GValue to store the return
+ *  value. May be %NULL if the callback of @closure doesn't return a
+ *  value.
+ * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
+ * @args: va_list of arguments to be passed to the closure.
+ * @marshal_data: (nullable): additional data specified when
+ *  registering the marshaller, see g_closure_set_marshal() and
+ *  g_closure_set_meta_marshal()
+ * @n_params: the length of the @param_types array
+ * @param_types: (array length=n_params): the #GType of each argument from
+ *  @args.
+ *
+ * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__STRING().
+ */
 void
 g_cclosure_marshal_VOID__STRINGv (GClosure     *closure,
                                   GValue       *return_value,
@@ -1798,8 +1466,24 @@ g_cclosure_marshal_VOID__STRINGv (GClosure     *closure,
     g_free (arg0);
 }
 
-
-/* VOID:PARAM (./gmarshal.list:19) */
+/**
+ * g_cclosure_marshal_VOID__PARAM:
+ * @closure: A #GClosure.
+ * @return_value: A #GValue to store the return value. May be %NULL
+ *   if the callback of closure doesn't return a value.
+ * @n_param_values: The length of the @param_values array.
+ * @param_values: An array of #GValues holding the arguments
+ *   on which to invoke the callback of closure.
+ * @invocation_hint: The invocation hint given as the last argument to
+ *   g_closure_invoke().
+ * @marshal_data: Additional data specified when registering the
+ *   marshaller, see g_closure_set_marshal() and
+ *   g_closure_set_meta_marshal()
+ *
+ * A #GClosureMarshal function for use with signals with a single
+ * argument of type #GParamSpec.
+ */
+/* VOID:PARAM */
 void
 g_cclosure_marshal_VOID__PARAM (GClosure     *closure,
                                 GValue       *return_value G_GNUC_UNUSED,
@@ -1833,6 +1517,24 @@ g_cclosure_marshal_VOID__PARAM (GClosure     *closure,
             g_marshal_value_peek_param (param_values + 1),
             data2);
 }
+
+/**
+ * g_cclosure_marshal_VOID__PARAMv:
+ * @closure: the #GClosure to which the marshaller belongs
+ * @return_value: (nullable): a #GValue to store the return
+ *  value. May be %NULL if the callback of @closure doesn't return a
+ *  value.
+ * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
+ * @args: va_list of arguments to be passed to the closure.
+ * @marshal_data: (nullable): additional data specified when
+ *  registering the marshaller, see g_closure_set_marshal() and
+ *  g_closure_set_meta_marshal()
+ * @n_params: the length of the @param_types array
+ * @param_types: (array length=n_params): the #GType of each argument from
+ *  @args.
+ *
+ * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__PARAM().
+ */
 void
 g_cclosure_marshal_VOID__PARAMv (GClosure     *closure,
                                  GValue       *return_value,
@@ -1876,8 +1578,24 @@ g_cclosure_marshal_VOID__PARAMv (GClosure     *closure,
     g_param_spec_unref (arg0);
 }
 
-
-/* VOID:BOXED (./gmarshal.list:20) */
+/**
+ * g_cclosure_marshal_VOID__BOXED:
+ * @closure: A #GClosure.
+ * @return_value: A #GValue to store the return value. May be %NULL
+ *   if the callback of closure doesn't return a value.
+ * @n_param_values: The length of the @param_values array.
+ * @param_values: An array of #GValues holding the arguments
+ *   on which to invoke the callback of closure.
+ * @invocation_hint: The invocation hint given as the last argument to
+ *   g_closure_invoke().
+ * @marshal_data: Additional data specified when registering the
+ *   marshaller, see g_closure_set_marshal() and
+ *   g_closure_set_meta_marshal()
+ *
+ * A #GClosureMarshal function for use with signals with a single
+ * argument which is any boxed pointer type.
+ */
+/* VOID:BOXED */
 void
 g_cclosure_marshal_VOID__BOXED (GClosure     *closure,
                                 GValue       *return_value G_GNUC_UNUSED,
@@ -1911,6 +1629,24 @@ g_cclosure_marshal_VOID__BOXED (GClosure     *closure,
             g_marshal_value_peek_boxed (param_values + 1),
             data2);
 }
+
+/**
+ * g_cclosure_marshal_VOID__BOXEDv:
+ * @closure: the #GClosure to which the marshaller belongs
+ * @return_value: (nullable): a #GValue to store the return
+ *  value. May be %NULL if the callback of @closure doesn't return a
+ *  value.
+ * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
+ * @args: va_list of arguments to be passed to the closure.
+ * @marshal_data: (nullable): additional data specified when
+ *  registering the marshaller, see g_closure_set_marshal() and
+ *  g_closure_set_meta_marshal()
+ * @n_params: the length of the @param_types array
+ * @param_types: (array length=n_params): the #GType of each argument from
+ *  @args.
+ *
+ * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__BOXED().
+ */
 void
 g_cclosure_marshal_VOID__BOXEDv (GClosure     *closure,
                                  GValue       *return_value,
@@ -1954,8 +1690,28 @@ g_cclosure_marshal_VOID__BOXEDv (GClosure     *closure,
     g_boxed_free (param_types[0] & ~G_SIGNAL_TYPE_STATIC_SCOPE, arg0);
 }
 
-
-/* VOID:POINTER (./gmarshal.list:21) */
+/**
+ * g_cclosure_marshal_VOID__POINTER:
+ * @closure: A #GClosure.
+ * @return_value: A #GValue to store the return value. May be %NULL
+ *   if the callback of closure doesn't return a value.
+ * @n_param_values: The length of the @param_values array.
+ * @param_values: An array of #GValues holding the arguments
+ *   on which to invoke the callback of closure.
+ * @invocation_hint: The invocation hint given as the last argument to
+ *   g_closure_invoke().
+ * @marshal_data: Additional data specified when registering the
+ *   marshaller, see g_closure_set_marshal() and
+ *   g_closure_set_meta_marshal()
+ *
+ * A #GClosureMarshal function for use with signals with a single raw
+ * pointer argument type.
+ *
+ * If it is possible, it is better to use one of the more specific
+ * functions such as g_cclosure_marshal_VOID__OBJECT() or
+ * g_cclosure_marshal_VOID__OBJECT().
+ */
+/* VOID:POINTER */
 void
 g_cclosure_marshal_VOID__POINTER (GClosure     *closure,
                                   GValue       *return_value G_GNUC_UNUSED,
@@ -1989,6 +1745,24 @@ g_cclosure_marshal_VOID__POINTER (GClosure     *closure,
             g_marshal_value_peek_pointer (param_values + 1),
             data2);
 }
+
+/**
+ * g_cclosure_marshal_VOID__POINTERv:
+ * @closure: the #GClosure to which the marshaller belongs
+ * @return_value: (nullable): a #GValue to store the return
+ *  value. May be %NULL if the callback of @closure doesn't return a
+ *  value.
+ * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
+ * @args: va_list of arguments to be passed to the closure.
+ * @marshal_data: (nullable): additional data specified when
+ *  registering the marshaller, see g_closure_set_marshal() and
+ *  g_closure_set_meta_marshal()
+ * @n_params: the length of the @param_types array
+ * @param_types: (array length=n_params): the #GType of each argument from
+ *  @args.
+ *
+ * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__POINTER().
+ */
 void
 g_cclosure_marshal_VOID__POINTERv (GClosure     *closure,
                                    GValue       *return_value,
@@ -2028,8 +1802,24 @@ g_cclosure_marshal_VOID__POINTERv (GClosure     *closure,
             data2);
 }
 
-
-/* VOID:OBJECT (./gmarshal.list:22) */
+/**
+ * g_cclosure_marshal_VOID__OBJECT:
+ * @closure: A #GClosure.
+ * @return_value: A #GValue to store the return value. May be %NULL
+ *   if the callback of closure doesn't return a value.
+ * @n_param_values: The length of the @param_values array.
+ * @param_values: An array of #GValues holding the arguments
+ *   on which to invoke the callback of closure.
+ * @invocation_hint: The invocation hint given as the last argument to
+ *   g_closure_invoke().
+ * @marshal_data: Additional data specified when registering the
+ *   marshaller, see g_closure_set_marshal() and
+ *   g_closure_set_meta_marshal()
+ *
+ * A #GClosureMarshal function for use with signals with a single
+ * #GObject argument.
+ */
+/* VOID:OBJECT */
 void
 g_cclosure_marshal_VOID__OBJECT (GClosure     *closure,
                                  GValue       *return_value G_GNUC_UNUSED,
@@ -2063,6 +1853,24 @@ g_cclosure_marshal_VOID__OBJECT (GClosure     *closure,
             g_marshal_value_peek_object (param_values + 1),
             data2);
 }
+
+/**
+ * g_cclosure_marshal_VOID__OBJECTv:
+ * @closure: the #GClosure to which the marshaller belongs
+ * @return_value: (nullable): a #GValue to store the return
+ *  value. May be %NULL if the callback of @closure doesn't return a
+ *  value.
+ * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
+ * @args: va_list of arguments to be passed to the closure.
+ * @marshal_data: (nullable): additional data specified when
+ *  registering the marshaller, see g_closure_set_marshal() and
+ *  g_closure_set_meta_marshal()
+ * @n_params: the length of the @param_types array
+ * @param_types: (array length=n_params): the #GType of each argument from
+ *  @args.
+ *
+ * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__OBJECT().
+ */
 void
 g_cclosure_marshal_VOID__OBJECTv (GClosure     *closure,
                                   GValue       *return_value,
@@ -2106,8 +1914,24 @@ g_cclosure_marshal_VOID__OBJECTv (GClosure     *closure,
     g_object_unref (arg0);
 }
 
-
-/* VOID:VARIANT (./gmarshal.list:23) */
+/**
+ * g_cclosure_marshal_VOID__VARIANT:
+ * @closure: A #GClosure.
+ * @return_value: A #GValue to store the return value. May be %NULL
+ *   if the callback of closure doesn't return a value.
+ * @n_param_values: The length of the @param_values array.
+ * @param_values: An array of #GValues holding the arguments
+ *   on which to invoke the callback of closure.
+ * @invocation_hint: The invocation hint given as the last argument to
+ *   g_closure_invoke().
+ * @marshal_data: Additional data specified when registering the
+ *   marshaller, see g_closure_set_marshal() and
+ *   g_closure_set_meta_marshal()
+ *
+ * A #GClosureMarshal function for use with signals with a single
+ * #GVariant argument.
+ */
+/* VOID:VARIANT */
 void
 g_cclosure_marshal_VOID__VARIANT (GClosure     *closure,
                                   GValue       *return_value G_GNUC_UNUSED,
@@ -2141,6 +1965,24 @@ g_cclosure_marshal_VOID__VARIANT (GClosure     *closure,
             g_marshal_value_peek_variant (param_values + 1),
             data2);
 }
+
+/**
+ * g_cclosure_marshal_VOID__VARIANTv:
+ * @closure: the #GClosure to which the marshaller belongs
+ * @return_value: (nullable): a #GValue to store the return
+ *  value. May be %NULL if the callback of @closure doesn't return a
+ *  value.
+ * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
+ * @args: va_list of arguments to be passed to the closure.
+ * @marshal_data: (nullable): additional data specified when
+ *  registering the marshaller, see g_closure_set_marshal() and
+ *  g_closure_set_meta_marshal()
+ * @n_params: the length of the @param_types array
+ * @param_types: (array length=n_params): the #GType of each argument from
+ *  @args.
+ *
+ * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__VARIANT().
+ */
 void
 g_cclosure_marshal_VOID__VARIANTv (GClosure     *closure,
                                    GValue       *return_value,
@@ -2184,8 +2026,24 @@ g_cclosure_marshal_VOID__VARIANTv (GClosure     *closure,
     g_variant_unref (arg0);
 }
 
-
-/* VOID:UINT,POINTER (./gmarshal.list:26) */
+/**
+ * g_cclosure_marshal_VOID__UINT_POINTER:
+ * @closure: A #GClosure.
+ * @return_value: A #GValue to store the return value. May be %NULL
+ *   if the callback of closure doesn't return a value.
+ * @n_param_values: The length of the @param_values array.
+ * @param_values: An array of #GValues holding the arguments
+ *   on which to invoke the callback of closure.
+ * @invocation_hint: The invocation hint given as the last argument to
+ *   g_closure_invoke().
+ * @marshal_data: Additional data specified when registering the
+ *   marshaller, see g_closure_set_marshal() and
+ *   g_closure_set_meta_marshal()
+ *
+ * A #GClosureMarshal function for use with signals with a unsigned int
+ * and a pointer as arguments.
+ */
+/* VOID:UINT,POINTER */
 void
 g_cclosure_marshal_VOID__UINT_POINTER (GClosure     *closure,
                                        GValue       *return_value G_GNUC_UNUSED,
@@ -2221,6 +2079,24 @@ g_cclosure_marshal_VOID__UINT_POINTER (GClosure     *closure,
             g_marshal_value_peek_pointer (param_values + 2),
             data2);
 }
+
+/**
+ * g_cclosure_marshal_VOID__UINT_POINTERv:
+ * @closure: the #GClosure to which the marshaller belongs
+ * @return_value: (nullable): a #GValue to store the return
+ *  value. May be %NULL if the callback of @closure doesn't return a
+ *  value.
+ * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
+ * @args: va_list of arguments to be passed to the closure.
+ * @marshal_data: (nullable): additional data specified when
+ *  registering the marshaller, see g_closure_set_marshal() and
+ *  g_closure_set_meta_marshal()
+ * @n_params: the length of the @param_types array
+ * @param_types: (array length=n_params): the #GType of each argument from
+ *  @args.
+ *
+ * The #GVaClosureMarshal equivalent to g_cclosure_marshal_VOID__UINT_POINTER().
+ */
 void
 g_cclosure_marshal_VOID__UINT_POINTERv (GClosure     *closure,
                                         GValue       *return_value,
@@ -2264,8 +2140,26 @@ g_cclosure_marshal_VOID__UINT_POINTERv (GClosure     *closure,
             data2);
 }
 
-
-/* BOOL:FLAGS (./gmarshal.list:27) */
+/**
+ * g_cclosure_marshal_BOOLEAN__FLAGS:
+ * @closure: A #GClosure.
+ * @return_value: A #GValue to store the return value. May be %NULL
+ *   if the callback of closure doesn't return a value.
+ * @n_param_values: The length of the @param_values array.
+ * @param_values: An array of #GValues holding the arguments
+ *   on which to invoke the callback of closure.
+ * @invocation_hint: The invocation hint given as the last argument to
+ *   g_closure_invoke().
+ * @marshal_data: Additional data specified when registering the
+ *   marshaller, see g_closure_set_marshal() and
+ *   g_closure_set_meta_marshal()
+ *
+ * A #GClosureMarshal function for use with signals with handlers that
+ * take a flags type as an argument and return a boolean.  If you have
+ * such a signal, you will probably also need to use an accumulator,
+ * such as g_signal_accumulator_true_handled().
+ */
+/* BOOL:FLAGS */
 void
 g_cclosure_marshal_BOOLEAN__FLAGS (GClosure     *closure,
                                    GValue       *return_value G_GNUC_UNUSED,
@@ -2303,6 +2197,24 @@ g_cclosure_marshal_BOOLEAN__FLAGS (GClosure     *closure,
 
   g_value_set_boolean (return_value, v_return);
 }
+
+/**
+ * g_cclosure_marshal_BOOLEAN__FLAGSv:
+ * @closure: the #GClosure to which the marshaller belongs
+ * @return_value: (nullable): a #GValue to store the return
+ *  value. May be %NULL if the callback of @closure doesn't return a
+ *  value.
+ * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
+ * @args: va_list of arguments to be passed to the closure.
+ * @marshal_data: (nullable): additional data specified when
+ *  registering the marshaller, see g_closure_set_marshal() and
+ *  g_closure_set_meta_marshal()
+ * @n_params: the length of the @param_types array
+ * @param_types: (array length=n_params): the #GType of each argument from
+ *  @args.
+ *
+ * The #GVaClosureMarshal equivalent to g_cclosure_marshal_BOOLEAN__FLAGS().
+ */
 void
 g_cclosure_marshal_BOOLEAN__FLAGSv (GClosure     *closure,
                                     GValue       *return_value,
@@ -2347,8 +2259,25 @@ g_cclosure_marshal_BOOLEAN__FLAGSv (GClosure     *closure,
   g_value_set_boolean (return_value, v_return);
 }
 
-
-/* STRING:OBJECT,POINTER (./gmarshal.list:28) */
+/**
+ * g_cclosure_marshal_STRING__OBJECT_POINTER:
+ * @closure: A #GClosure.
+ * @return_value: A #GValue to store the return value. May be %NULL
+ *   if the callback of closure doesn't return a value.
+ * @n_param_values: The length of the @param_values array.
+ * @param_values: An array of #GValues holding the arguments
+ *   on which to invoke the callback of closure.
+ * @invocation_hint: The invocation hint given as the last argument to
+ *   g_closure_invoke().
+ * @marshal_data: Additional data specified when registering the
+ *   marshaller, see g_closure_set_marshal() and
+ *   g_closure_set_meta_marshal()
+ *
+ * A #GClosureMarshal function for use with signals with handlers that
+ * take a #GObject and a pointer and produce a string.  It is highly
+ * unlikely that your signal handler fits this description.
+ */
+/* STRING:OBJECT,POINTER */
 void
 g_cclosure_marshal_STRING__OBJECT_POINTER (GClosure     *closure,
                                            GValue       *return_value G_GNUC_UNUSED,
@@ -2388,6 +2317,24 @@ g_cclosure_marshal_STRING__OBJECT_POINTER (GClosure     *closure,
 
   g_value_take_string (return_value, v_return);
 }
+
+/**
+ * g_cclosure_marshal_STRING__OBJECT_POINTERv:
+ * @closure: the #GClosure to which the marshaller belongs
+ * @return_value: (nullable): a #GValue to store the return
+ *  value. May be %NULL if the callback of @closure doesn't return a
+ *  value.
+ * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
+ * @args: va_list of arguments to be passed to the closure.
+ * @marshal_data: (nullable): additional data specified when
+ *  registering the marshaller, see g_closure_set_marshal() and
+ *  g_closure_set_meta_marshal()
+ * @n_params: the length of the @param_types array
+ * @param_types: (array length=n_params): the #GType of each argument from
+ *  @args.
+ *
+ * The #GVaClosureMarshal equivalent to g_cclosure_marshal_STRING__OBJECT_POINTER().
+ */
 void
 g_cclosure_marshal_STRING__OBJECT_POINTERv (GClosure     *closure,
                                             GValue       *return_value,
@@ -2440,8 +2387,26 @@ g_cclosure_marshal_STRING__OBJECT_POINTERv (GClosure     *closure,
   g_value_take_string (return_value, v_return);
 }
 
-
-/* BOOL:BOXED,BOXED (./gmarshal.list:29) */
+/**
+ * g_cclosure_marshal_BOOLEAN__BOXED_BOXED:
+ * @closure: A #GClosure.
+ * @return_value: A #GValue to store the return value. May be %NULL
+ *   if the callback of closure doesn't return a value.
+ * @n_param_values: The length of the @param_values array.
+ * @param_values: An array of #GValues holding the arguments
+ *   on which to invoke the callback of closure.
+ * @invocation_hint: The invocation hint given as the last argument to
+ *   g_closure_invoke().
+ * @marshal_data: Additional data specified when registering the
+ *   marshaller, see g_closure_set_marshal() and
+ *   g_closure_set_meta_marshal()
+ *
+ * A #GClosureMarshal function for use with signals with handlers that
+ * take two boxed pointers as arguments and return a boolean.  If you
+ * have such a signal, you will probably also need to use an
+ * accumulator, such as g_signal_accumulator_true_handled().
+ */
+/* BOOL:BOXED,BOXED */
 void
 g_cclosure_marshal_BOOLEAN__BOXED_BOXED (GClosure     *closure,
                                          GValue       *return_value G_GNUC_UNUSED,
@@ -2481,6 +2446,24 @@ g_cclosure_marshal_BOOLEAN__BOXED_BOXED (GClosure     *closure,
 
   g_value_set_boolean (return_value, v_return);
 }
+
+/**
+ * g_cclosure_marshal_BOOLEAN__BOXED_BOXEDv:
+ * @closure: the #GClosure to which the marshaller belongs
+ * @return_value: (nullable): a #GValue to store the return
+ *  value. May be %NULL if the callback of @closure doesn't return a
+ *  value.
+ * @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
+ * @args: va_list of arguments to be passed to the closure.
+ * @marshal_data: (nullable): additional data specified when
+ *  registering the marshaller, see g_closure_set_marshal() and
+ *  g_closure_set_meta_marshal()
+ * @n_params: the length of the @param_types array
+ * @param_types: (array length=n_params): the #GType of each argument from
+ *  @args.
+ *
+ * The #GVaClosureMarshal equivalent to g_cclosure_marshal_BOOLEAN__BOXED_BOXED().
+ */
 void
 g_cclosure_marshal_BOOLEAN__BOXED_BOXEDv (GClosure     *closure,
                                           GValue       *return_value,
@@ -2536,5 +2519,3 @@ g_cclosure_marshal_BOOLEAN__BOXED_BOXEDv (GClosure     *closure,
 
   g_value_set_boolean (return_value, v_return);
 }
-
-
diff --git a/gobject/gmarshal.h b/gobject/gmarshal.h
index d4fd76a14..fdd6c042e 100644
--- a/gobject/gmarshal.h
+++ b/gobject/gmarshal.h
@@ -1,10 +1,25 @@
-/* Note: This file is no longer generated.  See the comment in gmarshal.list */
+/* GObject - GLib Type, Object, Parameter and Signal Library
+ *
+ * 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.1 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, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef __G_MARSHAL_H__
 #define __G_MARSHAL_H__
 
 G_BEGIN_DECLS
 
-/* VOID:VOID (./gmarshal.list:6) */
+/* VOID:VOID */
 GLIB_AVAILABLE_IN_ALL
 void g_cclosure_marshal_VOID__VOID (GClosure     *closure,
                                     GValue       *return_value,
@@ -21,7 +36,7 @@ void g_cclosure_marshal_VOID__VOIDv (GClosure *closure,
                                      int       n_params,
                                      GType    *param_types);
 
-/* VOID:BOOLEAN (./gmarshal.list:7) */
+/* VOID:BOOLEAN */
 GLIB_AVAILABLE_IN_ALL
 void g_cclosure_marshal_VOID__BOOLEAN (GClosure     *closure,
                                        GValue       *return_value,
@@ -38,7 +53,7 @@ void g_cclosure_marshal_VOID__BOOLEANv (GClosure *closure,
                                         int       n_params,
                                         GType    *param_types);
 
-/* VOID:CHAR (./gmarshal.list:8) */
+/* VOID:CHAR */
 GLIB_AVAILABLE_IN_ALL
 void g_cclosure_marshal_VOID__CHAR (GClosure     *closure,
                                     GValue       *return_value,
@@ -55,7 +70,7 @@ void g_cclosure_marshal_VOID__CHARv (GClosure *closure,
                                      int       n_params,
                                      GType    *param_types);
 
-/* VOID:UCHAR (./gmarshal.list:9) */
+/* VOID:UCHAR */
 GLIB_AVAILABLE_IN_ALL
 void g_cclosure_marshal_VOID__UCHAR (GClosure     *closure,
                                      GValue       *return_value,
@@ -72,7 +87,7 @@ void g_cclosure_marshal_VOID__UCHARv (GClosure *closure,
                                       int       n_params,
                                       GType    *param_types);
 
-/* VOID:INT (./gmarshal.list:10) */
+/* VOID:INT */
 GLIB_AVAILABLE_IN_ALL
 void g_cclosure_marshal_VOID__INT (GClosure     *closure,
                                    GValue       *return_value,
@@ -89,7 +104,7 @@ void g_cclosure_marshal_VOID__INTv (GClosure *closure,
                                     int       n_params,
                                     GType    *param_types);
 
-/* VOID:UINT (./gmarshal.list:11) */
+/* VOID:UINT */
 GLIB_AVAILABLE_IN_ALL
 void g_cclosure_marshal_VOID__UINT (GClosure     *closure,
                                     GValue       *return_value,
@@ -106,7 +121,7 @@ void g_cclosure_marshal_VOID__UINTv (GClosure *closure,
                                      int       n_params,
                                      GType    *param_types);
 
-/* VOID:LONG (./gmarshal.list:12) */
+/* VOID:LONG */
 GLIB_AVAILABLE_IN_ALL
 void g_cclosure_marshal_VOID__LONG (GClosure     *closure,
                                     GValue       *return_value,
@@ -123,7 +138,7 @@ void g_cclosure_marshal_VOID__LONGv (GClosure *closure,
                                      int       n_params,
                                      GType    *param_types);
 
-/* VOID:ULONG (./gmarshal.list:13) */
+/* VOID:ULONG */
 GLIB_AVAILABLE_IN_ALL
 void g_cclosure_marshal_VOID__ULONG (GClosure     *closure,
                                      GValue       *return_value,
@@ -140,7 +155,7 @@ void g_cclosure_marshal_VOID__ULONGv (GClosure *closure,
                                       int       n_params,
                                       GType    *param_types);
 
-/* VOID:ENUM (./gmarshal.list:14) */
+/* VOID:ENUM */
 GLIB_AVAILABLE_IN_ALL
 void g_cclosure_marshal_VOID__ENUM (GClosure     *closure,
                                     GValue       *return_value,
@@ -157,7 +172,7 @@ void g_cclosure_marshal_VOID__ENUMv (GClosure *closure,
                                      int       n_params,
                                      GType    *param_types);
 
-/* VOID:FLAGS (./gmarshal.list:15) */
+/* VOID:FLAGS */
 GLIB_AVAILABLE_IN_ALL
 void g_cclosure_marshal_VOID__FLAGS (GClosure     *closure,
                                      GValue       *return_value,
@@ -174,7 +189,7 @@ void g_cclosure_marshal_VOID__FLAGSv (GClosure *closure,
                                       int       n_params,
                                       GType    *param_types);
 
-/* VOID:FLOAT (./gmarshal.list:16) */
+/* VOID:FLOAT */
 GLIB_AVAILABLE_IN_ALL
 void g_cclosure_marshal_VOID__FLOAT (GClosure     *closure,
                                      GValue       *return_value,
@@ -191,7 +206,7 @@ void g_cclosure_marshal_VOID__FLOATv (GClosure *closure,
                                       int       n_params,
                                       GType    *param_types);
 
-/* VOID:DOUBLE (./gmarshal.list:17) */
+/* VOID:DOUBLE */
 GLIB_AVAILABLE_IN_ALL
 void g_cclosure_marshal_VOID__DOUBLE (GClosure     *closure,
                                       GValue       *return_value,
@@ -208,7 +223,7 @@ void g_cclosure_marshal_VOID__DOUBLEv (GClosure *closure,
                                        int       n_params,
                                        GType    *param_types);
 
-/* VOID:STRING (./gmarshal.list:18) */
+/* VOID:STRING */
 GLIB_AVAILABLE_IN_ALL
 void g_cclosure_marshal_VOID__STRING (GClosure     *closure,
                                       GValue       *return_value,
@@ -225,7 +240,7 @@ void g_cclosure_marshal_VOID__STRINGv (GClosure *closure,
                                        int       n_params,
                                        GType    *param_types);
 
-/* VOID:PARAM (./gmarshal.list:19) */
+/* VOID:PARAM */
 GLIB_AVAILABLE_IN_ALL
 void g_cclosure_marshal_VOID__PARAM (GClosure     *closure,
                                      GValue       *return_value,
@@ -242,7 +257,7 @@ void g_cclosure_marshal_VOID__PARAMv (GClosure *closure,
                                       int       n_params,
                                       GType    *param_types);
 
-/* VOID:BOXED (./gmarshal.list:20) */
+/* VOID:BOXED */
 GLIB_AVAILABLE_IN_ALL
 void g_cclosure_marshal_VOID__BOXED (GClosure     *closure,
                                      GValue       *return_value,
@@ -259,7 +274,7 @@ void g_cclosure_marshal_VOID__BOXEDv (GClosure *closure,
                                       int       n_params,
                                       GType    *param_types);
 
-/* VOID:POINTER (./gmarshal.list:21) */
+/* VOID:POINTER */
 GLIB_AVAILABLE_IN_ALL
 void g_cclosure_marshal_VOID__POINTER (GClosure     *closure,
                                        GValue       *return_value,
@@ -276,7 +291,7 @@ void g_cclosure_marshal_VOID__POINTERv (GClosure *closure,
                                         int       n_params,
                                         GType    *param_types);
 
-/* VOID:OBJECT (./gmarshal.list:22) */
+/* VOID:OBJECT */
 GLIB_AVAILABLE_IN_ALL
 void g_cclosure_marshal_VOID__OBJECT (GClosure     *closure,
                                       GValue       *return_value,
@@ -293,7 +308,7 @@ void g_cclosure_marshal_VOID__OBJECTv (GClosure *closure,
                                        int       n_params,
                                        GType    *param_types);
 
-/* VOID:VARIANT (./gmarshal.list:23) */
+/* VOID:VARIANT */
 GLIB_AVAILABLE_IN_ALL
 void g_cclosure_marshal_VOID__VARIANT (GClosure     *closure,
                                        GValue       *return_value,
@@ -310,7 +325,7 @@ void g_cclosure_marshal_VOID__VARIANTv (GClosure *closure,
                                         int       n_params,
                                         GType    *param_types);
 
-/* VOID:UINT,POINTER (./gmarshal.list:26) */
+/* VOID:UINT,POINTER */
 GLIB_AVAILABLE_IN_ALL
 void g_cclosure_marshal_VOID__UINT_POINTER (GClosure     *closure,
                                             GValue       *return_value,
@@ -327,7 +342,7 @@ void g_cclosure_marshal_VOID__UINT_POINTERv (GClosure *closure,
                                              int       n_params,
                                              GType    *param_types);
 
-/* BOOL:FLAGS (./gmarshal.list:27) */
+/* BOOL:FLAGS */
 GLIB_AVAILABLE_IN_ALL
 void g_cclosure_marshal_BOOLEAN__FLAGS (GClosure     *closure,
                                         GValue       *return_value,
@@ -343,9 +358,26 @@ void g_cclosure_marshal_BOOLEAN__FLAGSv (GClosure *closure,
                                          gpointer  marshal_data,
                                          int       n_params,
                                          GType    *param_types);
+
+/**
+ * g_cclosure_marshal_BOOL__FLAGS:
+ * @closure: A #GClosure.
+ * @return_value: A #GValue to store the return value. May be %NULL
+ *   if the callback of closure doesn't return a value.
+ * @n_param_values: The length of the @param_values array.
+ * @param_values: An array of #GValues holding the arguments
+ *   on which to invoke the callback of closure.
+ * @invocation_hint: The invocation hint given as the last argument to
+ *   g_closure_invoke().
+ * @marshal_data: Additional data specified when registering the
+ *   marshaller, see g_closure_set_marshal() and
+ *   g_closure_set_meta_marshal()
+ *
+ * An old alias for g_cclosure_marshal_BOOLEAN__FLAGS().
+ */
 #define g_cclosure_marshal_BOOL__FLAGS	g_cclosure_marshal_BOOLEAN__FLAGS
 
-/* STRING:OBJECT,POINTER (./gmarshal.list:28) */
+/* STRING:OBJECT,POINTER */
 GLIB_AVAILABLE_IN_ALL
 void g_cclosure_marshal_STRING__OBJECT_POINTER (GClosure     *closure,
                                                 GValue       *return_value,
@@ -362,7 +394,7 @@ void g_cclosure_marshal_STRING__OBJECT_POINTERv (GClosure *closure,
                                                  int       n_params,
                                                  GType    *param_types);
 
-/* BOOL:BOXED,BOXED (./gmarshal.list:29) */
+/* BOOL:BOXED,BOXED */
 GLIB_AVAILABLE_IN_ALL
 void g_cclosure_marshal_BOOLEAN__BOXED_BOXED (GClosure     *closure,
                                               GValue       *return_value,
@@ -378,6 +410,23 @@ void g_cclosure_marshal_BOOLEAN__BOXED_BOXEDv (GClosure *closure,
                                                gpointer  marshal_data,
                                                int       n_params,
                                                GType    *param_types);
+
+/**
+ * g_cclosure_marshal_BOOL__BOXED_BOXED:
+ * @closure: A #GClosure.
+ * @return_value: A #GValue to store the return value. May be %NULL
+ *   if the callback of closure doesn't return a value.
+ * @n_param_values: The length of the @param_values array.
+ * @param_values: An array of #GValues holding the arguments
+ *   on which to invoke the callback of closure.
+ * @invocation_hint: The invocation hint given as the last argument to
+ *   g_closure_invoke().
+ * @marshal_data: Additional data specified when registering the
+ *   marshaller, see g_closure_set_marshal() and
+ *   g_closure_set_meta_marshal()
+ *
+ * An old alias for g_cclosure_marshal_BOOLEAN__BOXED_BOXED().
+ */
 #define g_cclosure_marshal_BOOL__BOXED_BOXED	g_cclosure_marshal_BOOLEAN__BOXED_BOXED
 
 G_END_DECLS