--- src/attributes.cpp.orig	2007-12-22 12:21:44.000000000 +0200
+++ src/attributes.cpp	2007-12-22 12:21:51.000000000 +0200
@@ -17,7 +17,7 @@
 # include "config.h"
 #endif
 
-#include <glib/ghash.h>
+#include <glib.h>
 #include "attributes.h"
 
 typedef struct {
--- src/libnr/nr-matrix.h.orig	2007-12-22 12:25:14.000000000 +0200
+++ src/libnr/nr-matrix.h	2007-12-22 12:25:23.000000000 +0200
@@ -17,7 +17,7 @@
  * This code is in public domain.
  */
 
-#include <glib/gmessages.h>
+#include <glib.h>
 
 #include "libnr/nr-coord.h"
 #include "libnr/nr-values.h"
--- src/display/bezier-utils.cpp.orig	2007-12-22 12:32:34.000000000 +0200
+++ src/display/bezier-utils.cpp	2007-12-22 12:32:51.000000000 +0200
@@ -33,8 +33,7 @@
 # include <ieeefp.h>
 #endif
 
-#include <glib/gmessages.h>
-#include <glib/gmem.h>
+#include <glib.h>
 #include "bezier-utils.h"
 #include <libnr/nr-point-fns.h>
 
--- src/color-rgba.h.orig	2007-12-22 12:35:14.000000000 +0200
+++ src/color-rgba.h	2007-12-22 12:35:25.000000000 +0200
@@ -12,7 +12,7 @@
 #ifndef SEEN_COLOR_RGBA_H
 #define SEEN_COLOR_RGBA_H
 
-#include <glib/gmessages.h>
+#include <glib.h>
 #include "libnr/nr-pixops.h"
 #include "decimal-round.h"
 
--- src/helper/units.cpp.orig	2007-12-22 12:38:30.000000000 +0200
+++ src/helper/units.cpp	2007-12-22 12:40:07.000000000 +0200
@@ -19,6 +19,7 @@
 # include "config.h"
 #endif
 
+#include <glib.h>
 #include "helper/units.h"
 #include <glibmm/i18n.h>
 #include "unit-constants.h"
--- src/io/resource.cpp.orig	2007-12-22 12:40:46.000000000 +0200
+++ src/io/resource.cpp	2007-12-22 12:40:57.000000000 +0200
@@ -16,9 +16,7 @@
 #include "config.h"
 #endif
 
-#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"
--- src/svg/svg-color.cpp.orig	2007-12-22 12:46:43.000000000 +0200
+++ src/svg/svg-color.cpp	2007-12-22 12:47:04.000000000 +0200
@@ -22,11 +22,7 @@
 #include "svg-icc-color.h"
 #include <cassert>
 #include <math.h>
-#include <glib/gmem.h>
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
-#include <glib/ghash.h>
-#include <glib/gutils.h>
+#include <glib.h>
 #include <cstdio> // sprintf
 #include <errno.h>
 #include "strneq.h"
--- src/xml/composite-node-observer.cpp.orig	2007-12-22 12:50:00.000000000 +0200
+++ src/xml/composite-node-observer.cpp	2007-12-22 12:50:17.000000000 +0200
@@ -12,6 +12,7 @@
  *
  */
 
+#include <glib.h>
 #include "algorithms/find-if-before.h"
 #include "xml/composite-node-observer.h"
 #include "xml/node-event-vector.h"
--- src/xml/repr-css.cpp.orig	2007-12-22 12:51:07.000000000 +0200
+++ src/xml/repr-css.cpp	2007-12-22 12:51:19.000000000 +0200
@@ -5,6 +5,7 @@
 #define SP_REPR_CSS_C
 
 
+#include <glib.h>
 #include <glibmm/ustring.h>
 
 #include "xml/repr.h"
--- src/xml/node-fns.cpp.orig	2007-12-22 12:52:05.000000000 +0200
+++ src/xml/node-fns.cpp	2007-12-22 12:52:19.000000000 +0200
@@ -3,6 +3,7 @@
 #endif
 
 #include <map>
+#include <glib.h>
 
 #include "xml/node-iterators.h"
 #include "algorithms/find-if-before.h"
--- src/xml/repr.cpp.orig	2007-12-22 12:53:06.000000000 +0200
+++ src/xml/repr.cpp	2007-12-22 12:53:18.000000000 +0200
@@ -22,6 +22,8 @@
 # include "config.h"
 #endif
 
+#include <glib.h>
+
 #include "xml/repr.h"
 #include "xml/text-node.h"
 #include "xml/element-node.h"
--- src/xml/simple-node.h.orig	2007-12-22 12:54:08.000000000 +0200
+++ src/xml/simple-node.h	2007-12-22 12:54:20.000000000 +0200
@@ -15,6 +15,7 @@
 #ifndef SEEN_INKSCAPE_XML_SIMPLE_NODE_H
 #define SEEN_INKSCAPE_XML_SIMPLE_NODE_H
 
+#include <glib.h>
 #include "xml/node.h"
 #include "xml/attribute-record.h"
 #include "xml/transaction-logger.h"
--- src/xml/event.cpp.orig	2007-12-22 12:55:10.000000000 +0200
+++ src/xml/event.cpp	2007-12-22 12:55:22.000000000 +0200
@@ -13,6 +13,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <glib.h>
+
 #include "event.h"
 #include "event-fns.h"
 #include "util/reverse-list.h"
--- src/svg/svg-path.cpp.orig	2007-12-22 13:11:10.000000000 +0200
+++ src/svg/svg-path.cpp	2007-12-22 13:11:26.000000000 +0200
@@ -27,9 +27,7 @@
 */
 
 #include <cassert>
-#include <glib/gmem.h>
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 
 #include "libnr/n-art-bpath.h"
 #include "gnome-canvas-bpath-util.h"