inkscape/inkscape-glib-2.31.patch

Index: inkscape-0.48.2/src/application/application.h
===================================================================
--- inkscape-0.48.2.orig/src/application/application.h
+++ inkscape-0.48.2/src/application/application.h
@@ -13,7 +13,7 @@
 #ifndef INKSCAPE_APPLICATION_APPLICATION_H
 #define INKSCAPE_APPLICATION_APPLICATION_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 namespace Gtk {
 class Main;
Index: inkscape-0.48.2/src/application/editor.h
===================================================================
--- inkscape-0.48.2.orig/src/application/editor.h
+++ inkscape-0.48.2/src/application/editor.h
@@ -16,7 +16,7 @@
 #define INKSCAPE_APPLICATION_EDITOR_H
 
 #include <sigc++/sigc++.h>
-#include <glib/gslist.h>
+#include <glib.h>
 #include <glibmm/ustring.h>
 #include <set>
 #include "app-prototype.h"
Index: inkscape-0.48.2/src/attributes.cpp
===================================================================
--- inkscape-0.48.2.orig/src/attributes.cpp
+++ inkscape-0.48.2/src/attributes.cpp
@@ -17,8 +17,7 @@
 # include "config.h"
 #endif
 
-#include <glib.h> // g_assert()
-#include <glib/ghash.h>
+#include <glib.h>
 #include "attributes.h"
 
 typedef struct {
Index: inkscape-0.48.2/src/attributes.h
===================================================================
--- inkscape-0.48.2.orig/src/attributes.h
+++ inkscape-0.48.2/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);
Index: inkscape-0.48.2/src/bind/javabind.cpp
===================================================================
--- inkscape-0.48.2.orig/src/bind/javabind.cpp
+++ inkscape-0.48.2/src/bind/javabind.cpp
@@ -52,7 +52,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>
Index: inkscape-0.48.2/src/color-profile-fns.h
===================================================================
--- inkscape-0.48.2.orig/src/color-profile-fns.h
+++ inkscape-0.48.2/src/color-profile-fns.h
@@ -6,7 +6,7 @@
  */
 
 #include <glib-object.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 #if ENABLE_LCMS
 #include <vector>
 #include <glibmm/ustring.h>
Index: inkscape-0.48.2/src/color-profile.h
===================================================================
--- inkscape-0.48.2.orig/src/color-profile.h
+++ inkscape-0.48.2/src/color-profile.h
@@ -5,7 +5,7 @@
  * SPColorProfile: SVG <color-profile> implementation
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <sp-object.h>
 #include <glibmm/ustring.h>
 #if ENABLE_LCMS
Index: inkscape-0.48.2/src/color-rgba.h
===================================================================
--- inkscape-0.48.2.orig/src/color-rgba.h
+++ inkscape-0.48.2/src/color-rgba.h
@@ -12,8 +12,7 @@
 #ifndef SEEN_COLOR_RGBA_H
 #define SEEN_COLOR_RGBA_H
 
-#include <glib.h> // g_assert()
-#include <glib/gmessages.h>
+#include <glib.h>
 #include "libnr/nr-pixops.h"
 #include "decimal-round.h"
 
Index: inkscape-0.48.2/src/conn-avoid-ref.h
===================================================================
--- inkscape-0.48.2.orig/src/conn-avoid-ref.h
+++ inkscape-0.48.2/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>
 
Index: inkscape-0.48.2/src/debug/logger.cpp
===================================================================
--- inkscape-0.48.2.orig/src/debug/logger.cpp
+++ inkscape-0.48.2/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"
Index: inkscape-0.48.2/src/debug/simple-event.h
===================================================================
--- inkscape-0.48.2.orig/src/debug/simple-event.h
+++ inkscape-0.48.2/src/debug/simple-event.h
@@ -14,9 +14,7 @@
 
 #include <stdarg.h>
 #include <vector>
-#include <glib.h> // g_assert()
-#include <glib/gstrfuncs.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 
 #include "gc-alloc.h"
 #include "debug/event.h"
Index: inkscape-0.48.2/src/debug/timestamp.cpp
===================================================================
--- inkscape-0.48.2.orig/src/debug/timestamp.cpp
+++ inkscape-0.48.2/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"
 
Index: inkscape-0.48.2/src/desktop-style.h
===================================================================
--- inkscape-0.48.2.orig/src/desktop-style.h
+++ inkscape-0.48.2/src/desktop-style.h
@@ -13,7 +13,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 class ColorRGBA;
 struct SPCSSAttr;
Index: inkscape-0.48.2/src/dialogs/clonetiler.cpp
===================================================================
--- inkscape-0.48.2.orig/src/dialogs/clonetiler.cpp
+++ inkscape-0.48.2/src/dialogs/clonetiler.cpp
@@ -12,7 +12,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#include <glib/gmem.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 #include <glibmm/i18n.h>
 
Index: inkscape-0.48.2/src/dir-util.cpp
===================================================================
--- inkscape-0.48.2.orig/src/dir-util.cpp
+++ inkscape-0.48.2/src/dir-util.cpp
@@ -7,11 +7,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>
 
 /** Returns a form of \a path relative to \a base if that is easy to construct (e.g. if \a path
     appears to be in the directory specified by \a base), otherwise returns \a path.
Index: inkscape-0.48.2/src/dir-util.h
===================================================================
--- inkscape-0.48.2.orig/src/dir-util.h
+++ inkscape-0.48.2/src/dir-util.h
@@ -10,7 +10,7 @@
  */
 
 #include <stdlib.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 char const *sp_relative_path_from_path(char const *path, char const *base);
 char const *sp_extension_from_path(char const *path);
Index: inkscape-0.48.2/src/display/canvas-bpath.h
===================================================================
--- inkscape-0.48.2.orig/src/display/canvas-bpath.h
+++ inkscape-0.48.2/src/display/canvas-bpath.h
@@ -13,7 +13,7 @@
  *
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 #include <display/sp-canvas.h>
 
Index: inkscape-0.48.2/src/display/curve.cpp
===================================================================
--- inkscape-0.48.2.orig/src/display/curve.cpp
+++ inkscape-0.48.2/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>
Index: inkscape-0.48.2/src/display/curve.h
===================================================================
--- inkscape-0.48.2.orig/src/display/curve.h
+++ inkscape-0.48.2/src/display/curve.h
@@ -15,8 +15,7 @@
  * Released under GNU GPL
  */
 
-#include <glib/gtypes.h>
-#include <glib/gslist.h>
+#include <glib.h>
 
 #include <2geom/forward.h>
 
Index: inkscape-0.48.2/src/display/gnome-canvas-acetate.h
===================================================================
--- inkscape-0.48.2.orig/src/display/gnome-canvas-acetate.h
+++ inkscape-0.48.2/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.h"
 
 
Index: inkscape-0.48.2/src/display/nr-3dutils.cpp
===================================================================
--- inkscape-0.48.2.orig/src/display/nr-3dutils.cpp
+++ inkscape-0.48.2/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 "libnr/nr-pixblock.h"
 #include "display/nr-3dutils.h"
