--- objects/custom/shape_typeinfo.c.orig	2009-11-07 08:28:34.000000000 -0600
+++ objects/custom/shape_typeinfo.c	2012-04-11 01:39:00.000000000 -0500
@@ -27,8 +27,7 @@
 #include "custom_util.h"
 #include <string.h>
 #include <stdarg.h>
-#include <glib/gstrfuncs.h>
-#include <glib/gstdio.h>
+#include <glib.h>
 #include <libxml/parser.h>
 
 /*
--- tests/test-boundingbox.c.orig	2009-11-07 08:28:35.000000000 -0600
+++ tests/test-boundingbox.c	2012-04-11 01:47:51.000000000 -0500
@@ -28,9 +28,6 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#if GLIB_CHECK_VERSION(2,16,0)
-#include <glib/gtestutils.h>
-#endif
 #include "dialib.h"
 
 /*
--- tests/test-objects.c.orig	2009-11-07 08:28:35.000000000 -0600
+++ tests/test-objects.c	2012-04-11 01:46:51.000000000 -0500
@@ -28,9 +28,6 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#if GLIB_CHECK_VERSION(2,16,0)
-#include <glib/gtestutils.h>
-#endif
 
 #include "object.h"
 #include "plug-ins.h"