diff -Naurp gq-1.3.4/src/glib-helpers.c gq-1.3.4.glibc/src/glib-helpers.c
--- gq-1.3.4/src/glib-helpers.c	2008-01-09 10:35:12.000000000 -0600
+++ gq-1.3.4.glibc/src/glib-helpers.c	2012-07-15 16:31:22.935516445 -0500
@@ -23,8 +23,7 @@
 
 #include "glib-helpers.h"
 
-#include <glib/gmessages.h>
-#include <glib/gunicode.h>
+#include <glib.h>
 
 GList*
 g_list_copy_reversed(GList* list) {
diff -Naurp gq-1.3.4/src/glib-helpers.h gq-1.3.4.glibc/src/glib-helpers.h
--- gq-1.3.4/src/glib-helpers.h	2008-01-09 10:35:12.000000000 -0600
+++ gq-1.3.4.glibc/src/glib-helpers.h	2012-07-15 16:29:42.700769552 -0500
@@ -24,7 +24,7 @@
 #ifndef GLIB_HELPERS_H
 #define GLIB_HELPERS_H
 
-#include <glib/glist.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
diff -Naurp gq-1.3.4/src/gq-hash.h gq-1.3.4.glibc/src/gq-hash.h
--- gq-1.3.4/src/gq-hash.h	2008-01-09 10:35:12.000000000 -0600
+++ gq-1.3.4.glibc/src/gq-hash.h	2012-07-15 16:24:46.786468990 -0500
@@ -24,7 +24,7 @@
 #ifndef GQ_ENCRYPTION_H
 #define GQ_ENCRYPTION_H
 
-#include <glib/garray.h>
+#include <glib.h>
 #include "gq-utilities.h"
 
 G_BEGIN_DECLS
diff -Naurp gq-1.3.4/src/gq-main-loop.h gq-1.3.4.glibc/src/gq-main-loop.h
--- gq-1.3.4/src/gq-main-loop.h	2008-01-09 10:35:12.000000000 -0600
+++ gq-1.3.4.glibc/src/gq-main-loop.h	2012-07-15 16:26:57.897829871 -0500
@@ -24,7 +24,7 @@
 #ifndef GQ_MAIN_LOOP_H
 #define GQ_MAIN_LOOP_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
diff -Naurp gq-1.3.4/src/gq-stack.c gq-1.3.4.glibc/src/gq-stack.c
--- gq-1.3.4/src/gq-stack.c	2008-01-09 10:35:12.000000000 -0600
+++ gq-1.3.4.glibc/src/gq-stack.c	2012-07-15 16:32:38.645569939 -0500
@@ -23,9 +23,7 @@
 
 #include "gq-stack.h"
 
-#include <glib/gmem.h>
-#include <glib/gmessages.h>
-#include <glib/glist.h>
+#include <glib.h>
 
 #undef DEBUG_STACK
 
diff -Naurp gq-1.3.4/src/gq-stack.h gq-1.3.4.glibc/src/gq-stack.h
--- gq-1.3.4/src/gq-stack.h	2008-01-09 10:35:12.000000000 -0600
+++ gq-1.3.4.glibc/src/gq-stack.h	2012-07-15 16:21:53.815631421 -0500
@@ -24,7 +24,7 @@
 #ifndef GQ_STACK_H
 #define GQ_STACK_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
diff -Naurp gq-1.3.4/src/gq-tab.h gq-1.3.4.glibc/src/gq-tab.h
--- gq-1.3.4/src/gq-tab.h	2008-01-09 10:35:12.000000000 -0600
+++ gq-1.3.4.glibc/src/gq-tab.h	2012-07-15 16:21:18.083078141 -0500
@@ -24,7 +24,7 @@
 #ifndef GQ_TAB_H
 #define GQ_TAB_H
 
-#include <glib/gmacros.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
diff -Naurp gq-1.3.4/src/state.c gq-1.3.4.glibc/src/state.c
--- gq-1.3.4/src/state.c	2008-01-09 10:35:12.000000000 -0600
+++ gq-1.3.4.glibc/src/state.c	2012-07-15 16:38:38.449071776 -0500
@@ -35,8 +35,7 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include <glib/gi18n.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 
 #include "configfile.h"
diff -Naurp gq-1.3.4/src/syntax.h gq-1.3.4.glibc/src/syntax.h
--- gq-1.3.4/src/syntax.h	2008-01-09 10:35:13.000000000 -0600
+++ gq-1.3.4.glibc/src/syntax.h	2012-07-15 16:20:15.246863703 -0500
@@ -27,7 +27,7 @@
 #ifndef GQ_SYNTAX_H_INCLUDED
 #define GQ_SYNTAX_H_INCLUDED
 
-#include <glib/gmacros.h>
+#include <glib.h>
 
 G_BEGIN_DECLS