Index: inkscape-0.48.2/src/display/nr-arena.h
===================================================================
--- inkscape-0.48.2.orig/src/display/nr-arena.h
+++ inkscape-0.48.2/src/display/nr-arena.h
@@ -13,7 +13,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gmacros.h>
+#include <glib.h>
 
 #include "display/rendermode.h"
 
Index: inkscape-0.48.2/src/display/nr-filter-diffuselighting.cpp
===================================================================
--- inkscape-0.48.2.orig/src/display/nr-filter-diffuselighting.cpp
+++ inkscape-0.48.2/src/display/nr-filter-diffuselighting.cpp
@@ -10,7 +10,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 "display/nr-arena-item.h"
Index: inkscape-0.48.2/src/display/nr-filter-specularlighting.cpp
===================================================================
--- inkscape-0.48.2.orig/src/display/nr-filter-specularlighting.cpp
+++ inkscape-0.48.2/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/nr-3dutils.h"
Index: inkscape-0.48.2/src/display/nr-plain-stuff.cpp
===================================================================
--- inkscape-0.48.2.orig/src/display/nr-plain-stuff.cpp
+++ inkscape-0.48.2/src/display/nr-plain-stuff.cpp
@@ -11,7 +11,7 @@
  * Released under GNU GPL
  */
 
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <libnr/nr-pixops.h>
 #include "nr-plain-stuff.h"
 
Index: inkscape-0.48.2/src/display/nr-plain-stuff.h
===================================================================
--- inkscape-0.48.2.orig/src/display/nr-plain-stuff.h
+++ inkscape-0.48.2/src/display/nr-plain-stuff.h
@@ -12,7 +12,7 @@
  * Released under GNU GPL
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 void nr_render_checkerboard_rgb (guchar *px, gint w, gint h, gint rs, gint xoff, gint yoff);
 void nr_render_checkerboard_rgb_custom (guchar *px, gint w, gint h, gint rs, gint xoff, gint yoff, guint32 c0, guint32 c1, gint sizep2);
Index: inkscape-0.48.2/src/display/sodipodi-ctrlrect.h
===================================================================
--- inkscape-0.48.2.orig/src/display/sodipodi-ctrlrect.h
+++ inkscape-0.48.2/src/display/sodipodi-ctrlrect.h
@@ -16,7 +16,7 @@
  *
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include "sp-canvas.h"
 
 #define SP_TYPE_CTRLRECT (sp_ctrlrect_get_type ())
Index: inkscape-0.48.2/src/display/sp-canvas.h
===================================================================
--- inkscape-0.48.2.orig/src/display/sp-canvas.h
+++ inkscape-0.48.2/src/display/sp-canvas.h
@@ -27,7 +27,7 @@
 # endif
 #endif
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
Index: inkscape-0.48.2/src/document-subset.cpp
===================================================================
--- inkscape-0.48.2.orig/src/document-subset.cpp
+++ inkscape-0.48.2/src/document-subset.cpp
@@ -12,7 +12,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>
Index: inkscape-0.48.2/src/draw-anchor.h
===================================================================
--- inkscape-0.48.2.orig/src/draw-anchor.h
+++ inkscape-0.48.2/src/draw-anchor.h
@@ -5,7 +5,7 @@
  * Drawing anchors. 
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <2geom/point.h>
 
 struct SPDrawContext;
Index: inkscape-0.48.2/src/dyna-draw-context.cpp
===================================================================
--- inkscape-0.48.2.orig/src/dyna-draw-context.cpp
+++ inkscape-0.48.2/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"
Index: inkscape-0.48.2/src/eraser-context.cpp
===================================================================
--- inkscape-0.48.2.orig/src/eraser-context.cpp
+++ inkscape-0.48.2/src/eraser-context.cpp
@@ -36,7 +36,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"
Index: inkscape-0.48.2/src/extension/internal/cairo-render-context.cpp
===================================================================
--- inkscape-0.48.2.orig/src/extension/internal/cairo-render-context.cpp
+++ inkscape-0.48.2/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/nr-arena.h"
Index: inkscape-0.48.2/src/extension/internal/cairo-renderer.cpp
===================================================================
--- inkscape-0.48.2.orig/src/extension/internal/cairo-renderer.cpp
+++ inkscape-0.48.2/src/extension/internal/cairo-renderer.cpp
@@ -33,7 +33,7 @@
 #include <2geom/transforms.h>
 #include <2geom/pathvector.h>
 
-#include <glib/gmem.h>
+#include <glib.h>
 
 #include <glibmm/i18n.h>
 #include "display/nr-arena.h"
Index: inkscape-0.48.2/src/extension/internal/pdfinput/svg-builder.h
===================================================================
--- inkscape-0.48.2.orig/src/extension/internal/pdfinput/svg-builder.h
+++ inkscape-0.48.2/src/extension/internal/pdfinput/svg-builder.h
@@ -49,7 +49,7 @@ class XRef;
 class SPCSSAttr;
 
 #include <vector>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 namespace Inkscape {
 namespace Extension {
Index: inkscape-0.48.2/src/extension/internal/win32.cpp
===================================================================
--- inkscape-0.48.2.orig/src/extension/internal/win32.cpp
+++ inkscape-0.48.2/src/extension/internal/win32.cpp
@@ -13,7 +13,7 @@
 # include "config.h"
 #endif
 
-#include <glib/gmem.h>
+#include <glib.h>
 #include <libnr/nr-macros.h>
 #include <2geom/transforms.h>
 
Index: inkscape-0.48.2/src/extract-uri.h
===================================================================
--- inkscape-0.48.2.orig/src/extract-uri.h
+++ inkscape-0.48.2/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);
 
Index: inkscape-0.48.2/src/file.cpp
===================================================================
--- inkscape-0.48.2.orig/src/file.cpp
+++ inkscape-0.48.2/src/file.cpp
@@ -27,7 +27,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <glib/gmem.h>
+#include <glib.h>
 #include <glibmm/i18n.h>
 #include <libnr/nr-pixops.h>
 
Index: inkscape-0.48.2/src/file.h
===================================================================
--- inkscape-0.48.2.orig/src/file.h
+++ inkscape-0.48.2/src/file.h
@@ -16,7 +16,7 @@
  */
 
 #include <gtkmm.h>
-#include <glib/gslist.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 
 #include "extension/extension-forward.h"
