diff --git a/clutter/clutter-action.h b/clutter/clutter-action.h
index dab3a3fcf..56f31bb73 100644
--- a/clutter/clutter-action.h
+++ b/clutter/clutter-action.h
@@ -45,8 +45,8 @@ typedef struct _ClutterActionClass      ClutterActionClass;
 /**
  * ClutterAction:
  *
- * The <structname>ClutterAction</structname> structure contains only
- * private data and should be accessed using the provided API
+ * The #ClutterAction structure contains only private data and
+ * should be accessed using the provided API.
  *
  * Since: 1.4
  */
@@ -59,8 +59,7 @@ struct _ClutterAction
 /**
  * ClutterActionClass:
  *
- * The <structname>ClutterActionClass</structname> structure contains
- * only private data
+ * The ClutterActionClass structure contains only private data
  *
  * Since: 1.4
  */
diff --git a/clutter/clutter-actor-meta.h b/clutter/clutter-actor-meta.h
index 1f7baea65..25b904c2c 100644
--- a/clutter/clutter-actor-meta.h
+++ b/clutter/clutter-actor-meta.h
@@ -46,7 +46,7 @@ typedef struct _ClutterActorMetaClass           ClutterActorMetaClass;
 /**
  * ClutterActorMeta:
  *
- * The <structname>ClutterActorMeta</structname> structure contains only
+ * The #ClutterActorMeta structure contains only
  * private data and should be accessed using the provided API
  *
  * Since: 1.4
@@ -64,7 +64,7 @@ struct _ClutterActorMeta
  * @set_actor: virtual function, invoked when attaching and detaching
  *   a #ClutterActorMeta instance to a #ClutterActor
  *
- * The <structname>ClutterActorMetaClass</structname> structure contains
+ * The #ClutterActorMetaClass structure contains
  * only private data
  *
  * Since: 1.4
diff --git a/clutter/clutter-actor.h b/clutter/clutter-actor.h
index b4c113657..af2e47b43 100644
--- a/clutter/clutter-actor.h
+++ b/clutter/clutter-actor.h
@@ -283,7 +283,7 @@ struct _ClutterActorClass
  * An iterator structure that allows to efficiently iterate over a
  * section of the scene graph.
  *
- * The contents of the <structname>ClutterActorIter</structname> structure
+ * The contents of the #ClutterActorIter structure
  * are private and should only be accessed using the provided API.
  *
  * Since: 1.10
diff --git a/clutter/clutter-align-constraint.h b/clutter/clutter-align-constraint.h
index 7d92ce1e4..9b63f4208 100644
--- a/clutter/clutter-align-constraint.h
+++ b/clutter/clutter-align-constraint.h
@@ -40,7 +40,7 @@ G_BEGIN_DECLS
 /**
  * ClutterAlignConstraint:
  *
- * <structname>ClutterAlignConstraint</structname> is an opaque structure
+ * #ClutterAlignConstraint is an opaque structure
  * whose members cannot be directly accesses
  *
  * Since: 1.4
diff --git a/clutter/clutter-backend.h b/clutter/clutter-backend.h
index c28a31a69..e14d5d2c6 100644
--- a/clutter/clutter-backend.h
+++ b/clutter/clutter-backend.h
@@ -47,7 +47,7 @@ G_BEGIN_DECLS
 /**
  * ClutterBackend:
  *
- * <structname>ClutterBackend</structname> is an opaque structure whose
+ * #ClutterBackend is an opaque structure whose
  * members cannot be directly accessed.
  *
  * Since: 0.4
diff --git a/clutter/clutter-bind-constraint.h b/clutter/clutter-bind-constraint.h
index 66f4f6480..36e2b484e 100644
--- a/clutter/clutter-bind-constraint.h
+++ b/clutter/clutter-bind-constraint.h
@@ -40,7 +40,7 @@ G_BEGIN_DECLS
 /**
  * ClutterBindConstraint:
  *
- * <structname>ClutterBindConstraint</structname> is an opaque structure
+ * #ClutterBindConstraint is an opaque structure
  * whose members cannot be directly accessed
  *
  * Since: 1.4
diff --git a/clutter/clutter-blur-effect.h b/clutter/clutter-blur-effect.h
index 833da6b37..ca96d8081 100644
--- a/clutter/clutter-blur-effect.h
+++ b/clutter/clutter-blur-effect.h
@@ -40,7 +40,7 @@ G_BEGIN_DECLS
 /**
  * ClutterBlurEffect:
  *
- * <structname>ClutterBlurEffect</structname> is an opaque structure
+ * #ClutterBlurEffect is an opaque structure
  * whose members cannot be accessed directly
  *
  * Since: 1.4
diff --git a/clutter/clutter-brightness-contrast-effect.h b/clutter/clutter-brightness-contrast-effect.h
index d7d3ed6b2..f7a204f49 100644
--- a/clutter/clutter-brightness-contrast-effect.h
+++ b/clutter/clutter-brightness-contrast-effect.h
@@ -41,7 +41,7 @@ G_BEGIN_DECLS
 /**
  * ClutterBrightnessContrastEffect:
  *
- * <structname>ClutterBrightnessContrastEffect</structname> is an opaque structure
+ * #ClutterBrightnessContrastEffect is an opaque structure
  * whose members cannot be directly accessed
  *
  * Since: 1.10
diff --git a/clutter/clutter-canvas.h b/clutter/clutter-canvas.h
index 4e8f2ae4f..a1ab28a5f 100644
--- a/clutter/clutter-canvas.h
+++ b/clutter/clutter-canvas.h
@@ -47,7 +47,7 @@ typedef struct _ClutterCanvasClass      ClutterCanvasClass;
 /**
  * ClutterCanvas:
  *
- * The <structname>ClutterCanvas</structname> structure contains
+ * The #ClutterCanvas structure contains
  * private data and should only be accessed using the provided
  * API.
  *
@@ -65,7 +65,7 @@ struct _ClutterCanvas
  * ClutterCanvasClass:
  * @draw: class handler for the #ClutterCanvas::draw signal
  *
- * The <structname>ClutterCanvasClass</structname> structure contains
+ * The #ClutterCanvasClass structure contains
  * private data.
  *
  * Since: 1.10
diff --git a/clutter/clutter-click-action.h b/clutter/clutter-click-action.h
index fefe0e6c2..bd8d3e24c 100644
--- a/clutter/clutter-click-action.h
+++ b/clutter/clutter-click-action.h
@@ -51,7 +51,7 @@ typedef struct _ClutterClickActionClass         ClutterClickActionClass;
 /**
  * ClutterClickAction:
  *
- * The <structname>ClutterClickAction</structname> structure contains
+ * The #ClutterClickAction structure contains
  * only private data and should be accessed using the provided API
  *
  * Since: 1.4
@@ -69,7 +69,7 @@ struct _ClutterClickAction
  * @clicked: class handler for the #ClutterClickAction::clicked signal
  * @long_press: class handler for the #ClutterClickAction::long-press signal
  *
- * The <structname>ClutterClickActionClass</structname> structure
+ * The #ClutterClickActionClass structure
  * contains only private data
  *
  * Since: 1.4
diff --git a/clutter/clutter-colorize-effect.h b/clutter/clutter-colorize-effect.h
index 603ed7c27..fb4d37937 100644
--- a/clutter/clutter-colorize-effect.h
+++ b/clutter/clutter-colorize-effect.h
@@ -41,7 +41,7 @@ G_BEGIN_DECLS
 /**
  * ClutterColorizeEffect:
  *
- * <structname>ClutterColorizeEffect</structname> is an opaque structure
+ * #ClutterColorizeEffect is an opaque structure
  * whose members cannot be directly accessed
  *
  * Since: 1.4
diff --git a/clutter/clutter-constraint.h b/clutter/clutter-constraint.h
index 6c7563d4a..28aaf30e6 100644
--- a/clutter/clutter-constraint.h
+++ b/clutter/clutter-constraint.h
@@ -45,7 +45,7 @@ typedef struct _ClutterConstraintClass          ClutterConstraintClass;
 /**
  * ClutterConstraint:
  *
- * The <structname>ClutterConstraint</structname> structure contains only
+ * The #ClutterConstraint structure contains only
  * private data and should be accessed using the provided API
  *
  * Since: 1.4
@@ -58,8 +58,10 @@ struct _ClutterConstraint
 
 /**
  * ClutterConstraintClass:
+ * @update_allocation: virtual function used to update the allocation
+ *   of the #ClutterActor using the #ClutterConstraint
  *
- * The <structname>ClutterConstraintClass</structname> structure contains
+ * The #ClutterConstraintClass structure contains
  * only private data
  *
  * Since: 1.4
@@ -69,6 +71,7 @@ struct _ClutterConstraintClass
   /*< private >*/
   ClutterActorMetaClass parent_class;
 
