diff -rup xchat-2.8.8/src/common/dbus/dbus-plugin.c xchat-2.8.8-patched/src/common/dbus/dbus-plugin.c
--- xchat-2.8.8/src/common/dbus/dbus-plugin.c	2009-08-16 12:40:15.000000000 +0300
+++ xchat-2.8.8-patched/src/common/dbus/dbus-plugin.c	2016-01-27 13:36:52.912952047 +0200
@@ -24,7 +24,7 @@
 #include <config.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
-#include <glib/gi18n.h>
+#include <glib.h>
 #include "../xchat-plugin.h"
 
 #define PNAME _("remote access")
diff -rup xchat-2.8.8/src/common/modes.c xchat-2.8.8-patched/src/common/modes.c
--- xchat-2.8.8/src/common/modes.c	2010-05-30 04:52:18.000000000 +0300
+++ xchat-2.8.8-patched/src/common/modes.c	2016-01-27 13:37:12.576950762 +0200
@@ -20,7 +20,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <glib.h>
-#include <glib/gprintf.h>
 
 #include "xchat.h"
 #include "xchatc.h"
diff -rup xchat-2.8.8/src/common/servlist.c xchat-2.8.8-patched/src/common/servlist.c
--- xchat-2.8.8/src/common/servlist.c	2010-05-16 10:24:26.000000000 +0300
+++ xchat-2.8.8-patched/src/common/servlist.c	2016-01-27 13:37:32.349949470 +0200
@@ -24,7 +24,7 @@
 #include <unistd.h>
 
 #include "xchat.h"
-#include <glib/ghash.h>
+#include <glib.h>
 
 #include "cfgfiles.h"
 #include "fe.h"
diff -rup xchat-2.8.8/src/common/text.c xchat-2.8.8-patched/src/common/text.c
--- xchat-2.8.8/src/common/text.c	2010-05-30 05:14:41.000000000 +0300
+++ xchat-2.8.8-patched/src/common/text.c	2016-01-27 13:37:48.738948399 +0200
@@ -28,7 +28,7 @@
 #include <sys/mman.h>
 
 #include "xchat.h"
-#include <glib/ghash.h>
+#include <glib.h>
 #include "cfgfiles.h"
 #include "chanopt.h"
 #include "plugin.h"
diff -rup xchat-2.8.8/src/common/util.c xchat-2.8.8-patched/src/common/util.c
--- xchat-2.8.8/src/common/util.c	2009-08-16 12:40:16.000000000 +0300
+++ xchat-2.8.8-patched/src/common/util.c	2016-01-27 13:38:35.268945358 +0200
@@ -39,7 +39,7 @@
 #include <errno.h>
 #include "xchat.h"
 #include "xchatc.h"
-#include <glib/gmarkup.h>
+#include <glib.h>
 #include <ctype.h>
 #include "util.h"
 #include "../../config.h"
diff -rup xchat-2.8.8/src/common/xchat.h xchat-2.8.8-patched/src/common/xchat.h
--- xchat-2.8.8/src/common/xchat.h	2009-08-16 12:40:16.000000000 +0300
+++ xchat-2.8.8-patched/src/common/xchat.h	2016-01-27 13:38:55.472944038 +0200
@@ -1,10 +1,6 @@
 #include "../../config.h"
 
-#include <glib/gslist.h>
-#include <glib/glist.h>
-#include <glib/gutils.h>
-#include <glib/giochannel.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include <time.h>			/* need time_t */
 
 #ifndef XCHAT_H
diff -rup xchat-2.8.8/src/fe-gtk/sexy-spell-entry.c xchat-2.8.8-patched/src/fe-gtk/sexy-spell-entry.c
--- xchat-2.8.8/src/fe-gtk/sexy-spell-entry.c	2009-08-16 12:40:18.000000000 +0300
+++ xchat-2.8.8-patched/src/fe-gtk/sexy-spell-entry.c	2016-01-27 13:39:18.582942527 +0200
@@ -26,7 +26,7 @@
 #include <gtk/gtk.h>
 #include "sexy-spell-entry.h"
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib.h>
 #include <sys/types.h>
 /*#include "gtkspell-iso-codes.h"
 #include "sexy-marshal.h"*/