Index: plugins/vfspk3/Doom3FileSystem.cpp
===================================================================
--- plugins/vfspk3/Doom3FileSystem.cpp	(revision 7108)
+++ plugins/vfspk3/Doom3FileSystem.cpp	(working copy)
@@ -46,8 +46,12 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+
+/*
 #include <glib/gdir.h>
 #include <glib/gstrfuncs.h>
+*/
+#include <glib.h>
 
 #include "iradiant.h"
 #include "idatastream.h"
Index: libs/os/dir.h
===================================================================
--- libs/os/dir.h	(revision 7108)
+++ libs/os/dir.h	(working copy)
@@ -25,7 +25,8 @@
 /// \file
 /// \brief OS directory-listing object.
 
-#include <glib/gdir.h>
+//#include <glib/gdir.h>
+#include <glib.h>
 
 #include <string>
 #include <stdexcept>
Index: libs/gtkutil/IConv.h
===================================================================
--- libs/gtkutil/IConv.h	(revision 7108)
+++ libs/gtkutil/IConv.h	(working copy)
@@ -1,11 +1,14 @@
 #ifndef _GTKUTIL_ICONV_H
 #define _GTKUTIL_ICONV_H
 
+/*
 #include <glib/gconvert.h>
 #include <glib/gmessages.h>
 #include <glib/gunicode.h>
 #include <glib/gmem.h>
 #include <string>
+*/
+#include <glib.h>
 
 #include <cassert>
 
Index: libs/gtkutil/DeferredMotionDelta.h
===================================================================
--- libs/gtkutil/DeferredMotionDelta.h	(revision 7108)
+++ libs/gtkutil/DeferredMotionDelta.h	(working copy)
@@ -1,7 +1,9 @@
 #pragma once
 
 #include <sigc++/connection.h>
-#include <glib/gmain.h>
+
+//#include <glib/gmain.h>
+#include <glib.h>
 #include <gdk/gdkevents.h>
 #include <boost/function.hpp>
 
Index: libs/gtkutil/event/SingleIdleCallback.h
===================================================================
--- libs/gtkutil/event/SingleIdleCallback.h	(revision 7108)
+++ libs/gtkutil/event/SingleIdleCallback.h	(working copy)
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <glib/gmain.h>
+//#include <glib/gmain.h>
+#include <glib.h>
 
 #include <iostream>
 
Index: radiant/log/GtkLogRedirector.h
===================================================================
--- radiant/log/GtkLogRedirector.h	(revision 7108)
+++ radiant/log/GtkLogRedirector.h	(working copy)
@@ -4,8 +4,12 @@
 #include "LogStream.h"
 #include <boost/shared_ptr.hpp>
 #include <map>
+
+/*
 #include <glib/gtypes.h>
 #include <glib/gmessages.h>
+*/
+#include <glib.h>
 
 namespace applog {
 
Index: radiant/modulesystem/ApplicationContextImpl.cpp
===================================================================
--- radiant/modulesystem/ApplicationContextImpl.cpp	(revision 7108)
+++ radiant/modulesystem/ApplicationContextImpl.cpp	(working copy)
@@ -70,7 +70,8 @@
 #include <pwd.h>
 #include <unistd.h>
 
-#include <glib/gutils.h>
+//#include <glib/gutils.h>
+#include <glib.h>
 
 const char* LINK_NAME =
 #if defined (__linux__)
Index: radiant/patch/PatchBezier.h
===================================================================
--- radiant/patch/PatchBezier.h	(revision 7108)
+++ radiant/patch/PatchBezier.h	(working copy)
@@ -1,7 +1,9 @@
 #pragma once
 
 #include "math/Vector3.h"
-#include <glib/gslist.h>
+
+//#include <glib/gslist.h>
+#include <glib.h>
 #include <limits>
 #include <vector>