Index: inkscape-0.48.2/src/filters/blend-fns.h
===================================================================
--- inkscape-0.48.2.orig/src/filters/blend-fns.h
+++ inkscape-0.48.2/src/filters/blend-fns.h
@@ -6,7 +6,7 @@
  */
 
 #include <glib-object.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 namespace Inkscape {
 namespace XML {
Index: inkscape-0.48.2/src/filters/colormatrix-fns.h
===================================================================
--- inkscape-0.48.2.orig/src/filters/colormatrix-fns.h
+++ inkscape-0.48.2/src/filters/colormatrix-fns.h
@@ -6,7 +6,7 @@
  */
 
 #include <glib-object.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 namespace Inkscape {
 namespace XML {
Index: inkscape-0.48.2/src/filters/componenttransfer-fns.h
===================================================================
--- inkscape-0.48.2.orig/src/filters/componenttransfer-fns.h
+++ inkscape-0.48.2/src/filters/componenttransfer-fns.h
@@ -6,7 +6,7 @@
  */
 
 #include <glib-object.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 namespace Inkscape {
 namespace XML {
Index: inkscape-0.48.2/src/filters/composite-fns.h
===================================================================
--- inkscape-0.48.2.orig/src/filters/composite-fns.h
+++ inkscape-0.48.2/src/filters/composite-fns.h
@@ -6,7 +6,7 @@
  */
 
 #include <glib-object.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 namespace Inkscape {
 namespace XML {
Index: inkscape-0.48.2/src/filters/convolvematrix-fns.h
===================================================================
--- inkscape-0.48.2.orig/src/filters/convolvematrix-fns.h
+++ inkscape-0.48.2/src/filters/convolvematrix-fns.h
@@ -6,7 +6,7 @@
  */
 
 #include <glib-object.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 namespace Inkscape {
 namespace XML {
Index: inkscape-0.48.2/src/filters/diffuselighting-fns.h
===================================================================
--- inkscape-0.48.2.orig/src/filters/diffuselighting-fns.h
+++ inkscape-0.48.2/src/filters/diffuselighting-fns.h
@@ -6,7 +6,7 @@
  */
 
 #include <glib-object.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 namespace Inkscape {
 namespace XML {
Index: inkscape-0.48.2/src/filters/displacementmap-fns.h
===================================================================
--- inkscape-0.48.2.orig/src/filters/displacementmap-fns.h
+++ inkscape-0.48.2/src/filters/displacementmap-fns.h
@@ -6,7 +6,7 @@
  */
 
 #include <glib-object.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 namespace Inkscape {
 namespace XML {
Index: inkscape-0.48.2/src/filters/flood-fns.h
===================================================================
--- inkscape-0.48.2.orig/src/filters/flood-fns.h
+++ inkscape-0.48.2/src/filters/flood-fns.h
@@ -6,7 +6,7 @@
  */
 
 #include <glib-object.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 namespace Inkscape {
 namespace XML {
Index: inkscape-0.48.2/src/filters/image-fns.h
===================================================================
--- inkscape-0.48.2.orig/src/filters/image-fns.h
+++ inkscape-0.48.2/src/filters/image-fns.h
@@ -6,7 +6,7 @@
  */
 
 #include <glib-object.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 namespace Inkscape {
 namespace XML {
Index: inkscape-0.48.2/src/filters/merge-fns.h
===================================================================
--- inkscape-0.48.2.orig/src/filters/merge-fns.h
+++ inkscape-0.48.2/src/filters/merge-fns.h
@@ -6,7 +6,7 @@
  */
 
 #include <glib-object.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 namespace Inkscape {
 namespace XML {
Index: inkscape-0.48.2/src/filters/morphology-fns.h
===================================================================
--- inkscape-0.48.2.orig/src/filters/morphology-fns.h
+++ inkscape-0.48.2/src/filters/morphology-fns.h
@@ -6,7 +6,7 @@
  */
 
 #include <glib-object.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 namespace Inkscape {
 namespace XML {
Index: inkscape-0.48.2/src/filters/offset-fns.h
===================================================================
--- inkscape-0.48.2.orig/src/filters/offset-fns.h
+++ inkscape-0.48.2/src/filters/offset-fns.h
@@ -6,7 +6,7 @@
  */
 
 #include <glib-object.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 namespace Inkscape {
 namespace XML {
Index: inkscape-0.48.2/src/filters/specularlighting-fns.h
===================================================================
--- inkscape-0.48.2.orig/src/filters/specularlighting-fns.h
+++ inkscape-0.48.2/src/filters/specularlighting-fns.h
@@ -6,7 +6,7 @@
  */
 
 #include <glib-object.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 namespace Inkscape {
 namespace XML {
Index: inkscape-0.48.2/src/filters/tile-fns.h
===================================================================
--- inkscape-0.48.2.orig/src/filters/tile-fns.h
+++ inkscape-0.48.2/src/filters/tile-fns.h
@@ -6,7 +6,7 @@
  */
 
 #include <glib-object.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 namespace Inkscape {
 namespace XML {
Index: inkscape-0.48.2/src/filters/turbulence-fns.h
===================================================================
--- inkscape-0.48.2.orig/src/filters/turbulence-fns.h
+++ inkscape-0.48.2/src/filters/turbulence-fns.h
@@ -6,7 +6,7 @@
  */
 
 #include <glib-object.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 namespace Inkscape {
 namespace XML {
Index: inkscape-0.48.2/src/gc-anchored.h
===================================================================
--- inkscape-0.48.2.orig/src/gc-anchored.h
+++ inkscape-0.48.2/src/gc-anchored.h
@@ -11,7 +11,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 {
Index: inkscape-0.48.2/src/gc-core.h
===================================================================
--- inkscape-0.48.2.orig/src/gc-core.h
+++ inkscape-0.48.2/src/gc-core.h
@@ -24,7 +24,7 @@
 #else
 # include <gc.h>
 #endif
-#include <glib/gmain.h>
+#include <glib.h>
 
 namespace Inkscape {
 namespace GC {
Index: inkscape-0.48.2/src/gc.cpp
===================================================================
--- inkscape-0.48.2.orig/src/gc.cpp
+++ inkscape-0.48.2/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>
Index: inkscape-0.48.2/src/gradient-drag.h
===================================================================
--- inkscape-0.48.2.orig/src/gradient-drag.h
+++ inkscape-0.48.2/src/gradient-drag.h
@@ -14,7 +14,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gslist.h>
+#include <glib.h>
 #include <stddef.h>
 #include <sigc++/sigc++.h>
 #include <vector>
Index: inkscape-0.48.2/src/help.h
===================================================================
--- inkscape-0.48.2.orig/src/help.h
+++ inkscape-0.48.2/src/help.h
@@ -13,7 +13,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 
 void sp_help_about(void);
Index: inkscape-0.48.2/src/helper/gnome-utils.h
===================================================================
--- inkscape-0.48.2.orig/src/helper/gnome-utils.h
+++ inkscape-0.48.2/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);
 
Index: inkscape-0.48.2/src/helper/pixbuf-ops.cpp
===================================================================
--- inkscape-0.48.2.orig/src/helper/pixbuf-ops.cpp
+++ inkscape-0.48.2/src/helper/pixbuf-ops.cpp
@@ -18,7 +18,6 @@
 #include <interface.h>
 #include <libnr/nr-pixops.h>
 #include <glib.h>
-#include <glib/gmessages.h>
 #include <png.h>
 #include "png-write.h"
 #include <display/nr-arena-item.h>
Index: inkscape-0.48.2/src/helper/pixbuf-ops.h
===================================================================
--- inkscape-0.48.2.orig/src/helper/pixbuf-ops.h
+++ inkscape-0.48.2/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;
 
Index: inkscape-0.48.2/src/helper/png-write.cpp
===================================================================
--- inkscape-0.48.2.orig/src/helper/png-write.cpp
+++ inkscape-0.48.2/src/helper/png-write.cpp
@@ -20,7 +20,7 @@
 #include <libnr/nr-pixops.h>
 #include <libnr/nr-translate-scale-ops.h>
 #include <2geom/rect.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <png.h>
 #include "png-write.h"
 #include "io/sys.h"
Index: inkscape-0.48.2/src/helper/png-write.h
===================================================================
--- inkscape-0.48.2.orig/src/helper/png-write.h
+++ inkscape-0.48.2/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;
 
Index: inkscape-0.48.2/src/helper/stlport.h
===================================================================
--- inkscape-0.48.2.orig/src/helper/stlport.h
+++ inkscape-0.48.2/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 {
Index: inkscape-0.48.2/src/helper/stock-items.h
===================================================================
--- inkscape-0.48.2.orig/src/helper/stock-items.h
+++ inkscape-0.48.2/src/helper/stock-items.h
@@ -12,7 +12,7 @@
  *
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 #include <forward.h>
 
Index: inkscape-0.48.2/src/helper/unit-menu.h
===================================================================
--- inkscape-0.48.2.orig/src/helper/unit-menu.h
+++ inkscape-0.48.2/src/helper/unit-menu.h
@@ -10,7 +10,7 @@
  *
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 
 #include <helper/helper-forward.h>
Index: inkscape-0.48.2/src/helper/units.h
===================================================================
--- inkscape-0.48.2.orig/src/helper/units.h
+++ inkscape-0.48.2/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"
 
 
Index: inkscape-0.48.2/src/inkscape.h
===================================================================
--- inkscape-0.48.2.orig/src/inkscape.h
+++ inkscape-0.48.2/src/inkscape.h
@@ -13,7 +13,7 @@
  */
 
 #include <list>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 struct SPDesktop;
 struct SPDocument;
Index: inkscape-0.48.2/src/inkview.cpp
===================================================================
--- inkscape-0.48.2.orig/src/inkview.cpp
+++ inkscape-0.48.2/src/inkview.cpp
@@ -39,7 +39,7 @@
 #include <sys/stat.h>
 #include <locale.h>
 
-#include <glib/gmem.h>
+#include <glib.h>
 #include <libnr/nr-macros.h>
 
 // #include <stropts.h>
Index: inkscape-0.48.2/src/io/inkjar.h
===================================================================
--- inkscape-0.48.2.orig/src/io/inkjar.h
+++ inkscape-0.48.2/src/io/inkjar.h
@@ -26,8 +26,7 @@
 # endif
 #endif
 
-#include <glib/garray.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 namespace Inkjar {
 
Index: inkscape-0.48.2/src/io/resource.cpp
===================================================================
--- inkscape-0.48.2.orig/src/io/resource.cpp
+++ inkscape-0.48.2/src/io/resource.cpp
@@ -16,10 +16,7 @@
 #include "config.h"
 #endif
 
-#include <glib.h> // g_assert()
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
-#include <glib/gfileutils.h>
+#include <glib.h>
 #include "path-prefix.h"
 #include "inkscape.h"
 #include "io/resource.h"
Index: inkscape-0.48.2/src/io/sys.cpp
===================================================================
--- inkscape-0.48.2.orig/src/io/sys.cpp
+++ inkscape-0.48.2/src/io/sys.cpp
@@ -17,7 +17,6 @@
 
 #include <glib.h>
 #include <glib/gstdio.h>
-#include <glib/gutils.h>
 #include <glibmm/fileutils.h>
 #if GLIB_CHECK_VERSION(2,6,0)
     #include <glib/gstdio.h>
Index: inkscape-0.48.2/src/io/sys.h
===================================================================
--- inkscape-0.48.2.orig/src/io/sys.h
+++ inkscape-0.48.2/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>
 
Index: inkscape-0.48.2/src/knot-holder-entity.h
===================================================================
--- inkscape-0.48.2.orig/src/knot-holder-entity.h
+++ inkscape-0.48.2/src/knot-holder-entity.h
@@ -17,7 +17,7 @@
  * Released under GNU GPL
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include "knot.h"
 #include <2geom/forward.h>
 #include "snapper.h"
Index: inkscape-0.48.2/src/knotholder.h
===================================================================
--- inkscape-0.48.2.orig/src/knotholder.h
+++ inkscape-0.48.2/src/knotholder.h
@@ -17,7 +17,7 @@
  *
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include "knot-enums.h"
 #include "forward.h"
 #include "libnr/nr-forward.h"
Index: inkscape-0.48.2/src/libcroco/cr-libxml-node-iface.h
===================================================================
--- inkscape-0.48.2.orig/src/libcroco/cr-libxml-node-iface.h
+++ inkscape-0.48.2/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
Index: inkscape-0.48.2/src/libcroco/cr-node-iface.h
===================================================================
--- inkscape-0.48.2.orig/src/libcroco/cr-node-iface.h
+++ inkscape-0.48.2/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
 
Index: inkscape-0.48.2/src/libgdl/gdl-stock.h
===================================================================
--- inkscape-0.48.2.orig/src/libgdl/gdl-stock.h
+++ inkscape-0.48.2/src/libgdl/gdl-stock.h
@@ -22,7 +22,7 @@
 #ifndef __GDL_STOCK_H__
 #define __GDL_STOCK_H__
 
-#include <glib/gmacros.h>   // G_BEGIN_DECLS
+#include <glib.h>
 
 G_BEGIN_DECLS
 
Index: inkscape-0.48.2/src/libnr/in-svg-plane-test.h
===================================================================
--- inkscape-0.48.2.orig/src/libnr/in-svg-plane-test.h
+++ inkscape-0.48.2/src/libnr/in-svg-plane-test.h
@@ -1,6 +1,6 @@
 #include <cxxtest/TestSuite.h>
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <cmath>
 
 #include "libnr/in-svg-plane.h"
Index: inkscape-0.48.2/src/libnr/nr-gradient.cpp
===================================================================
--- inkscape-0.48.2.orig/src/libnr/nr-gradient.cpp
+++ inkscape-0.48.2/src/libnr/nr-gradient.cpp
@@ -26,7 +26,7 @@
 #include <libnr/nr-blit.h>
 #include <libnr/nr-gradient.h>
 #include <libnr/nr-matrix-ops.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <stdio.h>
 
 /* Common */
Index: inkscape-0.48.2/src/libnr/nr-i-coord.h
===================================================================
--- inkscape-0.48.2.orig/src/libnr/nr-i-coord.h
+++ inkscape-0.48.2/src/libnr/nr-i-coord.h
@@ -1,7 +1,7 @@
 #ifndef SEEN_NR_I_COORD_H
 #define SEEN_NR_I_COORD_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 namespace NR {
 
Index: inkscape-0.48.2/src/libnr/nr-matrix.h
===================================================================
--- inkscape-0.48.2.orig/src/libnr/nr-matrix.h
+++ inkscape-0.48.2/src/libnr/nr-matrix.h
@@ -17,8 +17,7 @@
  * This code is in public domain.
  */
 
-#include <glib.h> // g_assert()
-#include <glib/gmessages.h>
+#include <glib.h>
 
 #include "libnr/nr-coord.h"
 #include "libnr/nr-values.h"
Index: inkscape-0.48.2/src/libnr/nr-object.cpp
===================================================================
--- inkscape-0.48.2.orig/src/libnr/nr-object.cpp
+++ inkscape-0.48.2/src/libnr/nr-object.cpp
@@ -15,7 +15,7 @@
 
 #include <typeinfo>
 
-#include <glib/gmem.h>
+#include <glib.h>
 #include <libnr/nr-macros.h>
 
 #include "nr-object.h"
Index: inkscape-0.48.2/src/libnr/nr-object.h
===================================================================
--- inkscape-0.48.2.orig/src/libnr/nr-object.h
+++ inkscape-0.48.2/src/libnr/nr-object.h
@@ -15,7 +15,7 @@
 #include "config.h"
 #endif
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include "gc-managed.h"
 #include "gc-finalized.h"
 #include "gc-anchored.h"
Index: inkscape-0.48.2/src/libnr/nr-pixblock-pattern.cpp
===================================================================
--- inkscape-0.48.2.orig/src/libnr/nr-pixblock-pattern.cpp
+++ inkscape-0.48.2/src/libnr/nr-pixblock-pattern.cpp
@@ -10,7 +10,7 @@
  */
 
 
-#include <glib/gmem.h>
+#include <glib.h>
 #include "nr-pixops.h"
 #include "nr-pixblock-pattern.h"
 
Index: inkscape-0.48.2/src/libnr/nr-pixblock.cpp
===================================================================
--- inkscape-0.48.2.orig/src/libnr/nr-pixblock.cpp
+++ inkscape-0.48.2/src/libnr/nr-pixblock.cpp
@@ -13,7 +13,7 @@
 #include <cstring>
 #include <string>
 #include <string.h>
-#include <glib/gmem.h>
+#include <glib.h>
 #include "nr-pixblock.h"
 
 /// Size of buffer that needs no allocation (default 4).
Index: inkscape-0.48.2/src/libnr/nr-point-fns-test.h
===================================================================
--- inkscape-0.48.2.orig/src/libnr/nr-point-fns-test.h
+++ inkscape-0.48.2/src/libnr/nr-point-fns-test.h
@@ -3,7 +3,7 @@
 
 #include <cassert>
 #include <cmath>
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <stdlib.h>
 
 #include "libnr/nr-point-fns.h"
Index: inkscape-0.48.2/src/libnr/nr-rotate-fns-test.h
===================================================================
--- inkscape-0.48.2.orig/src/libnr/nr-rotate-fns-test.h
+++ inkscape-0.48.2/src/libnr/nr-rotate-fns-test.h
@@ -1,7 +1,7 @@
 #include <cxxtest/TestSuite.h>
 
 #include <cmath>
-#include <glib/gmacros.h>
+#include <glib.h>
 
 #include <libnr/nr-rotate-fns.h>
 
Index: inkscape-0.48.2/src/libnrtype/FontFactory.cpp
===================================================================
--- inkscape-0.48.2.orig/src/libnrtype/FontFactory.cpp
+++ inkscape-0.48.2/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"
Index: inkscape-0.48.2/src/libnrtype/Layout-TNG-Output.cpp
===================================================================
--- inkscape-0.48.2.orig/src/libnrtype/Layout-TNG-Output.cpp
+++ inkscape-0.48.2/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/nr-arena-glyphs.h"
 #include "style.h"
Index: inkscape-0.48.2/src/libnrtype/nr-type-primitives.cpp
===================================================================
--- inkscape-0.48.2.orig/src/libnrtype/nr-type-primitives.cpp
+++ inkscape-0.48.2/src/libnrtype/nr-type-primitives.cpp
@@ -14,7 +14,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <glib/gmem.h>
+#include <glib.h>
 #include <libnr/nr-macros.h>
 #include "nr-type-primitives.h"
 
Index: inkscape-0.48.2/src/libnrtype/nr-type-primitives.h
===================================================================
--- inkscape-0.48.2.orig/src/libnrtype/nr-type-primitives.h
+++ inkscape-0.48.2/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;
Index: inkscape-0.48.2/src/livarot/AlphaLigne.cpp
===================================================================
--- inkscape-0.48.2.orig/src/livarot/AlphaLigne.cpp
+++ inkscape-0.48.2/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)
 {
Index: inkscape-0.48.2/src/livarot/BitLigne.cpp
===================================================================
--- inkscape-0.48.2.orig/src/livarot/BitLigne.cpp
+++ inkscape-0.48.2/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)
 {
Index: inkscape-0.48.2/src/livarot/PathSimplify.cpp
===================================================================
--- inkscape-0.48.2.orig/src/livarot/PathSimplify.cpp
+++ inkscape-0.48.2/src/livarot/PathSimplify.cpp
@@ -6,7 +6,7 @@
  *
  */
 
-#include <glib/gmem.h>
+#include <glib.h>
 #include <libnr/nr-point-matrix-ops.h>
 #include "livarot/Path.h"
 #include "livarot/path-description.h"
Index: inkscape-0.48.2/src/livarot/Shape.cpp
===================================================================
--- inkscape-0.48.2.orig/src/livarot/Shape.cpp
+++ inkscape-0.48.2/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"
Index: inkscape-0.48.2/src/livarot/ShapeSweep.cpp
===================================================================
--- inkscape-0.48.2.orig/src/livarot/ShapeSweep.cpp
+++ inkscape-0.48.2/src/livarot/ShapeSweep.cpp
@@ -9,7 +9,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include <glib/gmem.h>
+#include <glib.h>
 #include "Shape.h"
 #include "livarot/sweep-event-queue.h"
 #include "livarot/sweep-tree-list.h"
Index: inkscape-0.48.2/src/livarot/int-line.cpp
===================================================================
--- inkscape-0.48.2.orig/src/livarot/int-line.cpp
+++ inkscape-0.48.2/src/livarot/int-line.cpp
@@ -9,7 +9,7 @@
  *
  */
 
-#include <glib/gmem.h>
+#include <glib.h>
 #include <cmath>
 #include <cstring>
 #include <string>
Index: inkscape-0.48.2/src/livarot/sweep-event.cpp
===================================================================
--- inkscape-0.48.2.orig/src/livarot/sweep-event.cpp
+++ inkscape-0.48.2/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"
Index: inkscape-0.48.2/src/livarot/sweep-tree-list.cpp
===================================================================
--- inkscape-0.48.2.orig/src/livarot/sweep-tree-list.cpp
+++ inkscape-0.48.2/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"
 
Index: inkscape-0.48.2/src/live_effects/parameter/array.h
===================================================================
--- inkscape-0.48.2.orig/src/live_effects/parameter/array.h
+++ inkscape-0.48.2/src/live_effects/parameter/array.h
@@ -11,7 +11,7 @@
 
 #include <vector>
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 #include <gtkmm/tooltips.h>
 
Index: inkscape-0.48.2/src/live_effects/parameter/bool.h
===================================================================
--- inkscape-0.48.2.orig/src/live_effects/parameter/bool.h
+++ inkscape-0.48.2/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"
 
Index: inkscape-0.48.2/src/live_effects/parameter/enum.h
===================================================================
--- inkscape-0.48.2.orig/src/live_effects/parameter/enum.h
+++ inkscape-0.48.2/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>
Index: inkscape-0.48.2/src/live_effects/parameter/path.h
===================================================================
--- inkscape-0.48.2.orig/src/live_effects/parameter/path.h
+++ inkscape-0.48.2/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>
Index: inkscape-0.48.2/src/live_effects/parameter/point.h
===================================================================
--- inkscape-0.48.2.orig/src/live_effects/parameter/point.h
+++ inkscape-0.48.2/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>
Index: inkscape-0.48.2/src/live_effects/parameter/text.h
===================================================================
--- inkscape-0.48.2.orig/src/live_effects/parameter/text.h
+++ inkscape-0.48.2/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"
Index: inkscape-0.48.2/src/live_effects/parameter/vector.h
===================================================================
--- inkscape-0.48.2.orig/src/live_effects/parameter/vector.h
+++ inkscape-0.48.2/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>
Index: inkscape-0.48.2/src/main-cmdlineact.h
===================================================================
--- inkscape-0.48.2.orig/src/main-cmdlineact.h
+++ inkscape-0.48.2/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 {
 
Index: inkscape-0.48.2/src/main.cpp
===================================================================
--- inkscape-0.48.2.orig/src/main.cpp
+++ inkscape-0.48.2/src/main.cpp
@@ -48,7 +48,6 @@
 
 #include <libxml/tree.h>
 #include <glib.h>
-#include <glib/gprintf.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
Index: inkscape-0.48.2/src/message-context.cpp
===================================================================
--- inkscape-0.48.2.orig/src/message-context.cpp
+++ inkscape-0.48.2/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"
 
Index: inkscape-0.48.2/src/message-stack.cpp
===================================================================
--- inkscape-0.48.2.orig/src/message-stack.cpp
+++ inkscape-0.48.2/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"
Index: inkscape-0.48.2/src/modifier-fns.h
===================================================================
--- inkscape-0.48.2.orig/src/modifier-fns.h
+++ inkscape-0.48.2/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)
Index: inkscape-0.48.2/src/object-hierarchy.h
===================================================================
--- inkscape-0.48.2.orig/src/object-hierarchy.h
+++ inkscape-0.48.2/src/object-hierarchy.h
@@ -17,7 +17,7 @@
 #include <stddef.h>
 #include <sigc++/connection.h>
 #include <sigc++/signal.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 
 class SPObject;
 
Index: inkscape-0.48.2/src/path-chemistry.cpp
===================================================================
--- inkscape-0.48.2.orig/src/path-chemistry.cpp
+++ inkscape-0.48.2/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"
Index: inkscape-0.48.2/src/removeoverlap.h
===================================================================
--- inkscape-0.48.2.orig/src/removeoverlap.h
+++ inkscape-0.48.2/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);
 
Index: inkscape-0.48.2/src/sp-conn-end-pair.h
===================================================================
--- inkscape-0.48.2.orig/src/sp-conn-end-pair.h
+++ inkscape-0.48.2/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 "forward.h"
 #include "libnr/nr-point.h"
Index: inkscape-0.48.2/src/sp-conn-end.h
===================================================================
--- inkscape-0.48.2.orig/src/sp-conn-end.h
+++ inkscape-0.48.2/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>
 
Index: inkscape-0.48.2/src/sp-filter-fns.h
===================================================================
--- inkscape-0.48.2.orig/src/sp-filter-fns.h
+++ inkscape-0.48.2/src/sp-filter-fns.h
@@ -5,7 +5,7 @@
  * Macros and fn declarations related to filters.
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 #include "libnr/nr-forward.h"
 #include "sp-filter-units.h"
Index: inkscape-0.48.2/src/sp-gaussian-blur-fns.h
===================================================================
--- inkscape-0.48.2.orig/src/sp-gaussian-blur-fns.h
+++ inkscape-0.48.2/src/sp-gaussian-blur-fns.h
@@ -6,7 +6,7 @@
  */
 
 #include <glib-object.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 namespace Inkscape {
 namespace XML {
Index: inkscape-0.48.2/src/sp-gradient-fns.h
===================================================================
--- inkscape-0.48.2.orig/src/sp-gradient-fns.h
+++ inkscape-0.48.2/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"
Index: inkscape-0.48.2/src/sp-gradient-vector.h
===================================================================
--- inkscape-0.48.2.orig/src/sp-gradient-vector.h
+++ inkscape-0.48.2/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"
 
Index: inkscape-0.48.2/src/sp-linear-gradient-fns.h
===================================================================
--- inkscape-0.48.2.orig/src/sp-linear-gradient-fns.h
+++ inkscape-0.48.2/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 {
Index: inkscape-0.48.2/src/sp-metrics.h
===================================================================
--- inkscape-0.48.2.orig/src/sp-metrics.h
+++ inkscape-0.48.2/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);
Index: inkscape-0.48.2/src/sp-radial-gradient.h
===================================================================
--- inkscape-0.48.2.orig/src/sp-radial-gradient.h
+++ inkscape-0.48.2/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"
Index: inkscape-0.48.2/src/sp-stop.h
===================================================================
--- inkscape-0.48.2.orig/src/sp-stop.h
+++ inkscape-0.48.2/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"
Index: inkscape-0.48.2/src/sp-text.h
===================================================================
--- inkscape-0.48.2.orig/src/sp-text.h
+++ inkscape-0.48.2/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"
Index: inkscape-0.48.2/src/sp-textpath.h
===================================================================
--- inkscape-0.48.2.orig/src/sp-textpath.h
+++ inkscape-0.48.2/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"
Index: inkscape-0.48.2/src/sp-tspan.h
===================================================================
--- inkscape-0.48.2.orig/src/sp-tspan.h
+++ inkscape-0.48.2/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"
 
Index: inkscape-0.48.2/src/splivarot.cpp
===================================================================
--- inkscape-0.48.2.orig/src/splivarot.cpp
+++ inkscape-0.48.2/src/splivarot.cpp
@@ -20,7 +20,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"
Index: inkscape-0.48.2/src/spray-context.cpp
===================================================================
--- inkscape-0.48.2.orig/src/spray-context.cpp
+++ inkscape-0.48.2/src/spray-context.cpp
@@ -29,7 +29,7 @@
 #include "svg/svg.h"
 #include "display/canvas-bpath.h"
 
-#include <glib/gmem.h>
+#include <glib.h>
 #include "macros.h"
 #include "document.h"
 #include "selection.h"
Index: inkscape-0.48.2/src/svg/css-ostringstream.cpp
===================================================================
--- inkscape-0.48.2.orig/src/svg/css-ostringstream.cpp
+++ inkscape-0.48.2/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()
 {
Index: inkscape-0.48.2/src/svg/css-ostringstream.h
===================================================================
--- inkscape-0.48.2.orig/src/svg/css-ostringstream.h
+++ inkscape-0.48.2/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 {
Index: inkscape-0.48.2/src/svg/stringstream.h
===================================================================
--- inkscape-0.48.2.orig/src/svg/stringstream.h
+++ inkscape-0.48.2/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>
 
Index: inkscape-0.48.2/src/svg/strip-trailing-zeros.cpp
===================================================================
--- inkscape-0.48.2.orig/src/svg/strip-trailing-zeros.cpp
+++ inkscape-0.48.2/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"
 
Index: inkscape-0.48.2/src/svg/svg-affine.cpp
===================================================================
--- inkscape-0.48.2.orig/src/svg/svg-affine.cpp
+++ inkscape-0.48.2/src/svg/svg-affine.cpp
@@ -19,7 +19,7 @@
 #include <string>
 #include <cstdlib>
 #include <cstdio>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include <libnr/nr-matrix-fns.h>
 #include <libnr/nr-matrix-ops.h>
 #include <2geom/transforms.h>
Index: inkscape-0.48.2/src/svg/svg-color.cpp
===================================================================
--- inkscape-0.48.2.orig/src/svg/svg-color.cpp
+++ inkscape-0.48.2/src/svg/svg-color.cpp
@@ -23,12 +23,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 <glib.h>
 #include <errno.h>
 
 #include "strneq.h"
Index: inkscape-0.48.2/src/svg/svg-color.h
===================================================================
--- inkscape-0.48.2.orig/src/svg/svg-color.h
+++ inkscape-0.48.2/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;
 
Index: inkscape-0.48.2/src/svg/svg-length.cpp
===================================================================
--- inkscape-0.48.2.orig/src/svg/svg-length.cpp
+++ inkscape-0.48.2/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"
Index: inkscape-0.48.2/src/svg/svg-length.h
===================================================================
--- inkscape-0.48.2.orig/src/svg/svg-length.h
+++ inkscape-0.48.2/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
 {
Index: inkscape-0.48.2/src/svg/svg-path-geom-test.h
===================================================================
--- inkscape-0.48.2.orig/src/svg/svg-path-geom-test.h
+++ inkscape-0.48.2/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
 {
Index: inkscape-0.48.2/src/svg/svg-path.cpp
===================================================================
--- inkscape-0.48.2.orig/src/svg/svg-path.cpp
+++ inkscape-0.48.2/src/svg/svg-path.cpp
@@ -31,10 +31,7 @@
 #include <cstring>
 #include <string>
 #include <cassert>
-#include <glib/gmem.h>
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
-#include <glib.h> // g_assert()
+#include <glib.h>
 
 #include "svg/svg.h"
 #include "svg/path-string.h"
Index: inkscape-0.48.2/src/svg/svg.h
===================================================================
--- inkscape-0.48.2.orig/src/svg/svg.h
+++ inkscape-0.48.2/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>
Index: inkscape-0.48.2/src/text-editing.h
===================================================================
--- inkscape-0.48.2.orig/src/text-editing.h
+++ inkscape-0.48.2/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 <libnr/nr-forward.h>
Index: inkscape-0.48.2/src/text-tag-attributes.h
===================================================================
--- inkscape-0.48.2.orig/src/text-tag-attributes.h
+++ inkscape-0.48.2/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"
 
Index: inkscape-0.48.2/src/trace/potrace/potracelib.cpp
===================================================================
--- inkscape-0.48.2.orig/src/trace/potrace/potracelib.cpp
+++ inkscape-0.48.2/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"
Index: inkscape-0.48.2/src/tweak-context.cpp
===================================================================
--- inkscape-0.48.2.orig/src/tweak-context.cpp
+++ inkscape-0.48.2/src/tweak-context.cpp
@@ -22,7 +22,7 @@
 #include "svg/svg.h"
 #include "display/canvas-bpath.h"
 
-#include <glib/gmem.h>
+#include <glib.h>
 #include "macros.h"
 #include "document.h"
 #include "selection.h"
Index: inkscape-0.48.2/src/ui/cache/svg_preview_cache.cpp
===================================================================
--- inkscape-0.48.2.orig/src/ui/cache/svg_preview_cache.cpp
+++ inkscape-0.48.2/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 "sp-namedview.h"
 #include "selection.h"
Index: inkscape-0.48.2/src/ui/dialog/desktop-tracker.h
===================================================================
--- inkscape-0.48.2.orig/src/ui/dialog/desktop-tracker.h
+++ inkscape-0.48.2/src/ui/dialog/desktop-tracker.h
@@ -13,7 +13,7 @@
 
 #include <stddef.h>
 #include <sigc++/connection.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 typedef struct _GtkWidget GtkWidget;
 class SPDesktop;
Index: inkscape-0.48.2/src/ui/dialog/dialog-manager.h
===================================================================
--- inkscape-0.48.2.orig/src/ui/dialog/dialog-manager.h
+++ inkscape-0.48.2/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>
 
Index: inkscape-0.48.2/src/ui/dialog/icon-preview.cpp
===================================================================
--- inkscape-0.48.2.orig/src/ui/dialog/icon-preview.cpp
+++ inkscape-0.48.2/src/ui/dialog/icon-preview.cpp
@@ -16,7 +16,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <glib/gmem.h>
+#include <glib.h>
 #include <glibmm/i18n.h>
 #include <gtkmm/alignment.h>
 #include <gtkmm/buttonbox.h>
Index: inkscape-0.48.2/src/ui/widget/icon-widget.cpp
===================================================================
--- inkscape-0.48.2.orig/src/ui/widget/icon-widget.cpp
+++ inkscape-0.48.2/src/ui/widget/icon-widget.cpp
@@ -14,7 +14,7 @@
 # include <config.h>
 #endif
 
-#include <glib/gmem.h>
+#include <glib.h>
 #include "icon-widget.h"
 
 namespace Inkscape {
Index: inkscape-0.48.2/src/unclump.h
===================================================================
--- inkscape-0.48.2.orig/src/unclump.h
+++ inkscape-0.48.2/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);
 
Index: inkscape-0.48.2/src/uri.h
===================================================================
--- inkscape-0.48.2.orig/src/uri.h
+++ inkscape-0.48.2/src/uri.h
@@ -14,7 +14,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"
Index: inkscape-0.48.2/src/util/share.cpp
===================================================================
--- inkscape-0.48.2.orig/src/util/share.cpp
+++ inkscape-0.48.2/src/util/share.cpp
@@ -10,7 +10,7 @@
  */
 
 #include "util/share.h"
-#include <glib/gmessages.h>
+#include <glib.h>
 
 namespace Inkscape {
 namespace Util {
Index: inkscape-0.48.2/src/version.cpp
===================================================================
--- inkscape-0.48.2.orig/src/version.cpp
+++ inkscape-0.48.2/src/version.cpp
@@ -12,7 +12,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)
Index: inkscape-0.48.2/src/version.h
===================================================================
--- inkscape-0.48.2.orig/src/version.h
+++ inkscape-0.48.2/src/version.h
@@ -10,7 +10,7 @@
 #ifndef SEEN_INKSCAPE_VERSION_H
 #define SEEN_INKSCAPE_VERSION_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 #define SVG_VERSION "1.1"
 
Index: inkscape-0.48.2/src/widgets/icon.cpp
===================================================================
--- inkscape-0.48.2.orig/src/widgets/icon.cpp
+++ inkscape-0.48.2/src/widgets/icon.cpp
@@ -16,7 +16,7 @@
 #endif
 
 #include <cstring>
-#include <glib/gmem.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 #include <gtkmm.h>
 
Index: inkscape-0.48.2/src/widgets/sp-color-icc-selector.h
===================================================================
--- inkscape-0.48.2.orig/src/widgets/sp-color-icc-selector.h
+++ inkscape-0.48.2/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"
Index: inkscape-0.48.2/src/widgets/sp-color-scales.h
===================================================================
--- inkscape-0.48.2.orig/src/widgets/sp-color-scales.h
+++ inkscape-0.48.2/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>
Index: inkscape-0.48.2/src/widgets/sp-color-wheel-selector.h
===================================================================
--- inkscape-0.48.2.orig/src/widgets/sp-color-wheel-selector.h
+++ inkscape-0.48.2/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"
Index: inkscape-0.48.2/src/widgets/spinbutton-events.h
===================================================================
--- inkscape-0.48.2.orig/src/widgets/spinbutton-events.h
+++ inkscape-0.48.2/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);
Index: inkscape-0.48.2/src/widgets/spw-utilities.h
===================================================================
--- inkscape-0.48.2.orig/src/widgets/spw-utilities.h
+++ inkscape-0.48.2/src/widgets/spw-utilities.h
@@ -18,7 +18,7 @@
    SPObject, that reacts to modification.
 */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 typedef struct _GtkWidget GtkWidget;
 
Index: inkscape-0.48.2/src/widgets/stroke-style.cpp
===================================================================
--- inkscape-0.48.2.orig/src/widgets/stroke-style.cpp
+++ inkscape-0.48.2/src/widgets/stroke-style.cpp
@@ -18,7 +18,7 @@
 
 #define noSP_SS_VERBOSE
 
-#include <glib/gmem.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 #include <glibmm/i18n.h>
 
Index: inkscape-0.48.2/src/xml/attribute-record.h
===================================================================
--- inkscape-0.48.2.orig/src/xml/attribute-record.h
+++ inkscape-0.48.2/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"
 
Index: inkscape-0.48.2/src/xml/comment-node.h
===================================================================
--- inkscape-0.48.2.orig/src/xml/comment-node.h
+++ inkscape-0.48.2/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 {
Index: inkscape-0.48.2/src/xml/croco-node-iface.cpp
===================================================================
--- inkscape-0.48.2.orig/src/xml/croco-node-iface.cpp
+++ inkscape-0.48.2/src/xml/croco-node-iface.cpp
@@ -1,7 +1,7 @@
 
 #include <cstring>
 #include <string>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 
 #include "xml/croco-node-iface.h"
 #include "xml/node.h"
Index: inkscape-0.48.2/src/xml/event.h
===================================================================
--- inkscape-0.48.2.orig/src/xml/event.h
+++ inkscape-0.48.2/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>
Index: inkscape-0.48.2/src/xml/node-event-vector.h
===================================================================
--- inkscape-0.48.2.orig/src/xml/node-event-vector.h
+++ inkscape-0.48.2/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"
 
Index: inkscape-0.48.2/src/xml/node-observer.h
===================================================================
--- inkscape-0.48.2.orig/src/xml/node-observer.h
+++ inkscape-0.48.2/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"
 #include "xml/xml-forward.h"
 
Index: inkscape-0.48.2/src/xml/node.h
===================================================================
--- inkscape-0.48.2.orig/src/xml/node.h
+++ inkscape-0.48.2/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"
 #include "xml/xml-forward.h"
Index: inkscape-0.48.2/src/xml/pi-node.h
===================================================================
--- inkscape-0.48.2.orig/src/xml/pi-node.h
+++ inkscape-0.48.2/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 {
Index: inkscape-0.48.2/src/xml/quote.cpp
===================================================================
--- inkscape-0.48.2.orig/src/xml/quote.cpp
+++ inkscape-0.48.2/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).
Index: inkscape-0.48.2/src/xml/rebase-hrefs.cpp
===================================================================
--- inkscape-0.48.2.orig/src/xml/rebase-hrefs.cpp
+++ inkscape-0.48.2/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>
 using Inkscape::XML::AttributeRecord;
 
 
Index: inkscape-0.48.2/src/xml/rebase-hrefs.h
===================================================================
--- inkscape-0.48.2.orig/src/xml/rebase-hrefs.h
+++ inkscape-0.48.2/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;
Index: inkscape-0.48.2/src/xml/repr.h
===================================================================
--- inkscape-0.48.2.orig/src/xml/repr.h
+++ inkscape-0.48.2/src/xml/repr.h
@@ -14,7 +14,7 @@
 #define __SP_REPR_H__
 
 #include <stdio.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 #include "gc-anchored.h"
 
 #include "xml/node.h"
Index: inkscape-0.48.2/src/xml/simple-node.cpp
===================================================================
--- inkscape-0.48.2.orig/src/xml/simple-node.cpp
+++ inkscape-0.48.2/src/xml/simple-node.cpp
@@ -16,7 +16,7 @@
 
 #include <cstring>
 #include <string>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 
 #include "xml/node.h"
 #include "xml/simple-node.h"
Index: inkscape-0.48.2/src/xml/text-node.h
===================================================================
--- inkscape-0.48.2.orig/src/xml/text-node.h
+++ inkscape-0.48.2/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 {
Index: inkscape-0.48.2/src/2geom/matrix.h
===================================================================
--- inkscape-0.48.2.orig/src/2geom/matrix.h
+++ inkscape-0.48.2/src/2geom/matrix.h
@@ -17,7 +17,7 @@
  * This code is in public domain.
  */
 
-//#include <glib/gmessages.h>
+//#include <glib.h>
 
 #include <2geom/point.h>
 
Index: inkscape-0.48.2/src/util/glib-list-iterators.h
===================================================================
--- inkscape-0.48.2.orig/src/util/glib-list-iterators.h
+++ inkscape-0.48.2/src/util/glib-list-iterators.h
@@ -17,8 +17,7 @@
 
 #include <cstddef>
 #include <iterator>
-#include "glib/gslist.h"
-#include "glib/glist.h"
+#include <glib.h>
 
 namespace Inkscape {
 
Index: inkscape-0.48.2/src/ui/widget/spin-slider.cpp
===================================================================
--- inkscape-0.48.2.orig/src/ui/widget/spin-slider.cpp
+++ inkscape-0.48.2/src/ui/widget/spin-slider.cpp
@@ -10,7 +10,7 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
 
-#include "glib/gstrfuncs.h"
+#include "glib.h"
 #include "glibmm/i18n.h"
 
 #include "spin-slider.h"