Switch to top-level glib headers. Thanks to DimStar for patch

Fixed bugs:
  - https://launchpad.net/bugs/898538

(bzr r10762)

147 files changed, 137 insertions, 178 deletions

diff --git a/src/attributes.cpp b/src/attributes.cpp
index 34312ebe8..9203d916b 100644
--- a/src/attributes.cpp
+++ b/src/attributes.cpp
@@ -18,7 +18,6 @@
 #endif
 
 #include <glib.h> // g_assert()
-#include <glib/ghash.h>
 #include "attributes.h"
 
 typedef struct {
diff --git a/src/attributes.h b/src/attributes.h
index 7a1dc559f..1c1d092cf 100644
--- a/src/attributes.h
+++ b/src/attributes.h
@@ -13,8 +13,7 @@
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
-#include <glib/gtypes.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 
 unsigned int sp_attribute_lookup(gchar const *key);
 unsigned char const *sp_attribute_name(unsigned int id);
diff --git a/src/bind/javabind.cpp b/src/bind/javabind.cpp
index 41da00e81..d2091eb1b 100644
--- a/src/bind/javabind.cpp
+++ b/src/bind/javabind.cpp
@@ -62,7 +62,7 @@
 #include "javabind-private.h"
 #include <path-prefix.h>
 #include <prefix.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 
 //For repr and document
 #include <document.h>
diff --git a/src/cms-color-types.h b/src/cms-color-types.h
index 74fdac12c..ec285a8a2 100644
--- a/src/cms-color-types.h
+++ b/src/cms-color-types.h
@@ -5,7 +5,7 @@
  * A simple abstraction to provide opaque compatibility with either lcms or lcms2.
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 
 typedef void * cmsHPROFILE;
diff --git a/src/cms-system.h b/src/cms-system.h
index 1f75f8619..c528deb94 100644
--- a/src/cms-system.h
+++ b/src/cms-system.h
@@ -6,7 +6,7 @@
  */
 
 #include <glib-object.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <vector>
 #include <glibmm/ustring.h>
 #include "cms-color-types.h"
diff --git a/src/color-profile.h b/src/color-profile.h
index ae63e4047..8b23c1b04 100644
--- a/src/color-profile.h
+++ b/src/color-profile.h
@@ -6,7 +6,7 @@
  */
 
 #include <vector>
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <sp-object.h>
 #include <glibmm/ustring.h>
 #include "cms-color-types.h"
diff --git a/src/color-rgba.h b/src/color-rgba.h
index 0d7a0c00d..ef7d9aee1 100644
--- a/src/color-rgba.h
+++ b/src/color-rgba.h
@@ -10,7 +10,6 @@
 #define SEEN_COLOR_RGBA_H
 
 #include <glib.h> // g_assert()
-#include <glib/gmessages.h>
 #include "decimal-round.h"
 
 /**
diff --git a/src/conn-avoid-ref.h b/src/conn-avoid-ref.h
index 9a028371a..f99d1f0cb 100644
--- a/src/conn-avoid-ref.h
+++ b/src/conn-avoid-ref.h
@@ -13,7 +13,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gslist.h>
+#include <glib.h>
 #include <stddef.h>
 #include <sigc++/connection.h>
 
diff --git a/src/debug/logger.cpp b/src/debug/logger.cpp
index bc761d67e..485dbc365 100644
--- a/src/debug/logger.cpp
+++ b/src/debug/logger.cpp
@@ -11,7 +11,7 @@
 
 #include <fstream>
 #include <vector>
-#include <glib/gmessages.h>
+#include <glib.h>
 #include "inkscape-version.h"
 #include "debug/logger.h"
 #include "debug/simple-event.h"
diff --git a/src/debug/simple-event.h b/src/debug/simple-event.h
index d09358224..506ee1b03 100644
--- a/src/debug/simple-event.h
+++ b/src/debug/simple-event.h
@@ -15,8 +15,6 @@
 #include <stdarg.h>
 #include <vector>
 #include <glib.h> // g_assert()
-#include <glib/gstrfuncs.h>
-#include <glib/gmessages.h>
 
 #include "gc-alloc.h"
 #include "debug/event.h"
diff --git a/src/debug/timestamp.cpp b/src/debug/timestamp.cpp
index 4c014e965..e100134c8 100644
--- a/src/debug/timestamp.cpp
+++ b/src/debug/timestamp.cpp
@@ -10,8 +10,7 @@
  */
 
 
-#include <glib/gtypes.h>
-#include <glib/gmain.h>
+#include <glib.h>
 #include <glibmm/ustring.h>
 #include "debug/simple-event.h"
 
diff --git a/src/dialogs/clonetiler.cpp b/src/dialogs/clonetiler.cpp
index 29098abf6..1bb6b75d0 100644
--- a/src/dialogs/clonetiler.cpp
+++ b/src/dialogs/clonetiler.cpp
@@ -16,7 +16,7 @@
 #endif
 
 #include <climits>
-#include <glib/gmem.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 #include <glibmm/i18n.h>
 #include <2geom/transforms.h>
diff --git a/src/dir-util.cpp b/src/dir-util.cpp
index acec39953..7d4054745 100644
--- a/src/dir-util.cpp
+++ b/src/dir-util.cpp
@@ -6,11 +6,7 @@
 #include <errno.h>
 #include <string>
 #include <cstring>
-#include <glib/gutils.h>
-#include <glib/gmem.h>
-#include <glib/gerror.h>
-#include <glib/gconvert.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 
 std::string sp_relative_path_from_path( std::string const &path, std::string const &base)
 {
diff --git a/src/dir-util.h b/src/dir-util.h
index f7700cfa3..17261af41 100644
--- a/src/dir-util.h
+++ b/src/dir-util.h
@@ -10,7 +10,7 @@
  */
 
 #include <stdlib.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 /** 
  * Returns a form of \a path relative to \a base if that is easy to construct (eg if \a path
diff --git a/src/display/canvas-bpath.h b/src/display/canvas-bpath.h
index 752ed73ea..f0520f012 100644
--- a/src/display/canvas-bpath.h
+++ b/src/display/canvas-bpath.h
@@ -15,7 +15,7 @@
  *
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 #include "sp-canvas-item.h"
 
diff --git a/src/display/canvas-temporary-item.h b/src/display/canvas-temporary-item.h
index c8917b530..09d243fa1 100644
--- a/src/display/canvas-temporary-item.h
+++ b/src/display/canvas-temporary-item.h
@@ -13,7 +13,7 @@
 
 #include <stddef.h>
 #include <sigc++/sigc++.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 struct SPCanvasItem;
 
diff --git a/src/display/curve.cpp b/src/display/curve.cpp
index d52ee1fba..1a788b59a 100644
--- a/src/display/curve.cpp
+++ b/src/display/curve.cpp
@@ -19,7 +19,7 @@
 
 #include "display/curve.h"
 
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <2geom/pathvector.h>
 #include <2geom/sbasis-geometric.h>
 #include <2geom/sbasis-to-bezier.h>
diff --git a/src/display/curve.h b/src/display/curve.h
index 4f129b542..4866655c4 100644
--- a/src/display/curve.h
+++ b/src/display/curve.h
@@ -13,8 +13,7 @@
  * Released under GNU GPL
  */
 
-#include <glib/gtypes.h>
-#include <glib/gslist.h>
+#include <glib.h>
 
 #include <2geom/forward.h>
 
diff --git a/src/display/gnome-canvas-acetate.h b/src/display/gnome-canvas-acetate.h
index ed6c99811..447c3a9c4 100644
--- a/src/display/gnome-canvas-acetate.h
+++ b/src/display/gnome-canvas-acetate.h
@@ -15,7 +15,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include "display/sp-canvas-item.h"
 
 
diff --git a/src/display/nr-3dutils.cpp b/src/display/nr-3dutils.cpp
index eb6858374..d2ac7d82b 100644
--- a/src/display/nr-3dutils.cpp
+++ b/src/display/nr-3dutils.cpp
@@ -9,7 +9,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gmessages.h>
+#include <glib.h>
 
 #include "display/nr-3dutils.h"
 #include <cmath>
diff --git a/src/display/nr-filter-diffuselighting.cpp b/src/display/nr-filter-diffuselighting.cpp
index 9df771879..fcc986189 100644
--- a/src/display/nr-filter-diffuselighting.cpp
+++ b/src/display/nr-filter-diffuselighting.cpp
@@ -11,7 +11,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gmessages.h>
+#include <glib.h>
 
 #include "display/cairo-templates.h"
 #include "display/cairo-utils.h"
diff --git a/src/display/nr-filter-specularlighting.cpp b/src/display/nr-filter-specularlighting.cpp
index 0530e38cb..0242754eb 100644
--- a/src/display/nr-filter-specularlighting.cpp
+++ b/src/display/nr-filter-specularlighting.cpp
@@ -10,7 +10,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <cmath>
 
 #include "display/cairo-templates.h"
diff --git a/src/display/sodipodi-ctrlrect.h b/src/display/sodipodi-ctrlrect.h
index 05688e6b5..65a40a850 100644
--- a/src/display/sodipodi-ctrlrect.h
+++ b/src/display/sodipodi-ctrlrect.h
@@ -17,7 +17,7 @@
  *
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include "sp-canvas-item.h"
 #include <2geom/rect.h>
 #include <2geom/int-rect.h>
diff --git a/src/display/sp-canvas.h b/src/display/sp-canvas.h
index f0deaa594..14cbab6c3 100644
--- a/src/display/sp-canvas.h
+++ b/src/display/sp-canvas.h
@@ -29,7 +29,7 @@
 # endif
 #endif
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include <glibmm/ustring.h>
diff --git a/src/document-subset.cpp b/src/document-subset.cpp
index e71b9bad5..1cc337cb7 100644
--- a/src/document-subset.cpp
+++ b/src/document-subset.cpp
@@ -13,7 +13,7 @@
 #include "document.h"
 #include "sp-object.h"
 
-#include <glib/gmessages.h>
+#include <glib.h>
 
 #include <sigc++/signal.h>
 #include <sigc++/functors/mem_fun.h>
diff --git a/src/draw-anchor.h b/src/draw-anchor.h
index 4aa713b52..fc3ebaffc 100644
--- a/src/draw-anchor.h
+++ b/src/draw-anchor.h
@@ -5,7 +5,7 @@
  * Drawing anchors. 
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <2geom/point.h>
 
 struct SPDrawContext;
diff --git a/src/dyna-draw-context.cpp b/src/dyna-draw-context.cpp
index 5bc258dbc..32da6de4e 100644
--- a/src/dyna-draw-context.cpp
+++ b/src/dyna-draw-context.cpp
@@ -38,7 +38,7 @@
 #include <2geom/pathvector.h>
 #include <2geom/bezier-utils.h>
 #include "display/curve.h"
-#include <glib/gmem.h>
+#include <glib.h>
 #include "macros.h"
 #include "document.h"
 #include "selection.h"
diff --git a/src/eraser-context.cpp b/src/eraser-context.cpp
index 11b150aa0..2352d909f 100644
--- a/src/eraser-context.cpp
+++ b/src/eraser-context.cpp
@@ -38,7 +38,7 @@
 #include "display/canvas-bpath.h"
 #include <2geom/bezier-utils.h>
 
-#include <glib/gmem.h>
+#include <glib.h>
 #include "macros.h"
 #include "document.h"
 #include "selection.h"
diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp
index b8e924926..78f705298 100644
--- a/src/extension/internal/cairo-render-context.cpp
+++ b/src/extension/internal/cairo-render-context.cpp
@@ -29,7 +29,7 @@
 #include <errno.h>
 #include <2geom/pathvector.h>
 
-#include <glib/gmem.h>
+#include <glib.h>
 
 #include <glibmm/i18n.h>
 #include "display/drawing.h"
diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp
index 6c77005fe..42c60f52c 100644
--- a/src/extension/internal/cairo-renderer.cpp
+++ b/src/extension/internal/cairo-renderer.cpp
@@ -32,7 +32,7 @@
 #include <2geom/transforms.h>
 #include <2geom/pathvector.h>
 
-#include <glib/gmem.h>
+#include <glib.h>
 
 #include <glibmm/i18n.h>
 #include "display/curve.h"
diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
index c289d9b36..a550565d6 100644
--- a/src/extension/internal/pdfinput/svg-builder.h
+++ b/src/extension/internal/pdfinput/svg-builder.h
@@ -47,7 +47,7 @@ class XRef;
 class SPCSSAttr;
 
 #include <vector>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extract-uri.h b/src/extract-uri.h
index b41a2b9d9..a6707f1a1 100644
--- a/src/extract-uri.h
+++ b/src/extract-uri.h
@@ -1,7 +1,7 @@
 #ifndef SEEN_EXTRACT_URI_H
 #define SEEN_EXTRACT_URI_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 gchar *extract_uri(gchar const *s, gchar const** endptr = 0);
 
diff --git a/src/file.cpp b/src/file.cpp
index e8901d306..4feb36f9d 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -30,7 +30,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <glib/gmem.h>
+#include <glib.h>
 #include <glibmm/i18n.h>
 
 #include "desktop.h"
diff --git a/src/file.h b/src/file.h
index 5a43ffa5e..7e44d7da1 100644
--- a/src/file.h
+++ b/src/file.h
@@ -16,7 +16,7 @@
  */
 
 #include <gtkmm.h>
-#include <glib/gslist.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 
 #include "extension/system.h"
diff --git a/src/gc-anchored.h b/src/gc-anchored.h
index b7c0cd0e4..a20904dce 100644
--- a/src/gc-anchored.h
+++ b/src/gc-anchored.h
@@ -9,7 +9,7 @@
 #ifndef SEEN_INKSCAPE_GC_ANCHORED_H
 #define SEEN_INKSCAPE_GC_ANCHORED_H
 
-#include <glib/gmessages.h>
+#include <glib.h>
 #include "gc-managed.h"
 
 namespace Inkscape {
diff --git a/src/gc-core.h b/src/gc-core.h
index 32779c83f..85fbada60 100644
--- a/src/gc-core.h
+++ b/src/gc-core.h
@@ -24,7 +24,7 @@
 #else
 # include <gc.h>
 #endif
-#include <glib/gmain.h>
+#include <glib.h>
 
 namespace Inkscape {
 namespace GC {
diff --git a/src/gc.cpp b/src/gc.cpp
index 1ba0826ef..9c59691cb 100644
--- a/src/gc.cpp
+++ b/src/gc.cpp
@@ -13,7 +13,7 @@
 #include <stdexcept>
 #include <cstring>
 #include <string>
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <sigc++/functors/ptr_fun.h>
 #include <glibmm/main.h>
 #include <cstddef>
diff --git a/src/gradient-drag.h b/src/gradient-drag.h
index 2fd0e46f0..cb3f13e71 100644
--- a/src/gradient-drag.h
+++ b/src/gradient-drag.h
@@ -14,7 +14,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gslist.h>
 #include <stddef.h>
 #include <sigc++/sigc++.h>
 #include <vector>
diff --git a/src/help.h b/src/help.h
index 2ded43c39..3fce65fef 100644
--- a/src/help.h
+++ b/src/help.h
@@ -10,7 +10,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 
 /**
diff --git a/src/helper/gnome-utils.h b/src/helper/gnome-utils.h
index 1a087433e..3502b28df 100644
--- a/src/helper/gnome-utils.h
+++ b/src/helper/gnome-utils.h
@@ -15,8 +15,7 @@
 #ifndef __GNOME_UTILS_H__
 #define __GNOME_UTILS_H__
 
-#include <glib/gtypes.h>
-#include <glib/glist.h>
+#include <glib.h>
 
 GList *gnome_uri_list_extract_uris(gchar const *uri_list);
 
diff --git a/src/helper/pixbuf-ops.cpp b/src/helper/pixbuf-ops.cpp
index 9f80cc58b..f980953dc 100644
--- a/src/helper/pixbuf-ops.cpp
+++ b/src/helper/pixbuf-ops.cpp
@@ -16,7 +16,6 @@
 #endif
 
 #include <glib.h>
-#include <glib/gmessages.h>
 #include <png.h>
 #include <2geom/transforms.h>
 
diff --git a/src/helper/pixbuf-ops.h b/src/helper/pixbuf-ops.h
index a985be297..af573277c 100644
--- a/src/helper/pixbuf-ops.h
+++ b/src/helper/pixbuf-ops.h
@@ -12,7 +12,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 struct SPDocument;
 
diff --git a/src/helper/png-write.cpp b/src/helper/png-write.cpp
index 992c7b886..febdb645e 100644
--- a/src/helper/png-write.cpp
+++ b/src/helper/png-write.cpp
@@ -19,7 +19,7 @@
 #include "interface.h"
 #include <2geom/rect.h>
 #include <2geom/transforms.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <png.h>
 #include "png-write.h"
 #include "io/sys.h"
diff --git a/src/helper/png-write.h b/src/helper/png-write.h
index 83321aa4e..f8ba4bbf6 100644
--- a/src/helper/png-write.h
+++ b/src/helper/png-write.h
@@ -12,7 +12,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <2geom/forward.h>
 struct SPDocument;
 
diff --git a/src/helper/stlport.h b/src/helper/stlport.h
index c9389e814..c7b00eb28 100644
--- a/src/helper/stlport.h
+++ b/src/helper/stlport.h
@@ -3,8 +3,7 @@
 
 
 #include <list>
-#include <glib/glist.h>
-#include <glib/gslist.h>
+#include <glib.h>
 
 template <typename T>
 class StlConv {
diff --git a/src/helper/stock-items.h b/src/helper/stock-items.h
index 7299e070e..990f45254 100644
--- a/src/helper/stock-items.h
+++ b/src/helper/stock-items.h
@@ -13,7 +13,7 @@
  *
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 class SPObject;
 
diff --git a/src/helper/unit-menu.h b/src/helper/unit-menu.h
index b495a3c15..b3ee6bcd1 100644
--- a/src/helper/unit-menu.h
+++ b/src/helper/unit-menu.h
@@ -10,7 +10,7 @@
  *
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 
 struct SPUnit;
diff --git a/src/helper/units.h b/src/helper/units.h
index 8dc62fee6..93bd70615 100644
--- a/src/helper/units.h
+++ b/src/helper/units.h
@@ -15,9 +15,7 @@
  *
  */
 
-#include <glib/gmessages.h>
-#include <glib/gslist.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 #include "sp-metric.h"
 
 
diff --git a/src/inkscape.h b/src/inkscape.h
index 64cee1560..6ab07be86 100644
--- a/src/inkscape.h
+++ b/src/inkscape.h
@@ -13,7 +13,7 @@
  */
 
 #include <list>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 struct SPDesktop;
 struct SPDocument;
diff --git a/src/inkview.cpp b/src/inkview.cpp
index 0b1292e8e..1fd5c2d56 100644
--- a/src/inkview.cpp
+++ b/src/inkview.cpp
@@ -38,7 +38,7 @@
 #include <sys/stat.h>
 #include <locale.h>
 
-#include <glib/gmem.h>
+#include <glib.h>
 
 // #include <stropts.h>
 
diff --git a/src/io/inkjar.h b/src/io/inkjar.h
index 0fe088b24..ea4b0ee32 100644
--- a/src/io/inkjar.h
+++ b/src/io/inkjar.h
@@ -26,8 +26,7 @@
 # endif
 #endif
 
-#include <glib/garray.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 namespace Inkjar {
 
diff --git a/src/io/resource.cpp b/src/io/resource.cpp
index 4eeaf3b8c..ac1c5f06b 100644
--- a/src/io/resource.cpp
+++ b/src/io/resource.cpp
@@ -17,9 +17,6 @@
 #endif
 
 #include <glib.h> // g_assert()
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
-#include <glib/gfileutils.h>
 #include "path-prefix.h"
 #include "inkscape.h"
 #include "io/resource.h"
diff --git a/src/io/sys.cpp b/src/io/sys.cpp
index 437a9d18c..e83861237 100644
--- a/src/io/sys.cpp
+++ b/src/io/sys.cpp
@@ -17,9 +17,7 @@
 
 #include <glib.h>
 #include <glib/gstdio.h>
-#include <glib/gutils.h>
 #include <glibmm/fileutils.h>
-#include <glib/gstdio.h>
 #include <glibmm/ustring.h>
 #include <gtk/gtk.h>
 
diff --git a/src/io/sys.h b/src/io/sys.h
index 8623f6be9..83ffdb41c 100644
--- a/src/io/sys.h
+++ b/src/io/sys.h
@@ -15,9 +15,7 @@
 #include <stdio.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <glib/gtypes.h>
-#include <glib/gdir.h>
-#include <glib/gfileutils.h>
+#include <glib.h>
 #include <glibmm/spawn.h>
 #include <string>
 
diff --git a/src/knot-holder-entity.h b/src/knot-holder-entity.h
index 726d969c2..e708486ca 100644
--- a/src/knot-holder-entity.h
+++ b/src/knot-holder-entity.h
@@ -14,7 +14,7 @@
  * Released under GNU GPL
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include "knot.h"
 #include <2geom/forward.h>
 #include "snapper.h"
diff --git a/src/knotholder.h b/src/knotholder.h
index 2e2844801..9a4dda1da 100644
--- a/src/knotholder.h
+++ b/src/knotholder.h
@@ -17,7 +17,7 @@
  *
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include "knot-enums.h"
 #include <2geom/forward.h>
 #include "knot-holder-entity.h"
diff --git a/src/libcroco/cr-libxml-node-iface.h b/src/libcroco/cr-libxml-node-iface.h
index 5da0d9ae3..b4a621293 100644
--- a/src/libcroco/cr-libxml-node-iface.h
+++ b/src/libcroco/cr-libxml-node-iface.h
@@ -1,7 +1,7 @@
 #ifndef __CR_LIBXML_NODE_IFACE_H__
 #define __CR_LIBXML_NODE_IFACE_H__
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include "cr-node-iface.h"
 
 G_BEGIN_DECLS
diff --git a/src/libcroco/cr-node-iface.h b/src/libcroco/cr-node-iface.h
index 9c2d30efe..01898d641 100644
--- a/src/libcroco/cr-node-iface.h
+++ b/src/libcroco/cr-node-iface.h
@@ -1,8 +1,7 @@
 #ifndef __CR_NODE_IFACE_H__
 #define __CR_NODE_IFACE_H__
 
-#include <glib/gmacros.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp
index e6d22e070..63f9bd6b0 100644
--- a/src/libnrtype/FontFactory.cpp
+++ b/src/libnrtype/FontFactory.cpp
@@ -15,7 +15,7 @@
 #endif
 
 #include <glibmm.h>
-#include <glib/gmem.h>
+#include <glib.h>
 #include <glibmm/i18n.h> // _()
 #include <pango/pangoft2.h>
 #include "libnrtype/FontFactory.h"
diff --git a/src/libnrtype/Layout-TNG-Output.cpp b/src/libnrtype/Layout-TNG-Output.cpp
index ebb71d388..8546e706f 100644
--- a/src/libnrtype/Layout-TNG-Output.cpp
+++ b/src/libnrtype/Layout-TNG-Output.cpp
@@ -8,7 +8,7 @@
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
-#include <glib/gmem.h>
+#include <glib.h>
 #include "Layout-TNG.h"
 #include "display/drawing-text.h"
 #include "style.h"
diff --git a/src/libnrtype/nr-type-primitives.cpp b/src/libnrtype/nr-type-primitives.cpp
index 2fbc18ffd..63a3abcc5 100644
--- a/src/libnrtype/nr-type-primitives.cpp
+++ b/src/libnrtype/nr-type-primitives.cpp
@@ -14,7 +14,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <glib/gmem.h>
+#include <glib.h>
 #include "nr-type-primitives.h"
 
 /**
diff --git a/src/libnrtype/nr-type-primitives.h b/src/libnrtype/nr-type-primitives.h
index 92b94e9a8..9bb181c4b 100644
--- a/src/libnrtype/nr-type-primitives.h
+++ b/src/libnrtype/nr-type-primitives.h
@@ -11,7 +11,7 @@
  * This code is in public domain
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 struct NRNameList;
 struct NRStyleList;
diff --git a/src/livarot/AlphaLigne.cpp b/src/livarot/AlphaLigne.cpp
index f878c1bb3..5b8321b72 100644
--- a/src/livarot/AlphaLigne.cpp
+++ b/src/livarot/AlphaLigne.cpp
@@ -12,7 +12,7 @@
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <glib/gmem.h>
+#include <glib.h>
 
 AlphaLigne::AlphaLigne(int iMin,int iMax)
 {
diff --git a/src/livarot/BitLigne.cpp b/src/livarot/BitLigne.cpp
index c4c134615..d7cce26eb 100644
--- a/src/livarot/BitLigne.cpp
+++ b/src/livarot/BitLigne.cpp
@@ -15,7 +15,7 @@
 #include <string>
 #include <cmath>
 #include <cstdio>
-#include <glib/gmem.h>
+#include <glib.h>
 
 BitLigne::BitLigne(int ist,int ien,float iScale)
 {
diff --git a/src/livarot/PathSimplify.cpp b/src/livarot/PathSimplify.cpp
index fe1981e4d..d6e916197 100644
--- a/src/livarot/PathSimplify.cpp
+++ b/src/livarot/PathSimplify.cpp
@@ -6,7 +6,7 @@
  *
  */
 
-#include <glib/gmem.h>
+#include <glib.h>
 #include <2geom/affine.h>
 #include "livarot/Path.h"
 #include "livarot/path-description.h"
diff --git a/src/livarot/Shape.cpp b/src/livarot/Shape.cpp
index 805741d3f..c29444a33 100644
--- a/src/livarot/Shape.cpp
+++ b/src/livarot/Shape.cpp
@@ -8,7 +8,7 @@
 
 #include <cstdio>
 #include <cstdlib>
-#include <glib/gmem.h>
+#include <glib.h>
 #include "Shape.h"
 #include "livarot/sweep-event-queue.h"
 #include "livarot/sweep-tree-list.h"
diff --git a/src/livarot/ShapeSweep.cpp b/src/livarot/ShapeSweep.cpp
index e3fb0296d..2073d1cd2 100644
--- a/src/livarot/ShapeSweep.cpp
+++ b/src/livarot/ShapeSweep.cpp
@@ -10,7 +10,6 @@
 #include <cstdlib>
 #include <cstring>
 #include <glib.h>
-#include <glib/gmem.h>
 #include <2geom/affine.h>
 #include "Shape.h"
 #include "livarot/sweep-event-queue.h"
diff --git a/src/livarot/int-line.cpp b/src/livarot/int-line.cpp
index c1e388fe2..d03d62cd7 100644
--- a/src/livarot/int-line.cpp
+++ b/src/livarot/int-line.cpp
@@ -9,7 +9,7 @@
  *
  */
 
-#include <glib/gmem.h>
+#include <glib.h>
 #include <cmath>
 #include <cstring>
 #include <string>
diff --git a/src/livarot/sweep-event.cpp b/src/livarot/sweep-event.cpp
index 268d0e363..6f3a4d246 100644
--- a/src/livarot/sweep-event.cpp
+++ b/src/livarot/sweep-event.cpp
@@ -1,4 +1,4 @@
-#include <glib/gmem.h>
+#include <glib.h>
 #include "livarot/sweep-event-queue.h"
 #include "livarot/sweep-tree.h"
 #include "livarot/sweep-event.h"
diff --git a/src/livarot/sweep-tree-list.cpp b/src/livarot/sweep-tree-list.cpp
index bef6a1797..ea9e9a5d2 100644
--- a/src/livarot/sweep-tree-list.cpp
+++ b/src/livarot/sweep-tree-list.cpp
@@ -1,4 +1,4 @@
-#include <glib/gmem.h>
+#include <glib.h>
 #include "livarot/sweep-tree.h"
 #include "livarot/sweep-tree-list.h"
 
diff --git a/src/live_effects/parameter/array.h b/src/live_effects/parameter/array.h
index 89c344594..45db19e7f 100644
--- a/src/live_effects/parameter/array.h
+++ b/src/live_effects/parameter/array.h
@@ -11,7 +11,7 @@
 
 #include <vector>
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 #include <gtkmm/tooltips.h>
 
diff --git a/src/live_effects/parameter/bool.h b/src/live_effects/parameter/bool.h
index 8f5196dad..851476f13 100644
--- a/src/live_effects/parameter/bool.h
+++ b/src/live_effects/parameter/bool.h
@@ -9,7 +9,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 #include "live_effects/parameter/parameter.h"
 
diff --git a/src/live_effects/parameter/enum.h b/src/live_effects/parameter/enum.h
index 05f3bdd57..2d2268ea9 100644
--- a/src/live_effects/parameter/enum.h
+++ b/src/live_effects/parameter/enum.h
@@ -9,7 +9,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 #include "ui/widget/registered-enums.h"
 #include <gtkmm/tooltips.h>
diff --git a/src/live_effects/parameter/path.h b/src/live_effects/parameter/path.h
index 8c4de7cff..0a35014ab 100644
--- a/src/live_effects/parameter/path.h
+++ b/src/live_effects/parameter/path.h
@@ -9,7 +9,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <2geom/path.h>
 
 #include <gtkmm/tooltips.h>
diff --git a/src/live_effects/parameter/point.h b/src/live_effects/parameter/point.h
index 2d4e942c0..9ea06bce8 100644
--- a/src/live_effects/parameter/point.h
+++ b/src/live_effects/parameter/point.h
@@ -9,7 +9,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <2geom/point.h>
 
 #include <gtkmm/tooltips.h>
diff --git a/src/live_effects/parameter/powerstrokepointarray.h b/src/live_effects/parameter/powerstrokepointarray.h
index 550866384..b00e69e76 100644
--- a/src/live_effects/parameter/powerstrokepointarray.h
+++ b/src/live_effects/parameter/powerstrokepointarray.h
@@ -9,7 +9,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <2geom/point.h>
 
 #include <gtkmm/tooltips.h>
diff --git a/src/live_effects/parameter/text.h b/src/live_effects/parameter/text.h
index 8539a8046..82654303b 100644
--- a/src/live_effects/parameter/text.h
+++ b/src/live_effects/parameter/text.h
@@ -13,7 +13,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 #include "display/canvas-bpath.h"
 #include "live_effects/parameter/parameter.h"
diff --git a/src/live_effects/parameter/vector.h b/src/live_effects/parameter/vector.h
index cb7094b7f..8afc05699 100644
--- a/src/live_effects/parameter/vector.h
+++ b/src/live_effects/parameter/vector.h
@@ -9,7 +9,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <2geom/point.h>
 
 #include <gtkmm/tooltips.h>
diff --git a/src/main-cmdlineact.h b/src/main-cmdlineact.h
index aca039f98..03f0eb0fc 100644
--- a/src/main-cmdlineact.h
+++ b/src/main-cmdlineact.h
@@ -15,7 +15,7 @@
  * Released under GNU GPL v2.x, read the file 'COPYING' for more information
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 namespace Inkscape {
 
diff --git a/src/message-context.cpp b/src/message-context.cpp
index 6b8944185..2c07f4a43 100644
--- a/src/message-context.cpp
+++ b/src/message-context.cpp
@@ -9,7 +9,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include "message-context.h"
 #include "message-stack.h"
 
diff --git a/src/message-stack.cpp b/src/message-stack.cpp
index c1669e3db..bc89520b7 100644
--- a/src/message-stack.cpp
+++ b/src/message-stack.cpp
@@ -10,7 +10,7 @@
  */
 
 #include <string.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include <cstring>
 #include <string>
 #include "message-stack.h"
diff --git a/src/modifier-fns.h b/src/modifier-fns.h
index c1b35e948..cab110467 100644
--- a/src/modifier-fns.h
+++ b/src/modifier-fns.h
@@ -12,7 +12,7 @@
  */
 
 #include <gdk/gdk.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 inline bool
 mod_shift(guint const state)
diff --git a/src/object-hierarchy.h b/src/object-hierarchy.h
index 34a81cf9f..0343d850e 100644
--- a/src/object-hierarchy.h
+++ b/src/object-hierarchy.h
@@ -15,7 +15,7 @@
 #include <stddef.h>
 #include <sigc++/connection.h>
 #include <sigc++/signal.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 
 class SPObject;
 
diff --git a/src/path-chemistry.cpp b/src/path-chemistry.cpp
index bd72632b2..f1ad17857 100644
--- a/src/path-chemistry.cpp
+++ b/src/path-chemistry.cpp
@@ -22,7 +22,7 @@
 #include "xml/repr.h"
 #include "svg/svg.h"
 #include "display/curve.h"
-#include <glib/gmem.h>
+#include <glib.h>
 #include <glibmm/i18n.h>
 #include "sp-path.h"
 #include "sp-text.h"
diff --git a/src/removeoverlap.h b/src/removeoverlap.h
index 5b16e706b..1ba41572a 100644
--- a/src/removeoverlap.h
+++ b/src/removeoverlap.h
@@ -13,7 +13,7 @@
 #ifndef SEEN_REMOVEOVERLAP_H
 #define SEEN_REMOVEOVERLAP_H
 
-#include <glib/gslist.h>
+#include <glib.h>
 
 void removeoverlap(GSList const *items, double xGap, double yGap);
 
diff --git a/src/sp-conn-end-pair.h b/src/sp-conn-end-pair.h
index 7648e253a..53dd61ccf 100644
--- a/src/sp-conn-end-pair.h
+++ b/src/sp-conn-end-pair.h
@@ -11,7 +11,7 @@
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
-#include <glib/gtypes.h>
+#include <glib.h>
 
 #include <stddef.h>
 #include <sigc++/connection.h>
diff --git a/src/sp-conn-end.h b/src/sp-conn-end.h
index d2785b0e2..de0d2c0b7 100644
--- a/src/sp-conn-end.h
+++ b/src/sp-conn-end.h
@@ -1,7 +1,7 @@
 #ifndef SEEN_SP_CONN_END
 #define SEEN_SP_CONN_END
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <stddef.h>
 #include <sigc++/connection.h>
 
diff --git a/src/sp-gradient-fns.h b/src/sp-gradient-fns.h
index 5fb939905..f408affd1 100644
--- a/src/sp-gradient-fns.h
+++ b/src/sp-gradient-fns.h
@@ -5,7 +5,7 @@
  * Macros and fn declarations related to gradients.
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 #include <2geom/forward.h>
 #include "sp-gradient-spread.h"
diff --git a/src/sp-gradient-vector.h b/src/sp-gradient-vector.h
index 5bb2a848a..8e860c169 100644
--- a/src/sp-gradient-vector.h
+++ b/src/sp-gradient-vector.h
@@ -1,7 +1,7 @@
 #ifndef SEEN_SP_GRADIENT_VECTOR_H
 #define SEEN_SP_GRADIENT_VECTOR_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <vector>
 #include "color.h"
 
diff --git a/src/sp-linear-gradient-fns.h b/src/sp-linear-gradient-fns.h
index 9f2f541dd..1bdf0b89e 100644
--- a/src/sp-linear-gradient-fns.h
+++ b/src/sp-linear-gradient-fns.h
@@ -6,7 +6,7 @@
  */
 
 #include <glib-object.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 namespace Inkscape {
 namespace XML {
diff --git a/src/sp-metrics.h b/src/sp-metrics.h
index 23c1b6c13..c2f968797 100644
--- a/src/sp-metrics.h
+++ b/src/sp-metrics.h
@@ -1,8 +1,7 @@
 #ifndef SP_METRICS_H
 #define SP_METRICS_H
 
-#include <glib/gstring.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 #include "sp-metric.h"
 
 gdouble sp_absolute_metric_to_metric (gdouble length_src, const SPMetric metric_src, const SPMetric metric_dst);
diff --git a/src/sp-radial-gradient.h b/src/sp-radial-gradient.h
index 143afd79c..b46b9fff3 100644
--- a/src/sp-radial-gradient.h
+++ b/src/sp-radial-gradient.h
@@ -5,7 +5,7 @@
  * SPRadialGradient: SVG <radialgradient> implementtion.
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include "sp-gradient.h"
 #include "svg/svg-length.h"
 #include "sp-radial-gradient-fns.h"
diff --git a/src/sp-stop.h b/src/sp-stop.h
index 692e67c5b..ec6c4525f 100644
--- a/src/sp-stop.h
+++ b/src/sp-stop.h
@@ -8,7 +8,7 @@
  * Authors?
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glibmm/ustring.h>
 #include "sp-object.h"
 #include "color.h"
diff --git a/src/sp-text.h b/src/sp-text.h
index e426c425b..457f11f06 100644
--- a/src/sp-text.h
+++ b/src/sp-text.h
@@ -13,7 +13,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <stddef.h>
 #include <sigc++/sigc++.h>
 #include "sp-item.h"
diff --git a/src/sp-textpath.h b/src/sp-textpath.h
index 2f30f6023..d79f4d346 100644
--- a/src/sp-textpath.h
+++ b/src/sp-textpath.h
@@ -1,7 +1,7 @@
 #ifndef INKSCAPE_SP_TEXTPATH_H
 #define INKSCAPE_SP_TEXTPATH_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include "svg/svg-length.h"
 #include "sp-item.h"
 #include "sp-text.h"
diff --git a/src/sp-tspan.h b/src/sp-tspan.h
index a0e641b8e..3672fd3b5 100644
--- a/src/sp-tspan.h
+++ b/src/sp-tspan.h
@@ -5,7 +5,7 @@
  * tspan and textpath, based on the flowtext routines
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include "sp-item.h"
 #include "text-tag-attributes.h"
 
diff --git a/src/splivarot.cpp b/src/splivarot.cpp
index 28d6f90be..ea035f0ab 100644
--- a/src/splivarot.cpp
+++ b/src/splivarot.cpp
@@ -19,7 +19,7 @@
 #include <cstring>
 #include <string>
 #include <vector>
-#include <glib/gmem.h>
+#include <glib.h>
 #include "xml/repr.h"
 #include "svg/svg.h"
 #include "sp-path.h"
diff --git a/src/spray-context.cpp b/src/spray-context.cpp
index 68b71b21f..ab5423f27 100644
--- a/src/spray-context.cpp
+++ b/src/spray-context.cpp
@@ -28,7 +28,7 @@
 
 #include "svg/svg.h"
 
-#include <glib/gmem.h>
+#include <glib.h>
 #include "macros.h"
 #include "document.h"
 #include "selection.h"
diff --git a/src/svg/css-ostringstream.cpp b/src/svg/css-ostringstream.cpp
index f6e6a7293..33985443e 100644
--- a/src/svg/css-ostringstream.cpp
+++ b/src/svg/css-ostringstream.cpp
@@ -1,8 +1,7 @@
 #include "svg/css-ostringstream.h"
 #include "svg/strip-trailing-zeros.h"
 #include "preferences.h"
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 
 Inkscape::CSSOStringStream::CSSOStringStream()
 {
diff --git a/src/svg/css-ostringstream.h b/src/svg/css-ostringstream.h
index 52019f0d5..8cedb0979 100644
--- a/src/svg/css-ostringstream.h
+++ b/src/svg/css-ostringstream.h
@@ -1,7 +1,7 @@
 #ifndef SVG_CSS_OSTRINGSTREAM_H_INKSCAPE
 #define SVG_CSS_OSTRINGSTREAM_H_INKSCAPE
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <sstream>
 
 namespace Inkscape {
diff --git a/src/svg/stringstream.h b/src/svg/stringstream.h
index 5c819fcc6..d143abee8 100644
--- a/src/svg/stringstream.h
+++ b/src/svg/stringstream.h
@@ -1,7 +1,7 @@
 #ifndef INKSCAPE_STRINGSTREAM_H
 #define INKSCAPE_STRINGSTREAM_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <sstream>
 #include <string>
 
diff --git a/src/svg/strip-trailing-zeros.cpp b/src/svg/strip-trailing-zeros.cpp
index b0a14a74d..47da93249 100644
--- a/src/svg/strip-trailing-zeros.cpp
+++ b/src/svg/strip-trailing-zeros.cpp
@@ -1,7 +1,7 @@
 
 #include <cstring>
 #include <string>
-#include <glib/gmessages.h>
+#include <glib.h>
 
 #include "svg/strip-trailing-zeros.h"
 
diff --git a/src/svg/svg-affine.cpp b/src/svg/svg-affine.cpp
index a986e5986..44567a2bd 100644
--- a/src/svg/svg-affine.cpp
+++ b/src/svg/svg-affine.cpp
@@ -19,7 +19,7 @@
 #include <string>
 #include <cstdlib>
 #include <cstdio>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include <2geom/transforms.h>
 #include <2geom/angle.h>
 #include "svg.h"
diff --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp
index 9293564d5..a8dff0bf0 100644
--- a/src/svg/svg-color.cpp
+++ b/src/svg/svg-color.cpp
@@ -21,12 +21,7 @@
 #include <string>
 #include <cassert>
 #include <math.h>
-#include <glib/gmem.h>
 #include <glib.h> // g_assert
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
-#include <glib/ghash.h>
-#include <glib/gutils.h>
 #include <errno.h>
 
 #include "strneq.h"
diff --git a/src/svg/svg-color.h b/src/svg/svg-color.h
index a3868c149..d1c7bee03 100644
--- a/src/svg/svg-color.h
+++ b/src/svg/svg-color.h
@@ -1,7 +1,7 @@
 #ifndef SVG_SVG_COLOR_H_SEEN
 #define SVG_SVG_COLOR_H_SEEN
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 class SVGICCColor;
 
diff --git a/src/svg/svg-length.cpp b/src/svg/svg-length.cpp
index 6b00cc807..d2f4332d8 100644
--- a/src/svg/svg-length.cpp
+++ b/src/svg/svg-length.cpp
@@ -19,7 +19,7 @@
 #include <cstring>
 #include <string>
 #include <math.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 
 #include "svg.h"
 #include "stringstream.h"
diff --git a/src/svg/svg-length.h b/src/svg/svg-length.h
index 66f473cfd..6c8f1e1dd 100644
--- a/src/svg/svg-length.h
+++ b/src/svg/svg-length.h
@@ -16,7 +16,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 class SVGLength
 {
diff --git a/src/svg/svg-path-geom-test.h b/src/svg/svg-path-geom-test.h
index 5735b6017..3558b4e55 100644
--- a/src/svg/svg-path-geom-test.h
+++ b/src/svg/svg-path-geom-test.h
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <string>
 #include <vector>
-#include <glib/gmem.h>
+#include <glib.h>
 
 class SvgPathGeomTest : public CxxTest::TestSuite
 {
diff --git a/src/svg/svg-path.cpp b/src/svg/svg-path.cpp
index f4278a5ac..3f3b944ff 100644
--- a/src/svg/svg-path.cpp
+++ b/src/svg/svg-path.cpp
@@ -31,9 +31,6 @@
 #include <cstring>
 #include <string>
 #include <cassert>
-#include <glib/gmem.h>
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
 #include <glib.h> // g_assert()
 
 #include "svg/svg.h"
diff --git a/src/svg/svg.h b/src/svg/svg.h
index de1d7d872..a7795b82e 100644
--- a/src/svg/svg.h
+++ b/src/svg/svg.h
@@ -11,7 +11,7 @@
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <vector>
 #include <cstring>
 #include <string>
diff --git a/src/svg/test-stubs.h b/src/svg/test-stubs.h
index 4e0731520..32acc0ef5 100644
--- a/src/svg/test-stubs.h
+++ b/src/svg/test-stubs.h
@@ -12,7 +12,7 @@
 #ifndef SEEN_TEST_STUBS_H
 #define SEEN_TEST_STUBS_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 long long int prefs_get_int_attribute(gchar const *path, gchar const *attr, long long int def);
 
diff --git a/src/text-editing.h b/src/text-editing.h
index 300d0b76f..c0f104dec 100644
--- a/src/text-editing.h
+++ b/src/text-editing.h
@@ -13,7 +13,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <utility>   // std::pair
 #include "libnrtype/Layout-TNG.h"
 #include "text-tag-attributes.h"
diff --git a/src/text-tag-attributes.h b/src/text-tag-attributes.h
index fdcfa8ce0..d2bfd854e 100644
--- a/src/text-tag-attributes.h
+++ b/src/text-tag-attributes.h
@@ -2,7 +2,7 @@
 #define INKSCAPE_TEXT_TAG_ATTRIBUTES_H
 
 #include <vector>
-#include <glib/gtypes.h>
+#include <glib.h>
 #include "libnrtype/Layout-TNG.h"
 #include "svg/svg-length.h"
 
diff --git a/src/trace/potrace/potracelib.cpp b/src/trace/potrace/potracelib.cpp
index be92fb24e..0fb835593 100644
--- a/src/trace/potrace/potracelib.cpp
+++ b/src/trace/potrace/potracelib.cpp
@@ -4,7 +4,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 
 #include "potracelib.h"
 #include "inkscape-version.h"
diff --git a/src/tweak-context.cpp b/src/tweak-context.cpp
index 5d592b83d..bd106a1bf 100644
--- a/src/tweak-context.cpp
+++ b/src/tweak-context.cpp
@@ -21,7 +21,7 @@
 
 #include "svg/svg.h"
 
-#include <glib/gmem.h>
+#include <glib.h>
 #include "macros.h"
 #include "document.h"
 #include "selection.h"
diff --git a/src/ui/cache/svg_preview_cache.cpp b/src/ui/cache/svg_preview_cache.cpp
index 912bc1a40..f8a806a13 100644
--- a/src/ui/cache/svg_preview_cache.cpp
+++ b/src/ui/cache/svg_preview_cache.cpp
@@ -19,7 +19,7 @@
 # include "config.h"
 #endif
 
-#include <glib/gmem.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 #include <2geom/transforms.h>
 #include "sp-namedview.h"
diff --git a/src/ui/dialog/desktop-tracker.h b/src/ui/dialog/desktop-tracker.h
index da276fae4..0c8af66bf 100644
--- a/src/ui/dialog/desktop-tracker.h
+++ b/src/ui/dialog/desktop-tracker.h
@@ -9,7 +9,7 @@
 
 #include <stddef.h>
 #include <sigc++/connection.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 typedef struct _GtkWidget GtkWidget;
 class SPDesktop;
diff --git a/src/ui/dialog/dialog-manager.h b/src/ui/dialog/dialog-manager.h
index 90e1862f1..45d8d8f66 100644
--- a/src/ui/dialog/dialog-manager.h
+++ b/src/ui/dialog/dialog-manager.h
@@ -14,7 +14,7 @@
 #ifndef INKSCAPE_UI_DIALOG_MANAGER_H
 #define INKSCAPE_UI_DIALOG_MANAGER_H
 
-#include <glib/gquark.h>
+#include <glib.h>
 #include "dialog.h"
 #include <map>
 
diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index 0157cd267..a2b952677 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -19,7 +19,7 @@
 
 #include <boost/scoped_ptr.hpp>
 #include <gtk/gtk.h>
-#include <glib/gmem.h>
+#include <glib.h>
 #include <glibmm/i18n.h>
 #include <gtkmm/alignment.h>
 #include <gtkmm/buttonbox.h>
diff --git a/src/ui/widget/icon-widget.cpp b/src/ui/widget/icon-widget.cpp
index b671e8812..d04f89b15 100644
--- a/src/ui/widget/icon-widget.cpp
+++ b/src/ui/widget/icon-widget.cpp
@@ -12,7 +12,7 @@
 # include <config.h>
 #endif
 
-#include <glib/gmem.h>
+#include <glib.h>
 #include "icon-widget.h"
 
 namespace Inkscape {
diff --git a/src/unclump.h b/src/unclump.h
index f7fcea087..18148b215 100644
--- a/src/unclump.h
+++ b/src/unclump.h
@@ -11,7 +11,7 @@
 #ifndef SEEN_DIALOGS_UNCLUMP_H
 #define SEEN_DIALOGS_UNCLUMP_H
 
-#include <glib/gslist.h>
+#include <glib.h>
 
 void unclump(GSList *items);
 
diff --git a/src/uri.h b/src/uri.h
index 6866f58a1..adcc76d6b 100644
--- a/src/uri.h
+++ b/src/uri.h
@@ -11,7 +11,7 @@
 #ifndef INKSCAPE_URI_H
 #define INKSCAPE_URI_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <exception>
 #include <libxml/uri.h>
 #include "bad-uri-exception.h"
diff --git a/src/util/ege-appear-time-tracker.h b/src/util/ege-appear-time-tracker.h
index b5ea8b5d2..1d0c90991 100644
--- a/src/util/ege-appear-time-tracker.h
+++ b/src/util/ege-appear-time-tracker.h
@@ -37,7 +37,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include <glib/gtimer.h>
+#include <glib.h>
 #include <glibmm/ustring.h>
 
 typedef union _GdkEvent GdkEvent;
diff --git a/src/util/share.cpp b/src/util/share.cpp
index 606ed9d47..3cb289b10 100644
--- a/src/util/share.cpp
+++ b/src/util/share.cpp
@@ -10,7 +10,7 @@
  */
 
 #include "util/share.h"
-#include <glib/gmessages.h>
+#include <glib.h>
 
 namespace Inkscape {
 namespace Util {
diff --git a/src/version.cpp b/src/version.cpp
index 1baf9d8d9..438e47da9 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -11,7 +11,7 @@
  */
 
 #include <stdio.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include "version.h"
 
 gboolean sp_version_from_string(const gchar *string, Inkscape::Version *version)
diff --git a/src/version.h b/src/version.h
index d90d27772..26fbc11a3 100644
--- a/src/version.h
+++ b/src/version.h
@@ -11,7 +11,7 @@
 #ifndef SEEN_INKSCAPE_VERSION_H
 #define SEEN_INKSCAPE_VERSION_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 #define SVG_VERSION "1.1"
 
diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp
index 9540b59d6..09caaa7f1 100644
--- a/src/widgets/icon.cpp
+++ b/src/widgets/icon.cpp
@@ -17,7 +17,7 @@
 #endif
 
 #include <cstring>
-#include <glib/gmem.h>
+#include <glib.h>
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
 #include <gtkmm.h>
diff --git a/src/widgets/sp-color-icc-selector.h b/src/widgets/sp-color-icc-selector.h
index a3915cd48..166348830 100644
--- a/src/widgets/sp-color-icc-selector.h
+++ b/src/widgets/sp-color-icc-selector.h
@@ -1,7 +1,7 @@
 #ifndef SEEN_SP_COLOR_ICC_SELECTOR_H
 #define SEEN_SP_COLOR_ICC_SELECTOR_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 
 #include "../color.h"
diff --git a/src/widgets/sp-color-scales.h b/src/widgets/sp-color-scales.h
index 8ffe5e7a8..3b11bc05e 100644
--- a/src/widgets/sp-color-scales.h
+++ b/src/widgets/sp-color-scales.h
@@ -1,7 +1,7 @@
 #ifndef SEEN_SP_COLOR_SCALES_H
 #define SEEN_SP_COLOR_SCALES_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 
 #include <color.h>
diff --git a/src/widgets/sp-color-wheel-selector.h b/src/widgets/sp-color-wheel-selector.h
index 5674850cb..4d8f79976 100644
--- a/src/widgets/sp-color-wheel-selector.h
+++ b/src/widgets/sp-color-wheel-selector.h
@@ -1,7 +1,7 @@
 #ifndef SEEN_SP_COLOR_WHEEL_SELECTOR_H
 #define SEEN_SP_COLOR_WHEEL_SELECTOR_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 
 #include "../color.h"
diff --git a/src/widgets/spinbutton-events.h b/src/widgets/spinbutton-events.h
index 46652a346..cf8c7b44b 100644
--- a/src/widgets/spinbutton-events.h
+++ b/src/widgets/spinbutton-events.h
@@ -9,7 +9,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <gtk/gtk.h>      /* GtkWidget */
 
 gboolean spinbutton_focus_in (GtkWidget *w, GdkEventKey *event, gpointer data);
diff --git a/src/widgets/spw-utilities.h b/src/widgets/spw-utilities.h
index 443831353..7ae36aa29 100644
--- a/src/widgets/spw-utilities.h
+++ b/src/widgets/spw-utilities.h
@@ -18,7 +18,7 @@
    SPObject, that reacts to modification.
 */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <gtk/gtk.h>      /* GtkWidget */
 #include <gtkmm/widget.h>
 
diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
index 488b10666..23c02ea35 100644
--- a/src/widgets/stroke-style.cpp
+++ b/src/widgets/stroke-style.cpp
@@ -17,7 +17,7 @@
 
 #define noSP_SS_VERBOSE
 
-#include <glib/gmem.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 #include <glibmm/i18n.h>
 
diff --git a/src/xml/attribute-record.h b/src/xml/attribute-record.h
index bab0b5aa4..a61329b83 100644
--- a/src/xml/attribute-record.h
+++ b/src/xml/attribute-record.h
@@ -5,8 +5,7 @@
 #ifndef SEEN_XML_SP_REPR_ATTR_H
 #define SEEN_XML_SP_REPR_ATTR_H
 
-#include <glib/gquark.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 #include "gc-managed.h"
 #include "util/share.h"
 
diff --git a/src/xml/comment-node.h b/src/xml/comment-node.h
index 2232fb61e..56b8ad476 100644
--- a/src/xml/comment-node.h
+++ b/src/xml/comment-node.h
@@ -15,7 +15,7 @@
 #ifndef SEEN_INKSCAPE_XML_COMMENT_NODE_H
 #define SEEN_INKSCAPE_XML_COMMENT_NODE_H
 
-#include <glib/gquark.h>
+#include <glib.h>
 #include "xml/simple-node.h"
 
 namespace Inkscape {
diff --git a/src/xml/croco-node-iface.cpp b/src/xml/croco-node-iface.cpp
index 72bcba7f3..6bd5a6920 100644
--- a/src/xml/croco-node-iface.cpp
+++ b/src/xml/croco-node-iface.cpp
@@ -1,6 +1,6 @@
 #include <cstring>
 #include <string>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 
 #include "xml/croco-node-iface.h"
 #include "xml/node.h"
diff --git a/src/xml/event.h b/src/xml/event.h
index c2865b8c4..55e2add88 100644
--- a/src/xml/event.h
+++ b/src/xml/event.h
@@ -18,8 +18,7 @@
 #ifndef SEEN_INKSCAPE_XML_SP_REPR_ACTION_H
 #define SEEN_INKSCAPE_XML_SP_REPR_ACTION_H
 
-#include <glib/gtypes.h>
-#include <glib/gquark.h>
+#include <glib.h>
 #include <glibmm/ustring.h>
 
 #include <iterator>
diff --git a/src/xml/node-event-vector.h b/src/xml/node-event-vector.h
index 0c291c230..e6396877d 100644
--- a/src/xml/node-event-vector.h
+++ b/src/xml/node-event-vector.h
@@ -14,7 +14,7 @@
 #ifndef SEEN_INKSCAPE_XML_SP_REPR_EVENT_VECTOR
 #define SEEN_INKSCAPE_XML_SP_REPR_EVENT_VECTOR
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 #include "xml/node.h"
 
diff --git a/src/xml/node-observer.h b/src/xml/node-observer.h
index 59142be8c..d0c85d1dd 100644
--- a/src/xml/node-observer.h
+++ b/src/xml/node-observer.h
@@ -18,7 +18,7 @@
 #ifndef SEEN_INKSCAPE_XML_NODE_OBSERVER_H
 #define SEEN_INKSCAPE_XML_NODE_OBSERVER_H
 
-#include <glib/gquark.h>
+#include <glib.h>
 #include "util/share.h"
 
 #ifndef INK_UNUSED
diff --git a/src/xml/node.h b/src/xml/node.h
index 8b7dea203..c11f2fbdf 100644
--- a/src/xml/node.h
+++ b/src/xml/node.h
@@ -18,7 +18,7 @@
 #ifndef SEEN_INKSCAPE_XML_NODE_H
 #define SEEN_INKSCAPE_XML_NODE_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include "gc-anchored.h"
 #include "util/list.h"
 
diff --git a/src/xml/pi-node.h b/src/xml/pi-node.h
index e1f59ab27..1f892f97a 100644
--- a/src/xml/pi-node.h
+++ b/src/xml/pi-node.h
@@ -14,7 +14,7 @@
 #ifndef SEEN_INKSCAPE_XML_PI_NODE_H
 #define SEEN_INKSCAPE_XML_PI_NODE_H
 
-#include <glib/gquark.h>
+#include <glib.h>
 #include "xml/simple-node.h"
 
 namespace Inkscape {
diff --git a/src/xml/quote.cpp b/src/xml/quote.cpp
index e569ed818..51f9ffb97 100644
--- a/src/xml/quote.cpp
+++ b/src/xml/quote.cpp
@@ -12,7 +12,7 @@
  */
 
 #include <cstring>
-#include <glib/gmem.h>
+#include <glib.h>
 
 
 /** \return strlen(xml_quote_strdup(\a val)) (without doing the malloc).
diff --git a/src/xml/rebase-hrefs.cpp b/src/xml/rebase-hrefs.cpp
index 4a7e050fa..9d4f4f9fc 100644
--- a/src/xml/rebase-hrefs.cpp
+++ b/src/xml/rebase-hrefs.cpp
@@ -7,9 +7,7 @@
 #include "util/share.h"
 #include "xml/attribute-record.h"
 #include "xml/node.h"
-#include <glib/gmem.h>
-#include <glib/gurifuncs.h>
-#include <glib/gutils.h>
+#include <glib.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/convert.h>
 #include <glibmm/uriutils.h>
diff --git a/src/xml/rebase-hrefs.h b/src/xml/rebase-hrefs.h
index 4cbdec9a5..adb09e52a 100644
--- a/src/xml/rebase-hrefs.h
+++ b/src/xml/rebase-hrefs.h
@@ -1,7 +1,7 @@
 #ifndef REBASE_HREFS_H_SEEN
 #define REBASE_HREFS_H_SEEN
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include "util/list.h"
 #include "xml/attribute-record.h"
 struct SPDocument;
diff --git a/src/xml/repr.h b/src/xml/repr.h
index 5fa9387c7..ffb8ab16b 100644
--- a/src/xml/repr.h
+++ b/src/xml/repr.h
@@ -15,7 +15,7 @@
 #define SEEN_SP_REPR_H
 
 #include <stdio.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 #include "gc-anchored.h"
 
 #include "xml/node.h"
diff --git a/src/xml/simple-node.cpp b/src/xml/simple-node.cpp
index 44ddba237..c197d648b 100644
--- a/src/xml/simple-node.cpp
+++ b/src/xml/simple-node.cpp
@@ -17,7 +17,7 @@
 #include <cstring>
 #include <string>
 
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 
 #include "preferences.h"
 
diff --git a/src/xml/text-node.h b/src/xml/text-node.h
index 2fabd6953..53798b822 100644
--- a/src/xml/text-node.h
+++ b/src/xml/text-node.h
@@ -15,7 +15,7 @@
 #ifndef SEEN_INKSCAPE_XML_TEXT_NODE_H
 #define SEEN_INKSCAPE_XML_TEXT_NODE_H
 
-#include <glib/gquark.h>
+#include <glib.h>
 #include "xml/simple-node.h"
 
 namespace Inkscape {