diff -Naur abiword-2.8.6-old/goffice-bits/goffice/app/go-cmd-context.c abiword-2.8.6/goffice-bits/goffice/app/go-cmd-context.c
--- abiword-2.8.6-old/goffice-bits/goffice/app/go-cmd-context.c	2006-09-13 01:07:44.000000000 +0300
+++ abiword-2.8.6/goffice-bits/goffice/app/go-cmd-context.c	2012-07-19 14:10:38.430231805 +0300
@@ -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 -Naur abiword-2.8.6-old/goffice-bits/goffice/app/goffice-app.h abiword-2.8.6/goffice-bits/goffice/app/goffice-app.h
--- abiword-2.8.6-old/goffice-bits/goffice/app/goffice-app.h	2007-01-17 01:17:27.000000000 +0200
+++ abiword-2.8.6/goffice-bits/goffice/app/goffice-app.h	2012-07-19 14:10:54.548876629 +0300
@@ -22,7 +22,7 @@
 #ifndef GOFFICE_APP_H
 #define GOFFICE_APP_H
 
-#include <glib/gmacros.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
diff -Naur abiword-2.8.6-old/goffice-bits/goffice/gtk/go-color-palette.c abiword-2.8.6/goffice-bits/goffice/gtk/go-color-palette.c
--- abiword-2.8.6-old/goffice-bits/goffice/gtk/go-color-palette.c	2006-09-13 01:07:44.000000000 +0300
+++ abiword-2.8.6/goffice-bits/goffice/gtk/go-color-palette.c	2012-07-19 14:12:07.556267909 +0300
@@ -36,7 +36,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkcolor.h>
-#include <glib/gi18n-lib.h>
+#include <glib.h>
 #include <gsf/gsf-impl-utils.h>
 
 #include <string.h>
diff -Naur abiword-2.8.6-old/goffice-bits/goffice/gtk/go-combo-box.c abiword-2.8.6/goffice-bits/goffice/gtk/go-combo-box.c
--- abiword-2.8.6-old/goffice-bits/goffice/gtk/go-combo-box.c	2009-05-30 00:41:06.000000000 +0300
+++ abiword-2.8.6/goffice-bits/goffice/gtk/go-combo-box.c	2012-07-19 14:12:20.908973682 +0300
@@ -30,7 +30,7 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#include <glib/gi18n-lib.h>
+#include <glib.h>
 
 #include <gsf/gsf-impl-utils.h>
 
diff -Naur abiword-2.8.6-old/goffice-bits/goffice/gtk/goffice-gtk.c abiword-2.8.6/goffice-bits/goffice/gtk/goffice-gtk.c
--- abiword-2.8.6-old/goffice-bits/goffice/gtk/goffice-gtk.c	2008-08-14 21:15:33.000000000 +0300
+++ abiword-2.8.6/goffice-bits/goffice/gtk/goffice-gtk.c	2012-07-19 14:12:35.828644926 +0300
@@ -28,8 +28,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <atk/atkrelation.h>
 #include <atk/atkrelationset.h>
-#include <glib/gi18n-lib.h>
-#include <glib/gstdio.h>
+#include <glib.h>
 #include <gsf/gsf-input-stdio.h>
 #include <gsf/gsf-input-textline.h>
 
diff -Naur abiword-2.8.6-old/goffice-bits/goffice/utils/go-file.c abiword-2.8.6/goffice-bits/goffice/utils/go-file.c
--- abiword-2.8.6-old/goffice-bits/goffice/utils/go-file.c	2006-09-13 01:07:44.000000000 +0300
+++ abiword-2.8.6/goffice-bits/goffice/utils/go-file.c	2012-07-19 14:11:32.693036121 +0300
@@ -27,8 +27,7 @@
 #include <gsf/gsf-input-memory.h>
 #include <gsf/gsf-input-stdio.h>
 #include <gsf/gsf-output-stdio.h>
-#include <glib/gstdio.h>
-#include <glib/gi18n-lib.h>
+#include <glib.h>
 #ifdef GOFFICE_WITH_GNOME
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libgnomevfs/gnome-vfs-mime-utils.h>
diff -Naur abiword-2.8.6-old/goffice-bits/goffice/utils/go-glib-extras.c abiword-2.8.6/goffice-bits/goffice/utils/go-glib-extras.c
--- abiword-2.8.6-old/goffice-bits/goffice/utils/go-glib-extras.c	2006-09-13 01:07:44.000000000 +0300
+++ abiword-2.8.6/goffice-bits/goffice/utils/go-glib-extras.c	2012-07-19 14:11:14.052446865 +0300
@@ -11,7 +11,7 @@
 #include <goffice/goffice-config.h>
 #include "go-glib-extras.h"
 
-#include <glib/gi18n-lib.h>
+#include <glib.h>
 #include <gsf/gsf-impl-utils.h>
 #include <libxml/encoding.h>
 
diff -Naur abiword-2.8.6-old/goffice-bits/goffice/utils/go-image.c abiword-2.8.6/goffice-bits/goffice/utils/go-image.c
--- abiword-2.8.6-old/goffice-bits/goffice/utils/go-image.c	2006-09-13 01:07:44.000000000 +0300
+++ abiword-2.8.6/goffice-bits/goffice/utils/go-image.c	2012-07-19 14:11:53.244583267 +0300
@@ -22,10 +22,9 @@
 #include <goffice/goffice-config.h>
 #include <goffice/utils/go-color.h>
 #include <goffice/utils/go-image.h>
-#include <glib/gi18n-lib.h>
+#include <glib.h>
 #include <string.h>
 #include <gsf/gsf-impl-utils.h>
-#include <glib/gi18n-lib.h>
 
 /**
  * go_mime_to_image_format:
diff -Naur abiword-2.8.6-old/src/af/util/xp/ut_go_file.h abiword-2.8.6/src/af/util/xp/ut_go_file.h
--- abiword-2.8.6-old/src/af/util/xp/ut_go_file.h	2009-08-27 16:27:10.000000000 +0300
+++ abiword-2.8.6/src/af/util/xp/ut_go_file.h	2012-07-19 14:13:11.947849038 +0300
@@ -31,7 +31,6 @@
 
 #include <glib.h>
 #include <gsf/gsf.h>
-#include <glib/gerror.h>
 #include <time.h>
 
 G_BEGIN_DECLS
diff -Naur abiword-2.8.6-old/src/wp/ap/gtk/abiwidget.cpp abiword-2.8.6/src/wp/ap/gtk/abiwidget.cpp
--- abiword-2.8.6-old/src/wp/ap/gtk/abiwidget.cpp	2010-02-07 21:54:10.000000000 +0200
+++ abiword-2.8.6/src/wp/ap/gtk/abiwidget.cpp	2012-07-19 14:14:34.421031737 +0300
@@ -25,7 +25,7 @@
  */
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff -Naur abiword-2.8.6-old/src/wp/ap/gtk/ap_DocView.cpp abiword-2.8.6/src/wp/ap/gtk/ap_DocView.cpp
--- abiword-2.8.6-old/src/wp/ap/gtk/ap_DocView.cpp	2009-02-17 07:09:25.000000000 +0200
+++ abiword-2.8.6/src/wp/ap/gtk/ap_DocView.cpp	2012-07-19 14:14:58.770495197 +0300
@@ -21,7 +21,7 @@
  */
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>