diff --git a/gtk/gtkwindowhandle.c b/gtk/gtkwindowhandle.c
index a4265df7c7..6b49fcb2d2 100644
--- a/gtk/gtkwindowhandle.c
+++ b/gtk/gtkwindowhandle.c
@@ -38,22 +38,20 @@
 
 
 /**
- * SECTION:gtkwindowhandle
- * @Short_description: A titlebar area widget
- * @Title: GtkWindowHandle
- * @See_also: #GtkWindow, #GtkHeaderBar
+ * GtkWindowHandle:
  *
- * GtkWindowHandle is a titlebar area widget. When added into a window, it can
- * be dragged to move the window, and handles right click, double click and
- * middle click as expected of a titlebar.
+ * `GtkWindowHandle` is a titlebar area widget.
+ *
+ * When added into a window, it can be dragged to move the window, and handles
+ * right click, double click and middle click as expected of a titlebar.
  *
  * # CSS nodes
  *
- * #GtkWindowHandle has a single CSS node with the name `windowhandle`.
+ * `GtkWindowHandle` has a single CSS node with the name `windowhandle`.
  *
  * # Accessibility
  *
- * GtkWindowHandle uses the %GTK_ACCESSIBLE_ROLE_GROUP role.
+ * `GtkWindowHandle` uses the %GTK_ACCESSIBLE_ROLE_GROUP role.
  */
 
 struct _GtkWindowHandle {
@@ -497,6 +495,11 @@ gtk_window_handle_class_init (GtkWindowHandleClass *klass)
 
   widget_class->unrealize = gtk_window_handle_unrealize;
 
+  /**
+   * GtkWindowHandle:child: (attributes org.gtk.Property.get=gtk_window_handle_get_child org.gtk.Property.set=gtk_window_handle_set_child)
+   *
+   * The child widget.
+   */
   props[PROP_CHILD] =
       g_param_spec_object ("child",
                            P_("Child"),
@@ -551,10 +554,10 @@ gtk_window_handle_buildable_iface_init (GtkBuildableIface *iface)
 /**
  * gtk_window_handle_new:
  *
- * Creates a new #GtkWindowHandle.
+ * Creates a new `GtkWindowHandle`.
  *
- * Returns: a new #GtkWindowHandle.
- **/
+ * Returns: a new `GtkWindowHandle`.
+ */
 GtkWidget *
 gtk_window_handle_new (void)
 {
@@ -562,8 +565,8 @@ gtk_window_handle_new (void)
 }
 
 /**
- * gtk_window_handle_get_child:
- * @self: a #GtkWindowHandle
+ * gtk_window_handle_get_child: (attributes org.gtk.Method.get_property=child)
+ * @self: a `GtkWindowHandle`
  *
  * Gets the child widget of @self.
  *
@@ -578,8 +581,8 @@ gtk_window_handle_get_child (GtkWindowHandle *self)
 }
 
 /**
- * gtk_window_handle_set_child:
- * @self: a #GtkWindowHandle
+ * gtk_window_handle_set_child: (attributes org.gtk.Method.set_property=child)
+ * @self: a `GtkWindowHandle`
  * @child: (allow-none): the child widget
  *
  * Sets the child widget of @self.