+  /*< public >*/
   void (* update_allocation) (ClutterConstraint *constraint,
                               ClutterActor      *actor,
                               ClutterActorBox   *allocation);
diff --git a/clutter/clutter-content.h b/clutter/clutter-content.h
index df5aa838c..1ca45de7f 100644
--- a/clutter/clutter-content.h
+++ b/clutter/clutter-content.h
@@ -43,7 +43,7 @@ typedef struct _ClutterContentIface     ClutterContentIface;
 /**
  * ClutterContent:
  *
- * The <structname>ClutterContent</structname> structure is an opaque type
+ * The #ClutterContent structure is an opaque type
  * whose members cannot be acccessed directly.
  *
  * Since: 1.10
@@ -62,7 +62,7 @@ typedef struct _ClutterContentIface     ClutterContentIface;
  * @invalidate: virtual function; called each time a #ClutterContent state
  *   is changed.
  *
- * The <structname>ClutterContentIface</structname> structure contains only
+ * The #ClutterContentIface structure contains only
  * private data.
  *
  * Since: 1.10
diff --git a/clutter/clutter-deform-effect.h b/clutter/clutter-deform-effect.h
index b122dcd0a..dc6eabccd 100644
--- a/clutter/clutter-deform-effect.h
+++ b/clutter/clutter-deform-effect.h
@@ -48,7 +48,7 @@ typedef struct _ClutterDeformEffectClass        ClutterDeformEffectClass;
 /**
  * ClutterDeformEffect:
  *
- * The <structname>ClutterDeformEffect</structname> structure contains
+ * The #ClutterDeformEffect structure contains
  * only private data and should be accessed using the provided API
  *
  * Since: 1.4
@@ -66,7 +66,7 @@ struct _ClutterDeformEffect
  * @deform_vertex: virtual function; sub-classes should override this
  *   function to compute the deformation of each vertex
  *
- * The <structname>ClutterDeformEffectClass</structname> structure contains
+ * The #ClutterDeformEffectClass structure contains
  * only private data
  *
  * Since: 1.4
diff --git a/clutter/clutter-desaturate-effect.h b/clutter/clutter-desaturate-effect.h
index daf3318fa..08c1583f5 100644
--- a/clutter/clutter-desaturate-effect.h
+++ b/clutter/clutter-desaturate-effect.h
@@ -40,7 +40,7 @@ G_BEGIN_DECLS
 /**
  * ClutterDesaturateEffect:
  *
- * <structname>ClutterDesaturateEffect</structname> is an opaque structure
+ * #ClutterDesaturateEffect is an opaque structure
  * whose members cannot be directly accessed
  *
  * Since: 1.4
diff --git a/clutter/clutter-drag-action.h b/clutter/clutter-drag-action.h
index 3cc52e4f2..3e0ed26df 100644
--- a/clutter/clutter-drag-action.h
+++ b/clutter/clutter-drag-action.h
@@ -48,7 +48,7 @@ typedef struct _ClutterDragActionClass          ClutterDragActionClass;
 /**
  * ClutterDragAction:
  *
- * The <structname>ClutterDragAction</structname> structure contains only
+ * The #ClutterDragAction structure contains only
  * private data and should be accessed using the provided API
  *
  * Since: 1.4
@@ -68,7 +68,7 @@ struct _ClutterDragAction
  * @drag_end: class handler of the #ClutterDragAction::drag-end signal
  * @drag_progress: class handler of the #ClutterDragAction::drag-progress signal
  *
- * The <structname>ClutterDragActionClass</structname> structure contains
+ * The #ClutterDragActionClass structure contains
  * only private data
  *
  * Since: 1.4
diff --git a/clutter/clutter-drop-action.h b/clutter/clutter-drop-action.h
index 2877ce332..9c58242d6 100644
--- a/clutter/clutter-drop-action.h
+++ b/clutter/clutter-drop-action.h
@@ -47,7 +47,7 @@ typedef struct _ClutterDropActionClass          ClutterDropActionClass;
 /**
  * ClutterDropAction:
  *
- * The <structname>ClutterDropAction</structname> structure contains only
+ * The #ClutterDropAction structure contains only
  * private data and should be accessed using the provided API.
  *
  * Since: 1.8
@@ -67,7 +67,7 @@ struct _ClutterDropAction
  * @over_out: class handler for the #ClutterDropAction::over-out signal
  * @drop: class handler for the #ClutterDropAction::drop signal
  *
- * The <structname>ClutterDropActionClass</structname> structure contains
+ * The #ClutterDropActionClass structure contains
  * only private data.
  *
  * Since: 1.8
diff --git a/clutter/clutter-gesture-action.h b/clutter/clutter-gesture-action.h
index bb6eac842..e531945af 100644
--- a/clutter/clutter-gesture-action.h
+++ b/clutter/clutter-gesture-action.h
@@ -48,7 +48,7 @@ typedef struct _ClutterGestureActionClass         ClutterGestureActionClass;
 /**
  * ClutterGestureAction:
  *
- * The <structname>ClutterGestureAction</structname> structure contains
+ * The #ClutterGestureAction structure contains
  * only private data and should be accessed using the provided API
  *
  * Since: 1.8
@@ -70,7 +70,7 @@ struct _ClutterGestureAction
  * @gesture_prepare: virtual function called before emitting the
  *   #ClutterGestureAction::gesture-cancel signal
  *
- * The <structname>ClutterGestureClass</structname> structure contains only
+ * The #ClutterGestureClass structure contains only
  * private data.
  *
  * Since: 1.8
diff --git a/clutter/clutter-image.h b/clutter/clutter-image.h
index af8df1e6d..2819b79af 100644
--- a/clutter/clutter-image.h
+++ b/clutter/clutter-image.h
@@ -70,7 +70,7 @@ typedef enum {
 /**
  * ClutterImage:
  *
- * The <structname>ClutterImage</structname> structure contains
+ * The #ClutterImage structure contains
  * private data and should only be accessed using the provided
  * API.
  *
@@ -87,7 +87,7 @@ struct _ClutterImage
 /**
  * ClutterImageClass:
  *
- * The <structname>ClutterImageClass</structname> structure contains
+ * The #ClutterImageClass structure contains
  * private data.
  *
  * Since: 1.10
diff --git a/clutter/clutter-page-turn-effect.h b/clutter/clutter-page-turn-effect.h
index befdf412b..63beb2039 100644
--- a/clutter/clutter-page-turn-effect.h
+++ b/clutter/clutter-page-turn-effect.h
@@ -43,7 +43,7 @@ G_BEGIN_DECLS
 /**
  * ClutterPageTurnEffect:
  *
- * <structname>ClutterPageTurnEffect</structname> is an opaque structure
+ * #ClutterPageTurnEffect is an opaque structure
  * whose members can only be accessed using the provided API
  *
  * Since: 1.4
diff --git a/clutter/clutter-paint-node-private.h b/clutter/clutter-paint-node-private.h
index 2747b3550..2945b78a4 100644
--- a/clutter/clutter-paint-node-private.h
+++ b/clutter/clutter-paint-node-private.h
@@ -149,7 +149,7 @@ CoglFramebuffer *       clutter_paint_node_get_framebuffer              (Clutter
 /*
  * ClutterLayerNode:
  *
- * The <structname>ClutterLayerNode</structname> structure is an opaque
+ * The #ClutterLayerNode structure is an opaque
  * type whose members cannot be directly accessed.
  *
  * Since: 1.10
diff --git a/clutter/clutter-paint-nodes.h b/clutter/clutter-paint-nodes.h
index bd854e816..8842e3fd5 100644
--- a/clutter/clutter-paint-nodes.h
+++ b/clutter/clutter-paint-nodes.h
@@ -41,7 +41,7 @@ G_BEGIN_DECLS
 /**
  * ClutterColorNode:
  *
- * The <structname>ClutterTextNode</structname> structure is an opaque
+ * The #ClutterTextNode structure is an opaque
  * type whose members cannot be directly accessed.
  *
  * Since: 1.10
@@ -62,7 +62,7 @@ ClutterPaintNode *      clutter_color_node_new          (const ClutterColor    *
 /**
  * ClutterTextureNode:
  *
- * The <structname>ClutterTextNode</structname> structure is an opaque
+ * The #ClutterTextNode structure is an opaque
  * type whose members cannot be directly accessed.
  *
  * Since: 1.10
@@ -86,7 +86,7 @@ ClutterPaintNode *      clutter_texture_node_new        (CoglTexture           *
 /**
  * ClutterClipNode:
  *
- * The <structname>ClutterTextNode</structname> structure is an opaque
+ * The #ClutterTextNode structure is an opaque
  * type whose members cannot be directly accessed.
  *
  * Since: 1.10
@@ -107,7 +107,7 @@ ClutterPaintNode *      clutter_clip_node_new           (void);
 /**
  * ClutterPipelineNode:
  *
- * The <structname>ClutterTextNode</structname> structure is an opaque
+ * The #ClutterTextNode structure is an opaque
  * type whose members cannot be directly accessed.
  *
  * Since: 1.10
@@ -130,7 +130,7 @@ ClutterPaintNode *      clutter_pipeline_node_new       (CoglPipeline          *
 /**
  * ClutterTextNode:
  *
- * The <structname>ClutterTextNode</structname> structure is an opaque
+ * The #ClutterTextNode structure is an opaque
  * type whose members cannot be directly accessed.
  *
  * Since: 1.10
diff --git a/clutter/clutter-pan-action.h b/clutter/clutter-pan-action.h
index 77d6b330c..8d90b7a65 100644
--- a/clutter/clutter-pan-action.h
+++ b/clutter/clutter-pan-action.h
@@ -55,7 +55,7 @@ typedef struct _ClutterPanActionClass         ClutterPanActionClass;
 /**
  * ClutterPanAction:
  *
- * The <structname>ClutterPanAction</structname> structure contains
+ * The #ClutterPanAction structure contains
  * only private data and should be accessed using the provided API
  *
  * Since: 1.12
@@ -73,7 +73,7 @@ struct _ClutterPanAction
  * @pan: class handler for the #ClutterPanAction::pan signal
  * @pan_stopped: class handler for the #ClutterPanAction::pan-stopped signal
  *
- * The <structname>ClutterPanActionClass</structname> structure contains
+ * The #ClutterPanActionClass structure contains
  * only private data.
  *
  * Since: 1.12
diff --git a/clutter/clutter-path-constraint.h b/clutter/clutter-path-constraint.h
index 63da49505..9c77d4fe8 100644
--- a/clutter/clutter-path-constraint.h
+++ b/clutter/clutter-path-constraint.h
@@ -41,7 +41,7 @@ G_BEGIN_DECLS
 /**
  * ClutterPathConstraint:
  *
- * <structname>ClutterPathConstraint</structname> is an opaque structure
+ * #ClutterPathConstraint is an opaque structure
  * whose members cannot be directly accessed
  *
  * Since: 1.6
diff --git a/clutter/clutter-property-transition.h b/clutter/clutter-property-transition.h
index 0d32f162c..5ea2e9ba9 100644
--- a/clutter/clutter-property-transition.h
+++ b/clutter/clutter-property-transition.h
@@ -46,7 +46,7 @@ typedef struct _ClutterPropertyTransitionClass          ClutterPropertyTransitio
 /**
  * ClutterPropertyTransition:
  *
- * The <structname>ClutterPropertyTransition</structname> structure contains
+ * The #ClutterPropertyTransition structure contains
  * private data and should only be accessed using the provided API.
  *
  * Since: 1.10
@@ -62,7 +62,7 @@ struct _ClutterPropertyTransition
 /**
  * ClutterPropertyTransitionClass:
  *
- * The <structname>ClutterPropertyTransitionClass</structname> structure
+ * The #ClutterPropertyTransitionClass structure
  * contains private data.
  *
  * Since: 1.10
diff --git a/clutter/clutter-rotate-action.h b/clutter/clutter-rotate-action.h
index ee41059c2..8f6f27873 100644
--- a/clutter/clutter-rotate-action.h
+++ b/clutter/clutter-rotate-action.h
@@ -47,7 +47,7 @@ typedef struct _ClutterRotateActionClass         ClutterRotateActionClass;
 /**
  * ClutterRotateAction:
  *
- * The <structname>ClutterRotateAction</structname> structure contains
+ * The #ClutterRotateAction structure contains
  * only private data and should be accessed using the provided API
  *
  * Since: 1.12
@@ -64,7 +64,7 @@ struct _ClutterRotateAction
  * ClutterRotateActionClass:
  * @rotate: class handler for the #ClutterRotateAction::rotate signal
  *
- * The <structname>ClutterRotateActionClass</structname> structure contains
+ * The #ClutterRotateActionClass structure contains
  * only private data.
  *
  * Since: 1.12
diff --git a/clutter/clutter-scroll-actor.h b/clutter/clutter-scroll-actor.h
index cad50814f..4665cfaf6 100644
--- a/clutter/clutter-scroll-actor.h
+++ b/clutter/clutter-scroll-actor.h
@@ -44,7 +44,7 @@ typedef struct _ClutterScrollActorClass         ClutterScrollActorClass;
 /**
  * ClutterScrollActor:
  *
- * The <structname>ClutterScrollActor</structname> structure contains only
+ * The #ClutterScrollActor structure contains only
  * private data, and should be accessed using the provided API.
  *
  * Since: 1.12
@@ -60,7 +60,7 @@ struct _ClutterScrollActor
 /**
  * ClutterScrollActorClass:
  *
- * The <structname>ClutterScrollActor</structname> structure contains only
+ * The #ClutterScrollActor structure contains only
  * private data.
  *
  * Since: 1.12
diff --git a/clutter/clutter-shader-effect.h b/clutter/clutter-shader-effect.h
index 1ffc394f1..0891ba570 100644
--- a/clutter/clutter-shader-effect.h
+++ b/clutter/clutter-shader-effect.h
@@ -47,7 +47,7 @@ typedef struct _ClutterShaderEffectClass        ClutterShaderEffectClass;
 /**
  * ClutterShaderEffect:
  *
- * The <structname>ClutterShaderEffect</structname> structure contains
+ * The #ClutterShaderEffect structure contains
  * only private data and should be accessed using the provided API
  *
  * Since: 1.4
@@ -68,7 +68,7 @@ struct _ClutterShaderEffect
  *  many instances are used. It is expected that subclasses will return
  *  a copy of a static string from this function.
  *
- * The <structname>ClutterShaderEffectClass</structname> structure contains
+ * The #ClutterShaderEffectClass structure contains
  * only private data
  *
  * Since: 1.4
diff --git a/clutter/clutter-snap-constraint.h b/clutter/clutter-snap-constraint.h
index 5c42e92b1..9039536f1 100644
--- a/clutter/clutter-snap-constraint.h
+++ b/clutter/clutter-snap-constraint.h
@@ -40,7 +40,7 @@ G_BEGIN_DECLS
 /**
  * ClutterSnapConstraint:
  *
- * <structname>ClutterSnapConstraint</structname> is an opaque structure
+ * #ClutterSnapConstraint is an opaque structure
  * whose members cannot be directly accesses
  *
  * Since: 1.6
diff --git a/clutter/clutter-stage-window.h b/clutter/clutter-stage-window.h
index c6233d1bc..fa8982525 100644
--- a/clutter/clutter-stage-window.h
+++ b/clutter/clutter-stage-window.h
@@ -14,7 +14,7 @@ G_BEGIN_DECLS
 /*
  * ClutterStageWindow: (skip)
  *
- * <structname>ClutterStageWindow</structname> is an opaque structure
+ * #ClutterStageWindow is an opaque structure
  * whose members should not be accessed directly
  *
  * Since: 0.8
diff --git a/clutter/clutter-swipe-action.h b/clutter/clutter-swipe-action.h
index ebbc204df..9c18e94ad 100644
--- a/clutter/clutter-swipe-action.h
+++ b/clutter/clutter-swipe-action.h
@@ -51,7 +51,7 @@ typedef struct _ClutterSwipeActionClass         ClutterSwipeActionClass;
 /**
  * ClutterSwipeAction:
  *
- * The <structname>ClutterSwipeAction</structname> structure contains
+ * The #ClutterSwipeAction structure contains
  * only private data and should be accessed using the provided API
  *
  * Since: 1.8
@@ -70,7 +70,7 @@ struct _ClutterSwipeAction
  *   deprecated since 1.14
  * @swipe: class handler for the #ClutterSwipeAction::swipe signal
  *
- * The <structname>ClutterSwipeActionClass</structname> structure contains
+ * The #ClutterSwipeActionClass structure contains
  * only private data.
  *
  * Since: 1.8
diff --git a/clutter/clutter-tap-action.h b/clutter/clutter-tap-action.h
index 12f54173c..8bf80a375 100644
--- a/clutter/clutter-tap-action.h
+++ b/clutter/clutter-tap-action.h
@@ -56,7 +56,7 @@ typedef struct _ClutterTapActionClass         ClutterTapActionClass;
 /**
  * ClutterTapAction:
  *
- * The <structname>ClutterTapAction</structname> structure contains
+ * The #ClutterTapAction structure contains
  * only private data and should be accessed using the provided API
  *
  * Since: 1.14
@@ -71,7 +71,7 @@ struct _ClutterTapAction
  * ClutterTapActionClass:
  * @tap: class handler for the #ClutterTapAction::tap signal
  *
- * The <structname>ClutterTapActionClass</structname> structure contains
+ * The #ClutterTapActionClass structure contains
  * only private data.
  */
 struct _ClutterTapActionClass
