diff --git a/cogl/cogl/cogl-framebuffer.h b/cogl/cogl/cogl-framebuffer.h
index 2fcdaa996..112ea88bb 100644
--- a/cogl/cogl/cogl-framebuffer.h
+++ b/cogl/cogl/cogl-framebuffer.h
@@ -602,7 +602,7 @@ cogl_framebuffer_push_rectangle_clip (CoglFramebuffer *framebuffer,
                                       float y_2);
 
 /**
- * cogl_framebuffer_push_primitive_clip:
+ * cogl_framebuffer_push_primitive_clip: (skip)
  * @framebuffer: A #CoglFramebuffer pointer
  * @primitive: A #CoglPrimitive describing a flat 2D shape
  * @bounds_x1: x coordinate for the top-left corner of the primitives
@@ -1087,7 +1087,7 @@ cogl_framebuffer_resolve_samples_region (CoglFramebuffer *framebuffer,
                                          int height);
 
 /**
- * cogl_framebuffer_get_context:
+ * cogl_framebuffer_get_context: (skip)
  * @framebuffer: A #CoglFramebuffer
  *
  * Can be used to query the #CoglContext a given @framebuffer was
@@ -1150,7 +1150,7 @@ cogl_framebuffer_clear4f (CoglFramebuffer *framebuffer,
                           float alpha);
 
 /**
- * cogl_framebuffer_draw_primitive:
+ * cogl_framebuffer_draw_primitive: (skip)
  * @framebuffer: A destination #CoglFramebuffer
  * @pipeline: A #CoglPipeline state object
  * @primitive: A #CoglPrimitive geometry object
@@ -1221,7 +1221,7 @@ cogl_framebuffer_vdraw_attributes (CoglFramebuffer *framebuffer,
                                    ...) COGL_GNUC_NULL_TERMINATED;
 
 /**
- * cogl_framebuffer_draw_attributes:
+ * cogl_framebuffer_draw_attributes: (skip)
  * @framebuffer: A destination #CoglFramebuffer
  * @pipeline: A #CoglPipeline state object
  * @mode: The #CoglVerticesMode defining the topology of vertices
@@ -1269,7 +1269,7 @@ cogl_framebuffer_draw_attributes (CoglFramebuffer *framebuffer,
                                   int n_attributes);
 
 /**
- * cogl_framebuffer_vdraw_indexed_attributes:
+ * cogl_framebuffer_vdraw_indexed_attributes: (skip)
  * @framebuffer: A destination #CoglFramebuffer
  * @pipeline: A #CoglPipeline state object
  * @mode: The #CoglVerticesMode defining the topology of vertices
@@ -1335,7 +1335,7 @@ cogl_framebuffer_vdraw_indexed_attributes (CoglFramebuffer *framebuffer,
                                            ...) COGL_GNUC_NULL_TERMINATED;
 
 /**
- * cogl_framebuffer_draw_indexed_attributes:
+ * cogl_framebuffer_draw_indexed_attributes: (skip)
  * @framebuffer: A destination #CoglFramebuffer
  * @pipeline: A #CoglPipeline state object
  * @mode: The #CoglVerticesMode defining the topology of vertices
diff --git a/cogl/cogl/cogl-onscreen.h b/cogl/cogl/cogl-onscreen.h
index 0ed0f6a8f..a1e2afc80 100644
--- a/cogl/cogl/cogl-onscreen.h
+++ b/cogl/cogl/cogl-onscreen.h
@@ -58,7 +58,7 @@ typedef struct _CoglOnscreen CoglOnscreen;
 GType cogl_onscreen_get_gtype (void);
 
 /**
- * cogl_onscreen_new: (constructor)
+ * cogl_onscreen_new: (constructor) (skip)
  * @context: A #CoglContext
  * @width: The desired framebuffer width
  * @height: The desired framebuffer height
@@ -84,8 +84,8 @@ typedef void (*CoglOnscreenX11MaskCallback) (CoglOnscreen *onscreen,
  * @onscreen: The unallocated framebuffer to associated with an X
  *            window.
  * @xid: The XID of an existing X window
- * @update: A callback that notifies of updates to what Cogl requires
- *          to be in the core X protocol event mask.
+ * @update: (scope async): A callback that notifies of updates to what Cogl
+ *          requires to be in the core X protocol event mask.
  * @user_data: user data passed to @update
  *
  * Ideally we would recommend that you let Cogl be responsible for
diff --git a/cogl/cogl/cogl-pipeline-layer-state.h b/cogl/cogl/cogl-pipeline-layer-state.h
index 96ae1b405..38f6a9ba2 100644
--- a/cogl/cogl/cogl-pipeline-layer-state.h
+++ b/cogl/cogl/cogl-pipeline-layer-state.h
@@ -592,7 +592,7 @@ cogl_pipeline_set_layer_wrap_mode (CoglPipeline        *pipeline,
                                    CoglPipelineWrapMode mode);
 
 /**
- * cogl_pipeline_add_layer_snippet:
+ * cogl_pipeline_add_layer_snippet: (skip)
  * @pipeline: A #CoglPipeline
  * @layer: The layer to hook the snippet to
  * @snippet: A #CoglSnippet
diff --git a/cogl/cogl/cogl-pipeline-state.h b/cogl/cogl/cogl-pipeline-state.h
index 67e6ef814..b9e58af57 100644
--- a/cogl/cogl/cogl-pipeline-state.h
+++ b/cogl/cogl/cogl-pipeline-state.h
@@ -669,7 +669,7 @@ cogl_pipeline_set_user_program (CoglPipeline *pipeline,
                                 CoglHandle program);
 
 /**
- * cogl_pipeline_set_depth_state:
+ * cogl_pipeline_set_depth_state: (skip)
  * @pipeline: A #CoglPipeline object
  * @state: A #CoglDepthState struct
  * @error: A #CoglError to report failures to setup the given @state.
@@ -694,7 +694,7 @@ cogl_pipeline_set_depth_state (CoglPipeline *pipeline,
                                CoglError **error);
 
 /**
- * cogl_pipeline_get_depth_state:
+ * cogl_pipeline_get_depth_state: (skip)
  * @pipeline: A #CoglPipeline object
  * @state_out: (out): A destination #CoglDepthState struct
  *
@@ -955,7 +955,7 @@ cogl_pipeline_set_uniform_matrix (CoglPipeline *pipeline,
                                   const float *value);
 
 /**
- * cogl_pipeline_add_snippet:
+ * cogl_pipeline_add_snippet: (skip)
  * @pipeline: A #CoglPipeline
  * @snippet: The #CoglSnippet to add to the vertex processing hook
  *
diff --git a/cogl/cogl/cogl-pipeline.h b/cogl/cogl/cogl-pipeline.h
index 65587353e..8ac2b55c4 100644
--- a/cogl/cogl/cogl-pipeline.h
+++ b/cogl/cogl/cogl-pipeline.h
@@ -72,7 +72,7 @@ COGL_BEGIN_DECLS
 GType cogl_pipeline_get_gtype (void);
 
 /**
- * cogl_pipeline_new:
+ * cogl_pipeline_new: (skip)
  * @context: a #CoglContext
  *
  * Allocates and initializes a default simple pipeline that will color