diff -Naur mason-larobina-luakit-b1fb7fa.orig/build-utils/gentokens.lua mason-larobina-luakit-b1fb7fa/build-utils/gentokens.lua
--- mason-larobina-luakit-b1fb7fa.orig/build-utils/gentokens.lua	2011-07-27 05:46:01.000000000 -0400
+++ mason-larobina-luakit-b1fb7fa/build-utils/gentokens.lua	2012-07-26 17:45:08.169438638 -0400
@@ -22,7 +22,7 @@
 #ifndef LUAKIT_COMMON_TOKENIZE_H
 #define LUAKIT_COMMON_TOKENIZE_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 typedef enum luakit_token_t {
     L_TK_UNKNOWN=0, /* (luakit_token_t) NULL == L_TK_UNKNOWN */
@@ -37,7 +37,7 @@
 tokenize_c = [[
 /* This file is autogenerated by build-utils/gentokens.lua */
 
-#include <glib/ghash.h>
+#include <glib.h>
 #include "common/tokenize.h"
 
 static GHashTable *tokens = NULL;
diff -Naur mason-larobina-luakit-b1fb7fa.orig/common/luaclass.h mason-larobina-luakit-b1fb7fa/common/luaclass.h
--- mason-larobina-luakit-b1fb7fa.orig/common/luaclass.h	2011-07-27 05:46:01.000000000 -0400
+++ mason-larobina-luakit-b1fb7fa/common/luaclass.h	2012-07-26 17:45:46.880679535 -0400
@@ -26,7 +26,7 @@
 #include "common/signal.h"
 #include "common/tokenize.h"
 
-#include <glib/gtree.h>
+#include <glib.h>
 
 typedef struct     lua_class_property lua_class_property_t;
 typedef GHashTable lua_class_property_array_t;
diff -Naur mason-larobina-luakit-b1fb7fa.orig/common/property.h mason-larobina-luakit-b1fb7fa/common/property.h
--- mason-larobina-luakit-b1fb7fa.orig/common/property.h	2011-07-27 05:46:01.000000000 -0400
+++ mason-larobina-luakit-b1fb7fa/common/property.h	2012-07-26 17:45:23.426539315 -0400
@@ -22,7 +22,7 @@
 #define LUAKIT_COMMON_PROPERTY_H
 
 #include <lua.h>
-#include <glib/ghash.h>
+#include <glib.h>
 
 typedef enum {
     BOOL,
diff -Naur mason-larobina-luakit-b1fb7fa.orig/common/signal.h mason-larobina-luakit-b1fb7fa/common/signal.h
--- mason-larobina-luakit-b1fb7fa.orig/common/signal.h	2011-07-27 05:46:01.000000000 -0400
+++ mason-larobina-luakit-b1fb7fa/common/signal.h	2012-07-26 17:45:37.164619352 -0400
@@ -22,10 +22,7 @@
 #ifndef LUAKIT_COMMON_SIGNAL
 #define LUAKIT_COMMON_SIGNAL
 
-#include <glib/garray.h>
-#include <glib/gstrfuncs.h>
-#include <glib/gtestutils.h>
-#include <glib/gtree.h>
+#include <glib.h>
 
 #include "common/util.h"
 
diff -Naur mason-larobina-luakit-b1fb7fa.orig/common/util.h mason-larobina-luakit-b1fb7fa/common/util.h
--- mason-larobina-luakit-b1fb7fa.orig/common/util.h	2011-07-27 05:46:01.000000000 -0400
+++ mason-larobina-luakit-b1fb7fa/common/util.h	2012-07-26 17:45:27.281561481 -0400
@@ -23,7 +23,7 @@
 #ifndef LUAKIT_COMMON_UTIL_H
 #define LUAKIT_COMMON_UTIL_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <string.h>
 #include <unistd.h>
 
diff -Naur mason-larobina-luakit-b1fb7fa.orig/globalconf.h.in mason-larobina-luakit-b1fb7fa/globalconf.h.in
--- mason-larobina-luakit-b1fb7fa.orig/globalconf.h.in	2011-07-27 05:46:01.000000000 -0400
+++ mason-larobina-luakit-b1fb7fa/globalconf.h.in	2012-07-26 17:45:15.620482332 -0400
@@ -31,7 +31,7 @@
  * \see http://www.lua.org/manual/5.1/manual.html#3.5 */
 #define LUAKIT_OBJECT_REGISTRY_KEY "luakit.object.registry"
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <lua.h>
 #include "common/signal.h"