diff --git a/clutter/clutter-align-constraint.h b/clutter/clutter-align-constraint.h
index 73fa27324..261ff7348 100644
--- a/clutter/clutter-align-constraint.h
+++ b/clutter/clutter-align-constraint.h
@@ -68,15 +68,15 @@ ClutterConstraint *clutter_align_constraint_new            (ClutterActor
                                                             ClutterAlignAxis        axis,
                                                             gfloat                  factor);
 
-void               clutter_align_constraint_set_source     (ClutterAlignConstraint *constraint,
+void               clutter_align_constraint_set_source     (ClutterAlignConstraint *align,
                                                             ClutterActor           *source);
-ClutterActor *     clutter_align_constraint_get_source     (ClutterAlignConstraint *constraint);
-void               clutter_align_constraint_set_align_axis (ClutterAlignConstraint *constraint,
-                                                            ClutterAlignAxis        align_axis);
-ClutterAlignAxis   clutter_align_constraint_get_align_axis (ClutterAlignConstraint *constraint);
-void               clutter_align_constraint_set_factor     (ClutterAlignConstraint *constraint,
+ClutterActor *     clutter_align_constraint_get_source     (ClutterAlignConstraint *align);
+void               clutter_align_constraint_set_align_axis (ClutterAlignConstraint *align,
+                                                            ClutterAlignAxis        axis);
+ClutterAlignAxis   clutter_align_constraint_get_align_axis (ClutterAlignConstraint *align);
+void               clutter_align_constraint_set_factor     (ClutterAlignConstraint *align,
                                                             gfloat                  factor);
-gfloat             clutter_align_constraint_get_factor     (ClutterAlignConstraint *constraint);
+gfloat             clutter_align_constraint_get_factor     (ClutterAlignConstraint *align);
 
 G_END_DECLS
 
diff --git a/clutter/clutter-bind-constraint.h b/clutter/clutter-bind-constraint.h
index 387e3b5bf..8eefa3e26 100644
--- a/clutter/clutter-bind-constraint.h
+++ b/clutter/clutter-bind-constraint.h
@@ -74,7 +74,7 @@ ClutterConstraint *   clutter_bind_constraint_new            (ClutterActor
                                                               gfloat                 offset);
 
 void                  clutter_bind_constraint_set_source     (ClutterBindConstraint *constraint,
-                                                              ClutterActor          *actor);
+                                                              ClutterActor          *source);
 ClutterActor *        clutter_bind_constraint_get_source     (ClutterBindConstraint *constraint);
 void                  clutter_bind_constraint_set_coordinate (ClutterBindConstraint *constraint,
                                                               ClutterBindCoordinate  coordinate);
diff --git a/clutter/clutter-settings.c b/clutter/clutter-settings.c
index dbc5eaec3..0a3bb7ea6 100644
--- a/clutter/clutter-settings.c
+++ b/clutter/clutter-settings.c
@@ -34,6 +34,14 @@
 
 typedef struct _ClutterSettingsClass            ClutterSettingsClass;
 
+/**
+ * ClutterSettings:
+ *
+ * <structname>ClutterSettings</structname> is an opaque structure whose
+ * members cannot be directly accessed.
+ *
+ * Since: 1.4
+ */
 struct _ClutterSettings
 {
   GObject parent_instance;
diff --git a/doc/reference/clutter/clutter-sections.txt b/doc/reference/clutter/clutter-sections.txt
index b6b51f039..4502bd9f5 100644
--- a/doc/reference/clutter/clutter-sections.txt
+++ b/doc/reference/clutter/clutter-sections.txt
@@ -2450,3 +2450,15 @@ CLUTTER_IS_PAGE_TURN_EFFECT
 <SUBSECTION Private>
 clutter_page_turn_effect_get_type
 </SECTION>
+
+<SECTION>
+<FILE>clutter-settings</FILE>
+ClutterSettings
+clutter_settings_get_default
+<SUBSECTION Standard>
+CLUTTER_TYPE_SETTINGS
+CLUTTER_SETTINGS
+CLUTTER_IS_SETTINGS
+<SUBSECTION Private>
+clutter_settings_get_type
+</SECTION>