diff --git a/clutter/clutter-cairo-texture.c b/clutter/clutter-cairo-texture.c
index e9586a31a..fb57f2b60 100644
--- a/clutter/clutter-cairo-texture.c
+++ b/clutter/clutter-cairo-texture.c
@@ -436,7 +436,7 @@ clutter_cairo_texture_class_init (ClutterCairoTextureClass *klass)
                                             obj_props);
 
   /**
-   * ClutterCairoTexture::create_surface:
+   * ClutterCairoTexture::create-surface:
    * @texture: the #ClutterCairoTexture that emitted the signal
    * @width: the width of the surface to create
    * @height: the height of the surface to create
diff --git a/clutter/clutter-cairo-texture.h b/clutter/clutter-cairo-texture.h
index a40a1a597..5dca82e2d 100644
--- a/clutter/clutter-cairo-texture.h
+++ b/clutter/clutter-cairo-texture.h
@@ -65,6 +65,8 @@ struct _ClutterCairoTexture
 
 /**
  * ClutterCairoTextureClass:
+ * @create_surface: class handler for the #ClutterCairoTexture::create-surface
+ *   signal
  *
  * The #ClutterCairoTextureClass struct contains only private data.
  *
diff --git a/clutter/cogl/cogl/cogl-vertex-attribute.h b/clutter/cogl/cogl/cogl-vertex-attribute.h
index 8545939c2..65579541e 100644
--- a/clutter/cogl/cogl/cogl-vertex-attribute.h
+++ b/clutter/cogl/cogl/cogl-vertex-attribute.h
@@ -81,7 +81,7 @@ typedef enum {
  *          <pre>offsetof (MyVertex, component0)</pre>
  * @components: The number of components (e.g. 4 for an rgba color or
  *              3 for and (x,y,z) position)
- * @type:
+ * @type: FIXME
  *
  * Describes the layout for a list of vertex attribute values (For
  * example, a list of texture coordinates or colors).
diff --git a/doc/reference/clutter/Makefile.am b/doc/reference/clutter/Makefile.am
index 1abc8d52d..e4aace91a 100644
--- a/doc/reference/clutter/Makefile.am
+++ b/doc/reference/clutter/Makefile.am
@@ -66,9 +66,12 @@ CFILE_GLOB=$(top_srcdir)/clutter/*.c \
 IGNORE_HFILES=\
 	clutter.h 			\
 	clutter-actor-meta-private.h	\
+	clutter-actor-private.h		\
+	clutter-backend-private.h	\
         clutter-bezier.h 		\
 	clutter-debug.h 		\
 	clutter-deprecated.h 		\
+	clutter-device-manager-private.h	\
 	clutter-enum-types.h 		\
 	clutter-id-pool.h 		\
 	clutter-keysyms.h 		\
@@ -77,9 +80,12 @@ IGNORE_HFILES=\
 	clutter-marshal.h 		\
 	clutter-master-clock.h 		\
 	clutter-model-private.h 	\
+	clutter-paint-volume-private.h	\
 	clutter-private.h 		\
 	clutter-profile.h		\
 	clutter-script-private.h 	\
+	clutter-stage-manager-private.h	\
+	clutter-stage-private.h		\
 	clutter-stage-window.h 		\
 	clutter-timeout-interval.h 	\
 	cally				\
@@ -89,6 +95,7 @@ IGNORE_HFILES=\
 	glx 				\
 	osx 				\
 	x11 				\
+	wayland				\
 	win32
 
 EXTRA_HFILES=\
diff --git a/doc/reference/clutter/clutter-sections.txt b/doc/reference/clutter/clutter-sections.txt
index a0537e6a7..dc5106fbd 100644
--- a/doc/reference/clutter/clutter-sections.txt
+++ b/doc/reference/clutter/clutter-sections.txt
@@ -2369,6 +2369,7 @@ clutter_state_key_get_post_delay
 
 <SUBSECTION Standard>
 CLUTTER_TYPE_STATE
+CLUTTER_TYPE_STATE_KEY
 CLUTTER_STATE
 CLUTTER_STATE_CLASS
 CLUTTER_IS_STATE