diff -up bamf-0.3.6/doc/reference/libbamf/Makefile.am.glibfix bamf-0.3.6/doc/reference/libbamf/Makefile.am
--- bamf-0.3.6/doc/reference/libbamf/Makefile.am.glibfix	2013-01-11 11:57:19.981616000 -0500
+++ bamf-0.3.6/doc/reference/libbamf/Makefile.am	2013-04-25 11:39:43.231676689 -0400
@@ -19,7 +19,7 @@ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.
 DOC_SOURCE_DIR = ../../../lib/libbamf
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS =
+SCANGOBJ_OPTIONS = --type-init-func="g_type_class_ref(G_TYPE_OBJECT);"
 
 # Extra options to supply to gtkdoc-scan.
 # Fx --rebuild-types --rebuild-sections
diff -up bamf-0.3.6/doc/reference/libbamf/Makefile.in.glibfix bamf-0.3.6/doc/reference/libbamf/Makefile.in
--- bamf-0.3.6/doc/reference/libbamf/Makefile.in.glibfix	2013-04-25 11:40:16.699677191 -0400
+++ bamf-0.3.6/doc/reference/libbamf/Makefile.in	2013-04-25 11:40:30.356677396 -0400
@@ -260,7 +260,7 @@ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.
 DOC_SOURCE_DIR = ../../../lib/libbamf
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS = 
+SCANGOBJ_OPTIONS = --type-init-func="g_type_class_ref(G_TYPE_OBJECT);"
 
 # Extra options to supply to gtkdoc-scan.
 # Fx --rebuild-types --rebuild-sections
diff -up bamf-0.3.6/tests/libbamf/test-libbamf.c.glibfix bamf-0.3.6/tests/libbamf/test-libbamf.c
--- bamf-0.3.6/tests/libbamf/test-libbamf.c.glibfix	2013-01-11 11:57:19.981616000 -0500
+++ bamf-0.3.6/tests/libbamf/test-libbamf.c	2013-04-25 11:39:43.231676689 -0400
@@ -30,7 +30,9 @@ void test_matcher_create_suite (void);
 gint
 main (gint argc, gchar *argv[])
 {
+#if !GLIB_CHECK_VERSION(2,35,0)
   g_type_init ();
+#endif
   g_test_init (&argc, &argv, NULL);
 
   gtk_init (&argc, &argv);