diff -Nur abiword-2.8.6.orig/src/af/util/xp/ut_go_file.h abiword-2.8.6/src/af/util/xp/ut_go_file.h
--- abiword-2.8.6.orig/src/af/util/xp/ut_go_file.h	2009-08-27 08:27:10.000000000 -0500
+++ abiword-2.8.6/src/af/util/xp/ut_go_file.h	2012-09-22 03:36:55.774542745 -0500
@@ -31,7 +31,6 @@
 
 #include <glib.h>
 #include <gsf/gsf.h>
-#include <glib/gerror.h>
 #include <time.h>
 
 G_BEGIN_DECLS
diff -Nur abiword-2.8.6.orig/goffice-bits/goffice/app/goffice-app.h abiword-2.8.6/goffice-bits/goffice/app/goffice-app.h
--- abiword-2.8.6.orig/goffice-bits/goffice/app/goffice-app.h	2007-01-16 18:17:27.000000000 -0500
+++ abiword-2.8.6/goffice-bits/goffice/app/goffice-app.h	2012-09-22 03:35:46.741217566 -0500
@@ -22,7 +22,7 @@
 #ifndef GOFFICE_APP_H
 #define GOFFICE_APP_H
 
-#include <glib/gmacros.h>
+#include <glib.h>
 
 G_BEGIN_DECLS