diff --git a/ChangeLog b/ChangeLog
index 95d98e058..89900af34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-05-16  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* clutter/clutter-main.[ch]: Add clutter_base_init(), semi-private
+	function to initialise just the base Clutter functionalities; it's
+	only used by gtk-doc to introspect the classes.
+
+	* clutter/clutter-feature.c: Do not access the private features
+	data structure unless it has been initialised.
+
 2007-05-16  Tomas Frydrych  <tf@openedhand.com>
 	
 	* clutter/clutter-alpha.h:
diff --git a/clutter/clutter-feature.c b/clutter/clutter-feature.c
index 015d6ab58..17694f19a 100644
--- a/clutter/clutter-feature.c
+++ b/clutter/clutter-feature.c
@@ -93,7 +93,10 @@ _clutter_feature_init (void)
 gboolean
 clutter_feature_available (ClutterFeatureFlags feature)
 {
-   return (__features->flags & feature);
+  if (G_UNLIKELY (!__features))
+    return FALSE;
+
+  return (__features->flags & feature);
 }
 
 /**
diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c
index bfe3e9df2..44c8a1849 100644
--- a/clutter/clutter-main.c
+++ b/clutter/clutter-main.c
@@ -642,3 +642,18 @@ _clutter_boolean_accumulator (GSignalInvocationHint *ihint,
 
   return continue_emission;
 }
+
+void
+clutter_base_init (void)
+{
+  static gboolean initialised = FALSE;
+
+  if (!initialised)
+    {
+      initialised = TRUE;
+
+      /* initialise GLib type system */
+      g_type_init ();
+      clutter_actor_get_type ();
+    }
+}
diff --git a/clutter/clutter-main.h b/clutter/clutter-main.h
index 1b771fbaf..79f5dca8f 100644
--- a/clutter/clutter-main.h
+++ b/clutter/clutter-main.h
@@ -60,12 +60,14 @@ gint             clutter_main_level       (void);
 
 void             clutter_redraw           (void);
 
-gboolean              clutter_get_debug_enabled (void);
-gboolean              clutter_get_show_fps      (void);
+gboolean         clutter_get_debug_enabled (void);
+gboolean         clutter_get_show_fps      (void);
 
 void             clutter_threads_enter    (void);
 void             clutter_threads_leave    (void);
 
+void             clutter_base_init        (void);
+
 G_END_DECLS
 
 #endif
diff --git a/doc/reference/ChangeLog b/doc/reference/ChangeLog
index 08f8cf511..02050dbe9 100644
--- a/doc/reference/ChangeLog
+++ b/doc/reference/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-16  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* Makefile.am: Use the newly added clutter_base_init() function
+	when scanning the library for documentation.
+
 2007-04-16  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	* clutter-docs.sgml:
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 59235b911..5e3ba82d2 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -21,7 +21,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
 DOC_SOURCE_DIR=../../clutter
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=
+SCANGOBJ_OPTIONS=--type-init-func="clutter_base_init()"
 
 # Extra options to supply to gtkdoc-scan.
 # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" 
diff --git a/doc/reference/tmpl/clutter-alpha.sgml b/doc/reference/tmpl/clutter-alpha.sgml
index e624b298a..93399958c 100644
--- a/doc/reference/tmpl/clutter-alpha.sgml
+++ b/doc/reference/tmpl/clutter-alpha.sgml
@@ -134,7 +134,6 @@ frame 15, and threshold of 1.0 to frame 60.
 @min: lower threshold; a #ClutterFixed value from &lt;0,1&gt;
 @max: upper threshold; a #ClutterFixed value from &lt;0,1&gt;
 
-
 <!-- ##### FUNCTION clutter_smoothstep_copy ##### -->
 <para>
 
@@ -237,3 +236,20 @@ Symbolic name for passing clutter_sine_func().
 @Returns: 
 
 
