--- tests/test-objects.c.orig	2012-03-08 19:12:28.630000003 -0500
+++ tests/test-objects.c	2012-03-08 19:31:17.610000003 -0500
@@ -26,11 +26,12 @@
 #define G_LOG_DOMAIN "Dia"
 
 #include <glib.h>
-#include <glib-object.h>
-
-#if GLIB_CHECK_VERSION(2,16,0)
-#include <glib/gtestutils.h>
-#endif
+#if !GLIB_CHECK_VERSION(2,31,0)
+ #include <glib-object.h>
+ #if GLIB_CHECK_VERSION(2,16,0)
+  #include <glib/gtestutils.h>
+ #endif /* GLIB_CHECK_VERSION(2,16,0) */
+#endif /* !GLIB_CHECK_VERSION(2.31.0) */
 
 #include "object.h"
 #include "plug-ins.h"
--- objects/custom/shape_typeinfo.c.orig	2012-03-08 19:05:38.480000002 -0500
+++ objects/custom/shape_typeinfo.c	2012-03-08 19:09:37.430000003 -0500
@@ -27,8 +27,14 @@
 #include "custom_util.h"
 #include <string.h>
 #include <stdarg.h>
+
+#if !GLIB_CHECK_VERSION(2, 31, 0)
 #include <glib/gstrfuncs.h>
 #include <glib/gstdio.h>
+#else
+#include <glib.h>
+#endif
+
 #include <libxml/parser.h>
 
 /*
--- tests/test-boundingbox.c.orig	2012-03-08 19:45:48.050000001 -0500
+++ tests/test-boundingbox.c	2012-03-08 19:49:58.370000003 -0500
@@ -26,11 +26,13 @@
 #define G_LOG_DOMAIN "Dia"
 
 #include <glib.h>
-#include <glib-object.h>
+#if !GLIB_CHECK_VERSION(2,31,0)
+ #include <glib-object.h>
+ #if GLIB_CHECK_VERSION(2,16,0)
+  #include <glib/gtestutils.h>
+ #endif /* GLIB_CHECK_VERSION(2,16,0) */
+#endif /* !GLIB_CHECK_VERSION(2,31,0) */
 
-#if GLIB_CHECK_VERSION(2,16,0)
-#include <glib/gtestutils.h>
-#endif
 #include "dialib.h"
 
 /*