diff --git a/clutter/clutter-text-buffer.h b/clutter/clutter-text-buffer.h
index 9b6f8ceee..a524d93b2 100644
--- a/clutter/clutter-text-buffer.h
+++ b/clutter/clutter-text-buffer.h
@@ -53,7 +53,7 @@ typedef struct _ClutterTextBufferPrivate     ClutterTextBufferPrivate;
 /**
  * ClutterTextBuffer:
  *
- * The <structname>ClutterTextBuffer</structname> structure contains private
+ * The #ClutterTextBuffer structure contains private
  * data and it should only be accessed using the provided API.
  *
  * Since: 1.10
@@ -75,7 +75,7 @@ struct _ClutterTextBuffer
  * @insert_text: virtual function
  * @delete_text: virtual function
  *
- * The <structname>ClutterTextBufferClass</structname> structure contains
+ * The #ClutterTextBufferClass structure contains
  * only private data.
  *
  * Since: 1.10
diff --git a/clutter/clutter-transition-group.h b/clutter/clutter-transition-group.h
index efa9ddb22..0408fc59d 100644
--- a/clutter/clutter-transition-group.h
+++ b/clutter/clutter-transition-group.h
@@ -42,7 +42,7 @@ typedef struct _ClutterTransitionGroupClass             ClutterTransitionGroupCl
 /**
  * ClutterTransitionGroup:
  *
- * The <structname>ClutterTransitionGroup</structname> structure contains
+ * The #ClutterTransitionGroup structure contains
  * private data and should only be accessed using the provided API.
  *
  * Since: 1.12
@@ -58,7 +58,7 @@ struct _ClutterTransitionGroup
 /**
  * ClutterTransitionGroupClass:
  *
- * The <structname>ClutterTransitionGroupClass</structname> structure
+ * The #ClutterTransitionGroupClass structure
  * contains only private data.
  *
  * Since: 1.12
diff --git a/clutter/clutter-transition.h b/clutter/clutter-transition.h
index c52764d17..f536a4ee5 100644
--- a/clutter/clutter-transition.h
+++ b/clutter/clutter-transition.h
@@ -46,7 +46,7 @@ typedef struct _ClutterTransitionClass          ClutterTransitionClass;
 /**
  * ClutterTransition:
  *
- * The <structname>ClutterTransition</structname> structure contains private
+ * The #ClutterTransition structure contains private
  * data and should only be accessed using the provided API.
  *
  * Since: 1.10
@@ -68,7 +68,7 @@ struct _ClutterTransition
  * @compute_value: virtual function; called each frame to compute and apply
  *   the interpolation of the interval
  *
- * The <structname>ClutterTransitionClass</structname> structure contains
+ * The #ClutterTransitionClass structure contains
  * private data.
  *
  * Since: 1.10
diff --git a/clutter/clutter-types.h b/clutter/clutter-types.h
index 10ef8dd7e..f9b835a7b 100644
--- a/clutter/clutter-types.h
+++ b/clutter/clutter-types.h
@@ -101,7 +101,7 @@ typedef union _ClutterEvent                     ClutterEvent;
 /**
  * ClutterEventSequence:
  *
- * The <structname>ClutterEventSequence</structname> structure is an opaque
+ * The #ClutterEventSequence structure is an opaque
  * type used to denote the event sequence of a touch event.
  *
  * Since: 1.12
@@ -115,14 +115,14 @@ typedef struct _ClutterShader                   ClutterShader; /* deprecated */
 /**
  * ClutterPaintVolume:
  *
- * <structname>ClutterPaintVolume</structname> is an opaque structure
+ * #ClutterPaintVolume is an opaque structure
  * whose members cannot be directly accessed.
  *
- * A <structname>ClutterPaintVolume</structname> represents an
+ * A #ClutterPaintVolume represents an
  * a bounding volume whose internal representation isn't defined but
  * can be set and queried in terms of an axis aligned bounding box.
  *
- * A <structname>ClutterPaintVolume</structname> for a #ClutterActor
+ * A #ClutterPaintVolume for a #ClutterActor
  * is defined to be relative from the current actor modelview matrix.
  *
  * Other internal representation and methods for describing the
diff --git a/clutter/clutter-zoom-action.h b/clutter/clutter-zoom-action.h
index 3111e12d9..7ebbe4f0d 100644
--- a/clutter/clutter-zoom-action.h
+++ b/clutter/clutter-zoom-action.h
@@ -49,7 +49,7 @@ typedef struct _ClutterZoomActionClass          ClutterZoomActionClass;
 /**
  * ClutterZoomAction:
  *
- * The <structname>ClutterZoomAction</structname> structure contains only
+ * The #ClutterZoomAction structure contains only
  * private data and should be accessed using the provided API
  *
  * Since: 1.12
@@ -66,7 +66,7 @@ struct _ClutterZoomAction
  * ClutterZoomActionClass:
  * @zoom: class handler of the #ClutterZoomAction::zoom signal
  *
- * The <structname>ClutterZoomActionClass</structname> structure contains
+ * The #ClutterZoomActionClass structure contains
  * only private data
  *
  * Since: 1.12
diff --git a/clutter/deprecated/clutter-state.h b/clutter/deprecated/clutter-state.h
index c446e7784..e33ae0fec 100644
--- a/clutter/deprecated/clutter-state.h
+++ b/clutter/deprecated/clutter-state.h
@@ -42,7 +42,7 @@ typedef struct _ClutterStateClass   ClutterStateClass;
 /**
  * ClutterStateKey:
  *
- * <structname>ClutterStateKey</structname> is an opaque structure whose
+ * #ClutterStateKey is an opaque structure whose
  * members cannot be accessed directly
  *
  * Since: 1.4
@@ -52,7 +52,7 @@ typedef struct _ClutterStateKey     ClutterStateKey;
 /**
  * ClutterState:
  *
- * The <structname>ClutterState</structname> structure contains only
+ * The #ClutterState structure contains only
  * private data and should be accessed using the provided API
  *
  * Since: 1.4
@@ -68,7 +68,7 @@ struct _ClutterState
  * ClutterStateClass:
  * @completed: class handler for the #ClutterState::completed signal
  *
- * The <structname>ClutterStateClass</structname> structure contains
+ * The #ClutterStateClass structure contains
  * only private data
  *
  * Since: 1.4
diff --git a/clutter/deprecated/clutter-timeout-pool.h b/clutter/deprecated/clutter-timeout-pool.h
index 9d7ad1d22..61780e546 100644
--- a/clutter/deprecated/clutter-timeout-pool.h
+++ b/clutter/deprecated/clutter-timeout-pool.h
@@ -42,7 +42,7 @@ G_BEGIN_DECLS
 /**
  * ClutterTimeoutPool: (skip)
  *
- * <structname>ClutterTimeoutPool</structname> is an opaque structure
+ * #ClutterTimeoutPool is an opaque structure
  * whose members cannot be directly accessed.
  *
  * Since: 0.6
diff --git a/clutter/egl/clutter-egl.h b/clutter/egl/clutter-egl.h
index f57a4c1e8..f70be6d8a 100644
--- a/clutter/egl/clutter-egl.h
+++ b/clutter/egl/clutter-egl.h
@@ -51,7 +51,7 @@ G_BEGIN_DECLS
 /**
  * clutter_eglx_display:
  *
- * Retrieves the <structname>EGLDisplay</structname> used by Clutter,
+ * Retrieves the #EGLDisplay used by Clutter,
  * if Clutter has been compiled with EGL and X11 support.
  *
  * Return value: the EGL display
@@ -66,7 +66,7 @@ EGLDisplay      clutter_eglx_display            (void);
 /**
  * clutter_egl_display:
  *
- * Retrieves the <structname>EGLDisplay</structname> used by Clutter
+ * Retrieves the #EGLDisplay used by Clutter
  *
  * Return value: the EGL display
  *
@@ -78,7 +78,7 @@ EGLDisplay      clutter_egl_display             (void);
 /**
  * clutter_egl_get_egl_display:
  *
- * Retrieves the  <structname>EGLDisplay</structname> used by Clutter.
+ * Retrieves the  #EGLDisplay used by Clutter.
  *
  * Return value: the EGL display
  *