diff --git a/dbus/dbus-gtype-specialized.c b/dbus/dbus-gtype-specialized.c
index 4046d8b..a7968dc 100644
--- a/dbus/dbus-gtype-specialized.c
+++ b/dbus/dbus-gtype-specialized.c
@@ -23,6 +23,7 @@
  */
 
 #include "dbus-gtype-specialized.h"
+#include "dbus-gvalue-utils.h"
 #include <glib.h>
 #include <string.h>
 #include <gobject/gvaluecollector.h>
@@ -89,7 +90,12 @@ specialized_type_data_quark ()
 void
 dbus_g_type_specialized_init (void)
 {
+  if (specialized_containers)
+    return;
+  
   specialized_containers = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+  
+  _dbus_g_type_specialized_builtins_init ();
 }
 
 static gboolean
diff --git a/dbus/dbus-gvalue.c b/dbus/dbus-gvalue.c
index a580725..23a53b7 100644
--- a/dbus/dbus-gvalue.c
+++ b/dbus/dbus-gvalue.c
@@ -168,7 +168,6 @@ _dbus_g_value_types_init (void)
     return;
 
   dbus_g_type_specialized_init ();
-  _dbus_g_type_specialized_builtins_init ();
 
   /* Register basic types */
   {
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
diff --git a/doc/reference/dbus-binding-tool.xml b/doc/reference/dbus-binding-tool.xml
diff --git a/doc/reference/dbus-glib-docs.sgml b/doc/reference/dbus-glib-docs.sgml
diff --git a/doc/reference/dbus-glib-overrides.txt b/doc/reference/dbus-glib-overrides.txt
diff --git a/doc/reference/dbus-glib-sections.txt b/doc/reference/dbus-glib-sections.txt
diff --git a/doc/reference/dbus-glib-undocumented.txt b/doc/reference/dbus-glib-undocumented.txt
diff --git a/doc/reference/version.xml.in b/doc/reference/version.xml.in
diff --git a/m4/gtk-doc.m4 b/m4/gtk-doc.m4