+<!-- ##### MACRO CLUTTER_ALPHA_SMOOTHSTEP ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION clutter_smoothstep_func ##### -->
+<para>
+
+</para>
+
+@alpha: 
+@data: 
+@Returns: 
+
+
diff --git a/doc/reference/tmpl/clutter-backend.sgml b/doc/reference/tmpl/clutter-backend.sgml
index 3a9ecebec..c08e9b2bf 100644
--- a/doc/reference/tmpl/clutter-backend.sgml
+++ b/doc/reference/tmpl/clutter-backend.sgml
@@ -58,60 +58,6 @@ ClutterBackend
 @event: 
 
 
-<!-- ##### FUNCTION clutter_backend_get_width ##### -->
-<para>
-
-</para>
-
-@backend: 
-@Returns: 
-
-
-<!-- ##### FUNCTION clutter_backend_get_height ##### -->
-<para>
-
-</para>
-
-@backend: 
-@Returns: 
-
-
-<!-- ##### FUNCTION clutter_backend_get_width_mm ##### -->
-<para>
-
-</para>
-
-@backend: 
-@Returns: 
-
-
-<!-- ##### FUNCTION clutter_backend_get_height_mm ##### -->
-<para>
-
-</para>
-
-@backend: 
-@Returns: 
-
-
-<!-- ##### FUNCTION clutter_backend_get_screen_number ##### -->
-<para>
-
-</para>
-
-@backend: 
-@Returns: 
-
-
-<!-- ##### FUNCTION clutter_backend_get_n_screens ##### -->
-<para>
-
-</para>
-
-@backend: 
-@Returns: 
-
-
 <!-- ##### FUNCTION clutter_backend_get_double_click_time ##### -->
 <para>
 
diff --git a/doc/reference/tmpl/clutter-feature.sgml b/doc/reference/tmpl/clutter-feature.sgml
index 0d0dad5a6..6d5585cac 100644
--- a/doc/reference/tmpl/clutter-feature.sgml
+++ b/doc/reference/tmpl/clutter-feature.sgml
@@ -24,6 +24,7 @@ clutter-feature
 
 @CLUTTER_FEATURE_TEXTURE_RECTANGLE: 
 @CLUTTER_FEATURE_SYNC_TO_VBLANK: 
+@CLUTTER_FEATURE_TEXTURE_READ_PIXELS: 
 
 <!-- ##### FUNCTION clutter_feature_available ##### -->
 <para>
@@ -42,10 +43,3 @@ clutter-feature
 @Returns: 
 
 
-<!-- ##### FUNCTION clutter_feature_wait_for_vblank ##### -->
-<para>
-
-</para>
-
-
-
diff --git a/doc/reference/tmpl/clutter-main.sgml b/doc/reference/tmpl/clutter-main.sgml
index 1582b4e03..26865ff14 100644
--- a/doc/reference/tmpl/clutter-main.sgml
+++ b/doc/reference/tmpl/clutter-main.sgml
@@ -83,14 +83,6 @@ Error codes for the Clutter initialisation process.
 @Returns: 
 
 
-<!-- ##### FUNCTION clutter_get_vblank_method ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
 <!-- ##### FUNCTION clutter_main ##### -->
 <para>
 
diff --git a/doc/reference/tmpl/clutter-media.sgml b/doc/reference/tmpl/clutter-media.sgml
index 5330021ec..3d85887af 100644
--- a/doc/reference/tmpl/clutter-media.sgml
+++ b/doc/reference/tmpl/clutter-media.sgml
@@ -23,6 +23,21 @@ clutter-media
 </para>
 
 
+<!-- ##### SIGNAL ClutterMedia::eos ##### -->
+<para>
+
+</para>
+
+@cluttermedia: the object which received the signal.
+
+<!-- ##### SIGNAL ClutterMedia::error ##### -->
+<para>
+
+</para>
+
+@cluttermedia: the object which received the signal.
+@arg1: 
+
 <!-- ##### ARG ClutterMedia:buffer-percent ##### -->
 <para>