diff --git a/cogl/cogl-matrix.c b/cogl/cogl-matrix.c
index 5c3cb67..70e4788 100644
--- a/cogl/cogl-matrix.c
+++ b/cogl/cogl-matrix.c
@@ -65,6 +65,7 @@
 #include "config.h"
 #endif
 
+#include <cogl.h>
 #include <cogl-util.h>
 #include <cogl-debug.h>
 #include <cogl-quaternion.h>
diff --git a/cogl/cogl-types.h b/cogl/cogl-types.h
index 227b7ec..7520c35 100644
--- a/cogl/cogl-types.h
+++ b/cogl/cogl-types.h
@@ -637,7 +637,7 @@ cogl_blend_string_error_quark (void);
  *   requested. An example might be if you try to use too many texture
  *   layers in a single #CoglPipeline</para></listitem>
  *  <listitem><para>The driver does not support some
- *   configuration.</para></listiem>
+ *   configuration.</para></listitem>
  * </itemizedlist>
  *
  * Currently this is only used by Cogl API marked as experimental so
diff --git a/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml.in b/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml.in
index 9fca1bd..a442a58 100644
--- a/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml.in
+++ b/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml.in
@@ -102,8 +102,7 @@
     <section id="cogl-primitive-apis">
       <title>Geometry</title>
       <xi:include href="xml/cogl-primitive.xml"/>
-      <xi:include href="xml/cogl-paths.xml"/>
-      <xi:include href="xml/cogl-rectangle.xml"/>
+      <xi:include href="xml/cogl-path-functions.xml"/>
     </section>
 
     <section id="cogl-textures">
@@ -150,7 +149,6 @@
       <title>Binding and Integrating</title>
       <xi:include href="xml/cogl-sdl.xml"/>
       <xi:include href="xml/cogl-poll.xml"/>
-      <xi:include href="xml/cogl-gtype.xml"/>
       <xi:include href="xml/cogl-gles2.xml"/>
     </section>
 
diff --git a/doc/reference/cogl/cogl-docs.xml.in b/doc/reference/cogl/cogl-docs.xml.in
index 3cd1cf4..46a74c7 100644
--- a/doc/reference/cogl/cogl-docs.xml.in
+++ b/doc/reference/cogl/cogl-docs.xml.in
@@ -63,17 +63,17 @@
     <xi:include href="xml/cogl-color.xml"/>
     <xi:include href="xml/cogl-texture.xml"/>
     <xi:include href="blend-strings.xml"/>
-    <xi:include href="xml/cogl-material.xml"/>
+    <xi:include href="xml/cogl-material-compat.xml"/>
     <xi:include href="xml/cogl-primitives.xml"/>
-    <xi:include href="xml/cogl-paths.xml"/>
-    <xi:include href="xml/cogl-clipping.xml"/>
+    <xi:include href="xml/cogl-path.xml"/>
+    <xi:include href="xml/cogl-path-functions.xml"/>
+    <xi:include href="xml/cogl-clip-state.xml"/>
     <xi:include href="xml/cogl-vertex-buffer.xml"/>
     <xi:include href="xml/cogl-matrix.xml"/>
-    <xi:include href="xml/cogl-shaders.xml"/>
+    <xi:include href="xml/cogl-shader.xml"/>
     <xi:include href="xml/cogl-offscreen.xml"/>
     <xi:include href="xml/cogl-bitmap.xml"/>
     <xi:include href="xml/cogl-fixed.xml"/>
-    <xi:include href="xml/cogl-gtype.xml"/>
 
   </chapter>
 
@@ -119,14 +119,6 @@
 
     </section>
 
-    <xi:include href="xml/cogl-deprecated.xml"/>
-    <xi:include href="xml/cogl-texture-deprecated.xml"/>
-    <xi:include href="xml/cogl-material-deprecated.xml"/>
-    <xi:include href="xml/cogl-clipping-deprecated.xml"/>
-    <xi:include href="xml/cogl-vertex-buffer-deprecated.xml"/>
-    <xi:include href="xml/cogl-shaders-deprecated.xml"/>
-    <xi:include href="xml/cogl-offscreen-deprecated.xml"/>
-
   </chapter>
 
   <chapter id="coglglossary">