diff -up abiword-2.8.6/goffice-bits/goffice/app/go-cmd-context.c.glibfix abiword-2.8.6/goffice-bits/goffice/app/go-cmd-context.c
--- abiword-2.8.6/goffice-bits/goffice/app/go-cmd-context.c.glibfix	2012-02-27 15:04:45.744812212 -0500
+++ abiword-2.8.6/goffice-bits/goffice/app/go-cmd-context.c	2012-02-27 15:05:51.628239624 -0500
@@ -10,7 +10,7 @@
 #include "go-cmd-context-impl.h"
 #include <goffice/app/goffice-app.h>
 #include <gsf/gsf-impl-utils.h>
-#include <glib/gi18n-lib.h>
+#include <glib.h>
 
 #define GCC_CLASS(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), GO_CMD_CONTEXT_TYPE, GOCmdContextClass))
 
diff -up abiword-2.8.6/goffice-bits/goffice/app/goffice-app.h.glibfix abiword-2.8.6/goffice-bits/goffice/app/goffice-app.h
--- abiword-2.8.6/goffice-bits/goffice/app/goffice-app.h.glibfix	2012-02-27 15:06:06.157113352 -0500
+++ abiword-2.8.6/goffice-bits/goffice/app/goffice-app.h	2012-02-27 15:06:11.037070941 -0500
@@ -22,7 +22,7 @@
 #ifndef GOFFICE_APP_H
 #define GOFFICE_APP_H
 
-#include <glib/gmacros.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
diff -up abiword-2.8.6/src/af/util/xp/ut_go_file.h.glibfix abiword-2.8.6/src/af/util/xp/ut_go_file.h
--- abiword-2.8.6/src/af/util/xp/ut_go_file.h.glibfix	2012-02-27 15:07:23.222443598 -0500
+++ abiword-2.8.6/src/af/util/xp/ut_go_file.h	2012-02-27 15:07:26.708413289 -0500
@@ -31,7 +31,6 @@
 
 #include <glib.h>
 #include <gsf/gsf.h>
-#include <glib/gerror.h>
 #include <time.h>
 
 G_BEGIN_DECLS