]> git.pld-linux.org Git - packages/inkscape.git/blame - inkscape-0.48.2-glib.patch
projects / packages / inkscape.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- release 13 (by relup.sh)
[packages/inkscape.git] / inkscape-0.48.2-glib.patch
CommitLineData
c4df3d12
AM		 1Adjust for new glib.h include rules.
2
3diff --git a/src/application/application.h b/src/application/application.h
4index fce6bd4..749790a 100644
5--- a/src/application/application.h
6+++ b/src/application/application.h
7@@ -13,7 +13,7 @@
8 #ifndef INKSCAPE_APPLICATION_APPLICATION_H
9 #define INKSCAPE_APPLICATION_APPLICATION_H
10
11-#include <glib/gtypes.h>
12+#include <glib.h>
13
14 namespace Gtk {
15 class Main;
16diff --git a/src/application/editor.h b/src/application/editor.h
17index 4545022..6a11ec9 100644
18--- a/src/application/editor.h
19+++ b/src/application/editor.h
20@@ -16,7 +16,7 @@
21 #define INKSCAPE_APPLICATION_EDITOR_H
22
23 #include <sigc++/sigc++.h>
24-#include <glib/gslist.h>
25+#include <glib.h>
26 #include <glibmm/ustring.h>
27 #include <set>
28 #include "app-prototype.h"
29diff --git a/src/attributes-test.h b/src/attributes-test.h
30index 6677294..2621f93 100644
31--- a/src/attributes-test.h
32+++ b/src/attributes-test.h
33@@ -6,7 +6,6 @@
34
35 #include <vector>
36 #include <glib.h>
37-#include <glib/gprintf.h>
38 #include "attributes.h"
39 #include "streq.h"
40
41diff --git a/src/attributes.cpp b/src/attributes.cpp
42index 5d3a008..97b23c6 100644
43--- a/src/attributes.cpp
44+++ b/src/attributes.cpp
45@@ -17,8 +17,7 @@
46 # include "config.h"
47 #endif
48
49-#include <glib.h> // g_assert()
50-#include <glib/ghash.h>
51+#include <glib.h>
52 #include "attributes.h"
53
54 typedef struct {
55diff --git a/src/attributes.h b/src/attributes.h
56index 82ac962..4cd3459 100644
57--- a/src/attributes.h
58+++ b/src/attributes.h
59@@ -13,8 +13,7 @@
60 *
61 * Released under GNU GPL, read the file 'COPYING' for more information
62 */
63-#include <glib/gtypes.h>
64-#include <glib/gmessages.h>
65+#include <glib.h>
66
67 unsigned int sp_attribute_lookup(gchar const *key);
68 unsigned char const *sp_attribute_name(unsigned int id);
69diff --git a/src/bind/javabind.cpp b/src/bind/javabind.cpp
70index 6dc8c9a..36d55f6 100644
71--- a/src/bind/javabind.cpp
72+++ b/src/bind/javabind.cpp
73@@ -52,7 +52,7 @@
74 #include "javabind-private.h"
75 #include <path-prefix.h>
76 #include <prefix.h>
77-#include <glib/gmessages.h>
78+#include <glib.h>
79
80 //For repr and document
81 #include <document.h>
82diff --git a/src/color-profile-fns.h b/src/color-profile-fns.h
83index c8c51b5..41d8fc6 100644
84--- a/src/color-profile-fns.h
85+++ b/src/color-profile-fns.h
86@@ -6,7 +6,7 @@
87 */
88
89 #include <glib-object.h>
90-#include <glib/gtypes.h>
91+#include <glib.h>
92 #if ENABLE_LCMS
93 #include <vector>
94 #include <glibmm/ustring.h>
95diff --git a/src/color-profile.h b/src/color-profile.h
96index fa8f353..029b232 100644
97--- a/src/color-profile.h
98+++ b/src/color-profile.h
99@@ -5,7 +5,7 @@
100 * SPColorProfile: SVG <color-profile> implementation
101 */
102
103-#include <glib/gtypes.h>
104+#include <glib.h>
105 #include <sp-object.h>
106 #include <glibmm/ustring.h>
107 #if ENABLE_LCMS
108diff --git a/src/color-rgba.h b/src/color-rgba.h
109index fc52b19..39b2975 100644
110--- a/src/color-rgba.h
111+++ b/src/color-rgba.h
112@@ -12,8 +12,7 @@
113 #ifndef SEEN_COLOR_RGBA_H
114 #define SEEN_COLOR_RGBA_H
115
116-#include <glib.h> // g_assert()
117-#include <glib/gmessages.h>
118+#include <glib.h>
119 #include "libnr/nr-pixops.h"
120 #include "decimal-round.h"
121
122diff --git a/src/conn-avoid-ref.h b/src/conn-avoid-ref.h
123index 653b1d7..f276634 100644
124--- a/src/conn-avoid-ref.h
125+++ b/src/conn-avoid-ref.h
126@@ -13,7 +13,7 @@
127 * Released under GNU GPL, read the file 'COPYING' for more information
128 */
129
130-#include <glib/gslist.h>
131+#include <glib.h>
132 #include <stddef.h>
133 #include <sigc++/connection.h>
134
135diff --git a/src/debug/logger.cpp b/src/debug/logger.cpp
136index f28d275..27c6d19 100644
137--- a/src/debug/logger.cpp
138+++ b/src/debug/logger.cpp
139@@ -11,7 +11,7 @@
140
141 #include <fstream>
142 #include <vector>
143-#include <glib/gmessages.h>
144+#include <glib.h>
145 #include "inkscape-version.h"
146 #include "debug/logger.h"
147 #include "debug/simple-event.h"
148diff --git a/src/debug/simple-event.h b/src/debug/simple-event.h
149index 74301a6..ea28cf5 100644
150--- a/src/debug/simple-event.h
151+++ b/src/debug/simple-event.h
152@@ -14,9 +14,7 @@
153
154 #include <stdarg.h>
155 #include <vector>
156-#include <glib.h> // g_assert()
157-#include <glib/gstrfuncs.h>
158-#include <glib/gmessages.h>
159+#include <glib.h>
160
161 #include "gc-alloc.h"
162 #include "debug/event.h"
163diff --git a/src/debug/timestamp.cpp b/src/debug/timestamp.cpp
164index 8814f37..26a9ce0 100644
165--- a/src/debug/timestamp.cpp
166+++ b/src/debug/timestamp.cpp
167@@ -10,8 +10,7 @@
168 */
169
170
171-#include <glib/gtypes.h>
172-#include <glib/gmain.h>
173+#include <glib.h>
174 #include <glibmm/ustring.h>
175 #include "debug/simple-event.h"
176
177diff --git a/src/desktop-style.h b/src/desktop-style.h
178index e1ca5b3..95b3bf9 100644
179--- a/src/desktop-style.h
180+++ b/src/desktop-style.h
181@@ -13,7 +13,7 @@
182 * Released under GNU GPL, read the file 'COPYING' for more information
183 */
184
185-#include <glib/gtypes.h>
186+#include <glib.h>
187
188 class ColorRGBA;
189 struct SPCSSAttr;
190diff --git a/src/dialogs/clonetiler.cpp b/src/dialogs/clonetiler.cpp
191index 55884fe..b846f48 100644
192--- a/src/dialogs/clonetiler.cpp
193+++ b/src/dialogs/clonetiler.cpp
194@@ -12,7 +12,7 @@
195 #ifdef HAVE_CONFIG_H
196 # include "config.h"
197 #endif
198-#include <glib/gmem.h>
199+#include <glib.h>
200 #include <gtk/gtk.h>
201 #include <glibmm/i18n.h>
202
203diff --git a/src/dir-util.cpp b/src/dir-util.cpp
204index 67db036..8fe1315 100644
205--- a/src/dir-util.cpp
206+++ b/src/dir-util.cpp
207@@ -7,11 +7,7 @@
208 #include <errno.h>
209 #include <string>
210 #include <cstring>
211-#include <glib/gutils.h>
212-#include <glib/gmem.h>
213-#include <glib/gerror.h>
214-#include <glib/gconvert.h>
215-#include <glib/gstrfuncs.h>
216+#include <glib.h>
217
218 /** Returns a form of \a path relative to \a base if that is easy to construct (e.g. if \a path
219 appears to be in the directory specified by \a base), otherwise returns \a path.
220diff --git a/src/dir-util.h b/src/dir-util.h
221index 9bdfafa..6b16fcc 100644
222--- a/src/dir-util.h
223+++ b/src/dir-util.h
224@@ -10,7 +10,7 @@
225 */
226
227 #include <stdlib.h>
228-#include <glib/gtypes.h>
229+#include <glib.h>
230
231 char const *sp_relative_path_from_path(char const *path, char const *base);
232 char const *sp_extension_from_path(char const *path);
233diff --git a/src/display/canvas-bpath.h b/src/display/canvas-bpath.h
234index b97bbcc..6db6fa3 100644
235--- a/src/display/canvas-bpath.h
236+++ b/src/display/canvas-bpath.h
237@@ -13,7 +13,7 @@
238 *
239 */
240
241-#include <glib/gtypes.h>
242+#include <glib.h>
243
244 #include <display/sp-canvas.h>
245
246diff --git a/src/display/curve.cpp b/src/display/curve.cpp
247index 73b8dc3..b17ef51 100644
248--- a/src/display/curve.cpp
249+++ b/src/display/curve.cpp
250@@ -19,7 +19,7 @@
251
252 #include "display/curve.h"
253
254-#include <glib/gmessages.h>
255+#include <glib.h>
256 #include <2geom/pathvector.h>
257 #include <2geom/sbasis-geometric.h>
258 #include <2geom/sbasis-to-bezier.h>
259diff --git a/src/display/curve.h b/src/display/curve.h
260index fe07201..64731c4 100644
261--- a/src/display/curve.h
262+++ b/src/display/curve.h
263@@ -15,8 +15,7 @@
264 * Released under GNU GPL
265 */
266
267-#include <glib/gtypes.h>
268-#include <glib/gslist.h>
269+#include <glib.h>
270
271 #include <2geom/forward.h>
272
273diff --git a/src/display/gnome-canvas-acetate.h b/src/display/gnome-canvas-acetate.h
274index 40574e1..2f84931 100644
275--- a/src/display/gnome-canvas-acetate.h
276+++ b/src/display/gnome-canvas-acetate.h
277@@ -15,7 +15,7 @@
278 * Released under GNU GPL, read the file 'COPYING' for more information
279 */
280
281-#include <glib/gtypes.h>
282+#include <glib.h>
283 #include "display/sp-canvas.h"
284
285
286diff --git a/src/display/nr-3dutils.cpp b/src/display/nr-3dutils.cpp
287index 89c2194..db8800f 100644
288--- a/src/display/nr-3dutils.cpp
289+++ b/src/display/nr-3dutils.cpp
290@@ -9,7 +9,7 @@
291 * Released under GNU GPL, read the file 'COPYING' for more information
292 */
293
294-#include <glib/gmessages.h>
295+#include <glib.h>
296
297 #include "libnr/nr-pixblock.h"
298 #include "display/nr-3dutils.h"
299diff --git a/src/display/nr-arena.h b/src/display/nr-arena.h
300index 76b071e..1d23511 100644
301--- a/src/display/nr-arena.h
302+++ b/src/display/nr-arena.h
303@@ -13,7 +13,7 @@
304 * Released under GNU GPL, read the file 'COPYING' for more information
305 */
306
307-#include <glib/gmacros.h>
308+#include <glib.h>
309
310 #include "display/rendermode.h"
311
312diff --git a/src/display/nr-filter-diffuselighting.cpp b/src/display/nr-filter-diffuselighting.cpp
313index 0fe4c59..1e08e11 100644
314--- a/src/display/nr-filter-diffuselighting.cpp
315+++ b/src/display/nr-filter-diffuselighting.cpp
316@@ -10,7 +10,7 @@
317 * Released under GNU GPL, read the file 'COPYING' for more information
318 */
319
320-#include <glib/gmessages.h>
321+#include <glib.h>
322
323 #include "display/nr-3dutils.h"
324 #include "display/nr-arena-item.h"
325diff --git a/src/display/nr-filter-specularlighting.cpp b/src/display/nr-filter-specularlighting.cpp
326index 6a6ce38..dbe6764 100644
327--- a/src/display/nr-filter-specularlighting.cpp
328+++ b/src/display/nr-filter-specularlighting.cpp
329@@ -10,7 +10,7 @@
330 * Released under GNU GPL, read the file 'COPYING' for more information
331 */
332
333-#include <glib/gmessages.h>
334+#include <glib.h>
335 #include <cmath>
336
337 #include "display/nr-3dutils.h"
338diff --git a/src/display/nr-plain-stuff.cpp b/src/display/nr-plain-stuff.cpp
339index 62a6110..e37ad96 100644
340--- a/src/display/nr-plain-stuff.cpp
341+++ b/src/display/nr-plain-stuff.cpp
342@@ -11,7 +11,7 @@
343 * Released under GNU GPL
344 */
345
346-#include <glib/gmessages.h>
347+#include <glib.h>
348 #include <libnr/nr-pixops.h>
349 #include "nr-plain-stuff.h"
350
351diff --git a/src/display/nr-plain-stuff.h b/src/display/nr-plain-stuff.h
352index c568f38..99176a3 100644
353--- a/src/display/nr-plain-stuff.h
354+++ b/src/display/nr-plain-stuff.h
355@@ -12,7 +12,7 @@
356 * Released under GNU GPL
357 */
358
359-#include <glib/gtypes.h>
360+#include <glib.h>
361
362 void nr_render_checkerboard_rgb (guchar *px, gint w, gint h, gint rs, gint xoff, gint yoff);
363 void nr_render_checkerboard_rgb_custom (guchar *px, gint w, gint h, gint rs, gint xoff, gint yoff, guint32 c0, guint32 c1, gint sizep2);
364diff --git a/src/display/sodipodi-ctrlrect.h b/src/display/sodipodi-ctrlrect.h
365index 7e5f515..7e00565 100644
366--- a/src/display/sodipodi-ctrlrect.h
367+++ b/src/display/sodipodi-ctrlrect.h
368@@ -16,7 +16,7 @@
369 *
370 */
371
372-#include <glib/gtypes.h>
373+#include <glib.h>
374 #include "sp-canvas.h"
375
376 #define SP_TYPE_CTRLRECT (sp_ctrlrect_get_type ())
377diff --git a/src/display/sp-canvas.h b/src/display/sp-canvas.h
378index 3d23bf0..14c1410 100644
379--- a/src/display/sp-canvas.h
380+++ b/src/display/sp-canvas.h
381@@ -27,7 +27,7 @@
382 # endif
383 #endif
384
385-#include <glib/gtypes.h>
386+#include <glib.h>
387 #include <gdk/gdk.h>
388 #include <gtk/gtk.h>
389
390diff --git a/src/document-subset.cpp b/src/document-subset.cpp
391index 1988865..020e6af 100644
392--- a/src/document-subset.cpp
393+++ b/src/document-subset.cpp
394@@ -12,7 +12,7 @@
395 #include "document.h"
396 #include "sp-object.h"
397
398-#include <glib/gmessages.h>
399+#include <glib.h>
400
401 #include <sigc++/signal.h>
402 #include <sigc++/functors/mem_fun.h>
403diff --git a/src/draw-anchor.h b/src/draw-anchor.h
404index 0277616..af281d3 100644
405--- a/src/draw-anchor.h
406+++ b/src/draw-anchor.h
407@@ -5,7 +5,7 @@
408 * Drawing anchors.
409 */
410
411-#include <glib/gtypes.h>
412+#include <glib.h>
413 #include <2geom/point.h>
414
415 struct SPDrawContext;
416diff --git a/src/dyna-draw-context.cpp b/src/dyna-draw-context.cpp
417index bb8e690..7a61a88 100644
418--- a/src/dyna-draw-context.cpp
419+++ b/src/dyna-draw-context.cpp
420@@ -38,7 +38,7 @@
421 #include <2geom/pathvector.h>
422 #include <2geom/bezier-utils.h>
423 #include "display/curve.h"
424-#include <glib/gmem.h>
425+#include <glib.h>
426 #include "macros.h"
427 #include "document.h"
428 #include "selection.h"
429diff --git a/src/eraser-context.cpp b/src/eraser-context.cpp
430index c198d93..c0bdec6 100644
431--- a/src/eraser-context.cpp
432+++ b/src/eraser-context.cpp
433@@ -36,7 +36,7 @@
434 #include "display/canvas-bpath.h"
435 #include <2geom/bezier-utils.h>
436
437-#include <glib/gmem.h>
438+#include <glib.h>
439 #include "macros.h"
440 #include "document.h"
441 #include "selection.h"
442diff --git a/src/extension/internal/bitmap/imagemagick.cpp b/src/extension/internal/bitmap/imagemagick.cpp
443index e907612..9a5a506 100644
444--- a/src/extension/internal/bitmap/imagemagick.cpp
445+++ b/src/extension/internal/bitmap/imagemagick.cpp
446@@ -15,6 +15,7 @@
447 #include <gtkmm/spinbutton.h>
448 #include <gtkmm.h>
449
450+#include <glib.h>
451 #include <glib/gstdio.h>
452
453 #include "desktop.h"
454diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp
455index 596f1fe..d65722b 100644
456--- a/src/extension/internal/cairo-render-context.cpp
457+++ b/src/extension/internal/cairo-render-context.cpp
458@@ -29,7 +29,7 @@
459 #include <errno.h>
460 #include <2geom/pathvector.h>
461
462-#include <glib/gmem.h>
463+#include <glib.h>
464
465 #include <glibmm/i18n.h>
466 #include "display/nr-arena.h"
467diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp
468index 7060251..489af18 100644
469--- a/src/extension/internal/cairo-renderer.cpp
470+++ b/src/extension/internal/cairo-renderer.cpp
471@@ -33,7 +33,7 @@
472 #include <2geom/transforms.h>
473 #include <2geom/pathvector.h>
474
475-#include <glib/gmem.h>
476+#include <glib.h>
477
478 #include <glibmm/i18n.h>
479 #include "display/nr-arena.h"
480diff --git a/src/extension/internal/gdkpixbuf-input.cpp b/src/extension/internal/gdkpixbuf-input.cpp
481index df7f348..a999c43 100644
482--- a/src/extension/internal/gdkpixbuf-input.cpp
483+++ b/src/extension/internal/gdkpixbuf-input.cpp
484@@ -1,7 +1,7 @@
485 #ifdef HAVE_CONFIG_H
486 # include <config.h>
487 #endif
488-#include <glib/gprintf.h>
489+#include <glib.h>
490 #include <glibmm/i18n.h>
491 #include "document-private.h"
492 #include <dir-util.h>
493diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
494index f0062bb..7f19151 100644
495--- a/src/extension/internal/pdfinput/svg-builder.h
496+++ b/src/extension/internal/pdfinput/svg-builder.h
497@@ -49,7 +49,7 @@ class XRef;
498 class SPCSSAttr;
499
500 #include <vector>
501-#include <glib/gtypes.h>
502+#include <glib.h>
503
504 namespace Inkscape {
505 namespace Extension {
506diff --git a/src/extension/internal/win32.cpp b/src/extension/internal/win32.cpp
507index 21f2788..18855b2 100644
508--- a/src/extension/internal/win32.cpp
509+++ b/src/extension/internal/win32.cpp
510@@ -13,7 +13,7 @@
511 # include "config.h"
512 #endif
513
514-#include <glib/gmem.h>
515+#include <glib.h>
516 #include <libnr/nr-macros.h>
517 #include <2geom/transforms.h>
518
519diff --git a/src/extract-uri.h b/src/extract-uri.h
520index 1975d9b..884b43a 100644
521--- a/src/extract-uri.h
522+++ b/src/extract-uri.h
523@@ -1,7 +1,7 @@
524 #ifndef SEEN_EXTRACT_URI_H
525 #define SEEN_EXTRACT_URI_H
526
527-#include <glib/gtypes.h>
528+#include <glib.h>
529
530 gchar *extract_uri(gchar const *s, gchar const** endptr = 0);
531
532diff --git a/src/file.cpp b/src/file.cpp
533index 1128a5a..3714560 100644
534--- a/src/file.cpp
535+++ b/src/file.cpp
536@@ -27,7 +27,7 @@
537 #endif
538
539 #include <gtk/gtk.h>
540-#include <glib/gmem.h>
541+#include <glib.h>
542 #include <glibmm/i18n.h>
543 #include <libnr/nr-pixops.h>
544
545diff --git a/src/file.h b/src/file.h
546index dec7e3f..88d0fa0 100644
547--- a/src/file.h
548+++ b/src/file.h
549@@ -16,7 +16,7 @@
550 */
551
552 #include <gtkmm.h>
553-#include <glib/gslist.h>
554+#include <glib.h>
555 #include <gtk/gtk.h>
556
557 #include "extension/extension-forward.h"
558diff --git a/src/filters/blend-fns.h b/src/filters/blend-fns.h
559index f08ed9d..39bf2b4 100644
560--- a/src/filters/blend-fns.h
561+++ b/src/filters/blend-fns.h
562@@ -6,7 +6,7 @@
563 */
564
565 #include <glib-object.h>
566-#include <glib/gtypes.h>
567+#include <glib.h>
568
569 namespace Inkscape {
570 namespace XML {
571diff --git a/src/filters/colormatrix-fns.h b/src/filters/colormatrix-fns.h
572index 3a4a8d3..e023d4d 100644
573--- a/src/filters/colormatrix-fns.h
574+++ b/src/filters/colormatrix-fns.h
575@@ -6,7 +6,7 @@
576 */
577
578 #include <glib-object.h>
579-#include <glib/gtypes.h>
580+#include <glib.h>
581
582 namespace Inkscape {
583 namespace XML {
584diff --git a/src/filters/componenttransfer-fns.h b/src/filters/componenttransfer-fns.h
585index 4998377..06248d6 100644
586--- a/src/filters/componenttransfer-fns.h
587+++ b/src/filters/componenttransfer-fns.h
588@@ -6,7 +6,7 @@
589 */
590
591 #include <glib-object.h>
592-#include <glib/gtypes.h>
593+#include <glib.h>
594
595 namespace Inkscape {
596 namespace XML {
597diff --git a/src/filters/composite-fns.h b/src/filters/composite-fns.h
598index c79cb17..51610fd 100644
599--- a/src/filters/composite-fns.h
600+++ b/src/filters/composite-fns.h
601@@ -6,7 +6,7 @@
602 */
603
604 #include <glib-object.h>
605-#include <glib/gtypes.h>
606+#include <glib.h>
607
608 namespace Inkscape {
609 namespace XML {
610diff --git a/src/filters/convolvematrix-fns.h b/src/filters/convolvematrix-fns.h
611index 76baf7f..931ad94 100644
612--- a/src/filters/convolvematrix-fns.h
613+++ b/src/filters/convolvematrix-fns.h
614@@ -6,7 +6,7 @@
615 */
616
617 #include <glib-object.h>
618-#include <glib/gtypes.h>
619+#include <glib.h>
620
621 namespace Inkscape {
622 namespace XML {
623diff --git a/src/filters/diffuselighting-fns.h b/src/filters/diffuselighting-fns.h
624index b91ed80..18a9375 100644
625--- a/src/filters/diffuselighting-fns.h
626+++ b/src/filters/diffuselighting-fns.h
627@@ -6,7 +6,7 @@
628 */
629
630 #include <glib-object.h>
631-#include <glib/gtypes.h>
632+#include <glib.h>
633
634 namespace Inkscape {
635 namespace XML {
636diff --git a/src/filters/displacementmap-fns.h b/src/filters/displacementmap-fns.h
637index 6d92c6b..4b8ed74 100644
638--- a/src/filters/displacementmap-fns.h
639+++ b/src/filters/displacementmap-fns.h
640@@ -6,7 +6,7 @@
641 */
642
643 #include <glib-object.h>
644-#include <glib/gtypes.h>
645+#include <glib.h>
646
647 namespace Inkscape {
648 namespace XML {
649diff --git a/src/filters/flood-fns.h b/src/filters/flood-fns.h
650index 8cc5072..0cd4bd3 100644
651--- a/src/filters/flood-fns.h
652+++ b/src/filters/flood-fns.h
653@@ -6,7 +6,7 @@
654 */
655
656 #include <glib-object.h>
657-#include <glib/gtypes.h>
658+#include <glib.h>
659
660 namespace Inkscape {
661 namespace XML {
662diff --git a/src/filters/image-fns.h b/src/filters/image-fns.h
663index 0a8b453..5748486 100644
664--- a/src/filters/image-fns.h
665+++ b/src/filters/image-fns.h
666@@ -6,7 +6,7 @@
667 */
668
669 #include <glib-object.h>
670-#include <glib/gtypes.h>
671+#include <glib.h>
672
673 namespace Inkscape {
674 namespace XML {
675diff --git a/src/filters/merge-fns.h b/src/filters/merge-fns.h
676index 24bda1a..9787d59 100644
677--- a/src/filters/merge-fns.h
678+++ b/src/filters/merge-fns.h
679@@ -6,7 +6,7 @@
680 */
681
682 #include <glib-object.h>
683-#include <glib/gtypes.h>
684+#include <glib.h>
685
686 namespace Inkscape {
687 namespace XML {
688diff --git a/src/filters/morphology-fns.h b/src/filters/morphology-fns.h
689index a055040..a6f1b58 100644
690--- a/src/filters/morphology-fns.h
691+++ b/src/filters/morphology-fns.h
692@@ -6,7 +6,7 @@
693 */
694
695 #include <glib-object.h>
696-#include <glib/gtypes.h>
697+#include <glib.h>
698
699 namespace Inkscape {
700 namespace XML {
701diff --git a/src/filters/offset-fns.h b/src/filters/offset-fns.h
702index 38561c1..32fbda7 100644
703--- a/src/filters/offset-fns.h
704+++ b/src/filters/offset-fns.h
705@@ -6,7 +6,7 @@
706 */
707
708 #include <glib-object.h>
709-#include <glib/gtypes.h>
710+#include <glib.h>
711
712 namespace Inkscape {
713 namespace XML {
714diff --git a/src/filters/specularlighting-fns.h b/src/filters/specularlighting-fns.h
715index bd48ba6..70cd5d4 100644
716--- a/src/filters/specularlighting-fns.h
717+++ b/src/filters/specularlighting-fns.h
718@@ -6,7 +6,7 @@
719 */
720
721 #include <glib-object.h>
722-#include <glib/gtypes.h>
723+#include <glib.h>
724
725 namespace Inkscape {
726 namespace XML {
727diff --git a/src/filters/tile-fns.h b/src/filters/tile-fns.h
728index b7c4c5f..4a99a51 100644
729--- a/src/filters/tile-fns.h
730+++ b/src/filters/tile-fns.h
731@@ -6,7 +6,7 @@
732 */
733
734 #include <glib-object.h>
735-#include <glib/gtypes.h>
736+#include <glib.h>
737
738 namespace Inkscape {
739 namespace XML {
740diff --git a/src/filters/turbulence-fns.h b/src/filters/turbulence-fns.h
741index 43b4450..de9f228 100644
742--- a/src/filters/turbulence-fns.h
743+++ b/src/filters/turbulence-fns.h
744@@ -6,7 +6,7 @@
745 */
746
747 #include <glib-object.h>
748-#include <glib/gtypes.h>
749+#include <glib.h>
750
751 namespace Inkscape {
752 namespace XML {
753diff --git a/src/gc-anchored.h b/src/gc-anchored.h
754index 917930a..119b86a 100644
755--- a/src/gc-anchored.h
756+++ b/src/gc-anchored.h
757@@ -11,7 +11,7 @@
758 #ifndef SEEN_INKSCAPE_GC_ANCHORED_H
759 #define SEEN_INKSCAPE_GC_ANCHORED_H
760
761-#include <glib/gmessages.h>
762+#include <glib.h>
763 #include "gc-managed.h"
764
765 namespace Inkscape {
766diff --git a/src/gc-core.h b/src/gc-core.h
767index af327dc..b99e1c5 100644
768--- a/src/gc-core.h
769+++ b/src/gc-core.h
770@@ -24,7 +24,7 @@
771 #else
772 # include <gc.h>
773 #endif
774-#include <glib/gmain.h>
775+#include <glib.h>
776
777 namespace Inkscape {
778 namespace GC {
779diff --git a/src/gc.cpp b/src/gc.cpp
780index 8622059..5a636e7 100644
781--- a/src/gc.cpp
782+++ b/src/gc.cpp
783@@ -13,7 +13,7 @@
784 #include <stdexcept>
785 #include <cstring>
786 #include <string>
787-#include <glib/gmessages.h>
788+#include <glib.h>
789 #include <sigc++/functors/ptr_fun.h>
790 #include <glibmm/main.h>
791 #include <cstddef>
792diff --git a/src/gradient-drag.h b/src/gradient-drag.h
793index 40ab065..4fa471b 100644
794--- a/src/gradient-drag.h
795+++ b/src/gradient-drag.h
796@@ -14,7 +14,7 @@
797 * Released under GNU GPL, read the file 'COPYING' for more information
798 */
799
800-#include <glib/gslist.h>
801+#include <glib.h>
802 #include <stddef.h>
803 #include <sigc++/sigc++.h>
804 #include <vector>
805diff --git a/src/help.h b/src/help.h
806index ef5d703..7241c82 100644
807--- a/src/help.h
808+++ b/src/help.h
809@@ -13,7 +13,7 @@
810 * Released under GNU GPL, read the file 'COPYING' for more information
811 */
812
813-#include <glib/gtypes.h>
814+#include <glib.h>
815 #include <gtk/gtk.h>
816
817 void sp_help_about(void);
818diff --git a/src/helper/gnome-utils.h b/src/helper/gnome-utils.h
819index 0a28c95..62676c7 100644
820--- a/src/helper/gnome-utils.h
821+++ b/src/helper/gnome-utils.h
822@@ -15,8 +15,7 @@
823 #ifndef __GNOME_UTILS_H__
824 #define __GNOME_UTILS_H__
825
826-#include <glib/gtypes.h>
827-#include <glib/glist.h>
828+#include <glib.h>
829
830 GList *gnome_uri_list_extract_uris(gchar const *uri_list);
831
832diff --git a/src/helper/pixbuf-ops.cpp b/src/helper/pixbuf-ops.cpp
833index 3be63aa..d7d2e57 100644
834--- a/src/helper/pixbuf-ops.cpp
835+++ b/src/helper/pixbuf-ops.cpp
836@@ -18,7 +18,6 @@
837 #include <interface.h>
838 #include <libnr/nr-pixops.h>
839 #include <glib.h>
840-#include <glib/gmessages.h>
841 #include <png.h>
842 #include "png-write.h"
843 #include <display/nr-arena-item.h>
844diff --git a/src/helper/pixbuf-ops.h b/src/helper/pixbuf-ops.h
845index a985be2..af57327 100644
846--- a/src/helper/pixbuf-ops.h
847+++ b/src/helper/pixbuf-ops.h
848@@ -12,7 +12,7 @@
849 * Released under GNU GPL, read the file 'COPYING' for more information
850 */
851
852-#include <glib/gtypes.h>
853+#include <glib.h>
854
855 struct SPDocument;
856
857diff --git a/src/helper/png-write.cpp b/src/helper/png-write.cpp
858index b1c135d..5cb37d9 100644
859--- a/src/helper/png-write.cpp
860+++ b/src/helper/png-write.cpp
861@@ -20,7 +20,7 @@
862 #include <libnr/nr-pixops.h>
863 #include <libnr/nr-translate-scale-ops.h>
864 #include <2geom/rect.h>
865-#include <glib/gmessages.h>
866+#include <glib.h>
867 #include <png.h>
868 #include "png-write.h"
869 #include "io/sys.h"
870diff --git a/src/helper/png-write.h b/src/helper/png-write.h
871index 83321aa..f8ba4bb 100644
872--- a/src/helper/png-write.h
873+++ b/src/helper/png-write.h
874@@ -12,7 +12,7 @@
875 * Released under GNU GPL, read the file 'COPYING' for more information
876 */
877
878-#include <glib/gtypes.h>
879+#include <glib.h>
880 #include <2geom/forward.h>
881 struct SPDocument;
882
883diff --git a/src/helper/stlport.h b/src/helper/stlport.h
884index c9389e8..c7b00eb 100644
885--- a/src/helper/stlport.h
886+++ b/src/helper/stlport.h
887@@ -3,8 +3,7 @@
888
889
890 #include <list>
891-#include <glib/glist.h>
892-#include <glib/gslist.h>
893+#include <glib.h>
894
895 template <typename T>
896 class StlConv {
897diff --git a/src/helper/stock-items.h b/src/helper/stock-items.h
898index ddad554..4576d51 100644
899--- a/src/helper/stock-items.h
900+++ b/src/helper/stock-items.h
901@@ -12,7 +12,7 @@
902 *
903 */
904
905-#include <glib/gtypes.h>
906+#include <glib.h>
907
908 #include <forward.h>
909
910diff --git a/src/helper/unit-menu.h b/src/helper/unit-menu.h
911index cdaa826..fc8a600 100644
912--- a/src/helper/unit-menu.h
913+++ b/src/helper/unit-menu.h
914@@ -10,7 +10,7 @@
915 *
916 */
917
918-#include <glib/gtypes.h>
919+#include <glib.h>
920 #include <gtk/gtk.h>
921
922 #include <helper/helper-forward.h>
923diff --git a/src/helper/units.h b/src/helper/units.h
924index 8dc62fe..93bd706 100644
925--- a/src/helper/units.h
926+++ b/src/helper/units.h
927@@ -15,9 +15,7 @@
928 *
929 */
930
931-#include <glib/gmessages.h>
932-#include <glib/gslist.h>
933-#include <glib/gtypes.h>
934+#include <glib.h>
935 #include "sp-metric.h"
936
937
938diff --git a/src/inkscape.h b/src/inkscape.h
939index ca28942..5538d4f 100644
940--- a/src/inkscape.h
941+++ b/src/inkscape.h
942@@ -13,7 +13,7 @@
943 */
944
945 #include <list>
946-#include <glib/gtypes.h>
947+#include <glib.h>
948
949 struct SPDesktop;
950 struct SPDocument;
951diff --git a/src/inkview.cpp b/src/inkview.cpp
952index 6fe989e..9d76378 100644
953--- a/src/inkview.cpp
954+++ b/src/inkview.cpp
955@@ -39,7 +39,7 @@
956 #include <sys/stat.h>
957 #include <locale.h>
958
959-#include <glib/gmem.h>
960+#include <glib.h>
961 #include <libnr/nr-macros.h>
962
963 // #include <stropts.h>
964diff --git a/src/io/inkjar.h b/src/io/inkjar.h
965index 0fe088b..ea4b0ee 100644
966--- a/src/io/inkjar.h
967+++ b/src/io/inkjar.h
968@@ -26,8 +26,7 @@
969 # endif
970 #endif
971
972-#include <glib/garray.h>
973-#include <glib/gtypes.h>
974+#include <glib.h>
975
976 namespace Inkjar {
977
978diff --git a/src/io/resource.cpp b/src/io/resource.cpp
979index 1f6f845..14b8beb 100644
980--- a/src/io/resource.cpp
981+++ b/src/io/resource.cpp
982@@ -16,10 +16,7 @@
983 #include "config.h"
984 #endif
985
986-#include <glib.h> // g_assert()
987-#include <glib/gmessages.h>
988-#include <glib/gstrfuncs.h>
989-#include <glib/gfileutils.h>
990+#include <glib.h>
991 #include "path-prefix.h"
992 #include "inkscape.h"
993 #include "io/resource.h"
994diff --git a/src/io/sys.cpp b/src/io/sys.cpp
995index 143108a..529f7ce 100644
996--- a/src/io/sys.cpp
997+++ b/src/io/sys.cpp
998@@ -16,8 +16,6 @@
999 #endif
1000
1001 #include <glib.h>
1002-#include <glib/gstdio.h>
1003-#include <glib/gutils.h>
1004 #include <glibmm/fileutils.h>
1005 #if GLIB_CHECK_VERSION(2,6,0)
1006 #include <glib/gstdio.h>
1007diff --git a/src/io/sys.h b/src/io/sys.h
1008index 8623f6b..83ffdb4 100644
1009--- a/src/io/sys.h
1010+++ b/src/io/sys.h
1011@@ -15,9 +15,7 @@
1012 #include <stdio.h>
1013 #include <sys/stat.h>
1014 #include <sys/types.h>
1015-#include <glib/gtypes.h>
1016-#include <glib/gdir.h>
1017-#include <glib/gfileutils.h>
1018+#include <glib.h>
1019 #include <glibmm/spawn.h>
1020 #include <string>
1021
1022diff --git a/src/knot-holder-entity.h b/src/knot-holder-entity.h
1023index c8fd29d..84afaa4 100644
1024--- a/src/knot-holder-entity.h
1025+++ b/src/knot-holder-entity.h
1026@@ -17,7 +17,7 @@
1027 * Released under GNU GPL
1028 */
1029
1030-#include <glib/gtypes.h>
1031+#include <glib.h>
1032 #include "knot.h"
1033 #include <2geom/forward.h>
1034 #include "snapper.h"
1035diff --git a/src/knotholder.h b/src/knotholder.h
1036index 0b37d21..7feb1c7 100644
1037--- a/src/knotholder.h
1038+++ b/src/knotholder.h
1039@@ -17,7 +17,7 @@
1040 *
1041 */
1042
1043-#include <glib/gtypes.h>
1044+#include <glib.h>
1045 #include "knot-enums.h"
1046 #include "forward.h"
1047 #include "libnr/nr-forward.h"
1048diff --git a/src/libcroco/cr-libxml-node-iface.h b/src/libcroco/cr-libxml-node-iface.h
1049index 5da0d9a..b4a6212 100644
1050--- a/src/libcroco/cr-libxml-node-iface.h
1051+++ b/src/libcroco/cr-libxml-node-iface.h
1052@@ -1,7 +1,7 @@
1053 #ifndef __CR_LIBXML_NODE_IFACE_H__
1054 #define __CR_LIBXML_NODE_IFACE_H__
1055
1056-#include <glib/gmacros.h>
1057+#include <glib.h>
1058 #include "cr-node-iface.h"
1059
1060 G_BEGIN_DECLS
1061diff --git a/src/libcroco/cr-node-iface.h b/src/libcroco/cr-node-iface.h
1062index 9c2d30e..01898d6 100644
1063--- a/src/libcroco/cr-node-iface.h
1064+++ b/src/libcroco/cr-node-iface.h
1065@@ -1,8 +1,7 @@
1066 #ifndef __CR_NODE_IFACE_H__
1067 #define __CR_NODE_IFACE_H__
1068
1069-#include <glib/gmacros.h>
1070-#include <glib/gtypes.h>
1071+#include <glib.h>
1072
1073 G_BEGIN_DECLS
1074
1075diff --git a/src/libgdl/gdl-stock.h b/src/libgdl/gdl-stock.h
1076index cb6f7ab..459d00c 100644
1077--- a/src/libgdl/gdl-stock.h
1078+++ b/src/libgdl/gdl-stock.h
1079@@ -22,7 +22,7 @@
1080 #ifndef __GDL_STOCK_H__
1081 #define __GDL_STOCK_H__
1082
1083-#include <glib/gmacros.h> // G_BEGIN_DECLS
1084+#include <glib.h> // G_BEGIN_DECLS
1085
1086 G_BEGIN_DECLS
1087
1088diff --git a/src/libnr/in-svg-plane-test.h b/src/libnr/in-svg-plane-test.h
1089index 304182f..1d51125 100644
1090--- a/src/libnr/in-svg-plane-test.h
1091+++ b/src/libnr/in-svg-plane-test.h
1092@@ -1,6 +1,6 @@
1093 #include <cxxtest/TestSuite.h>
1094
1095-#include <glib/gmacros.h>
1096+#include <glib.h>
1097 #include <cmath>
1098
1099 #include "libnr/in-svg-plane.h"
1100diff --git a/src/libnr/nr-gradient.cpp b/src/libnr/nr-gradient.cpp
1101index e6eb9b7..32dac7d 100644
1102--- a/src/libnr/nr-gradient.cpp
1103+++ b/src/libnr/nr-gradient.cpp
1104@@ -26,7 +26,7 @@
1105 #include <libnr/nr-blit.h>
1106 #include <libnr/nr-gradient.h>
1107 #include <libnr/nr-matrix-ops.h>
1108-#include <glib/gtypes.h>
1109+#include <glib.h>
1110 #include <stdio.h>
1111
1112 /* Common */
1113diff --git a/src/libnr/nr-i-coord.h b/src/libnr/nr-i-coord.h
1114index f87dea3..c9e6b3f 100644
1115--- a/src/libnr/nr-i-coord.h
1116+++ b/src/libnr/nr-i-coord.h
1117@@ -1,7 +1,7 @@
1118 #ifndef SEEN_NR_I_COORD_H
1119 #define SEEN_NR_I_COORD_H
1120
1121-#include <glib/gtypes.h>
1122+#include <glib.h>
1123
1124 namespace NR {
1125
1126diff --git a/src/libnr/nr-matrix.h b/src/libnr/nr-matrix.h
1127index b1f9d58..471381c 100644
1128--- a/src/libnr/nr-matrix.h
1129+++ b/src/libnr/nr-matrix.h
1130@@ -17,8 +17,7 @@
1131 * This code is in public domain.
1132 */
1133
1134-#include <glib.h> // g_assert()
1135-#include <glib/gmessages.h>
1136+#include <glib.h>
1137
1138 #include "libnr/nr-coord.h"
1139 #include "libnr/nr-values.h"
1140diff --git a/src/libnr/nr-object.cpp b/src/libnr/nr-object.cpp
1141index d92052d..e4268f1 100644
1142--- a/src/libnr/nr-object.cpp
1143+++ b/src/libnr/nr-object.cpp
1144@@ -15,7 +15,7 @@
1145
1146 #include <typeinfo>
1147
1148-#include <glib/gmem.h>
1149+#include <glib.h>
1150 #include <libnr/nr-macros.h>
1151
1152 #include "nr-object.h"
1153diff --git a/src/libnr/nr-object.h b/src/libnr/nr-object.h
1154index 2691302..da89385 100644
1155--- a/src/libnr/nr-object.h
1156+++ b/src/libnr/nr-object.h
1157@@ -15,7 +15,7 @@
1158 #include "config.h"
1159 #endif
1160
1161-#include <glib/gtypes.h>
1162+#include <glib.h>
1163 #include "gc-managed.h"
1164 #include "gc-finalized.h"
1165 #include "gc-anchored.h"
1166diff --git a/src/libnr/nr-pixblock-pattern.cpp b/src/libnr/nr-pixblock-pattern.cpp
1167index aa32462..a09c957 100644
1168--- a/src/libnr/nr-pixblock-pattern.cpp
1169+++ b/src/libnr/nr-pixblock-pattern.cpp
1170@@ -10,7 +10,7 @@
1171 */
1172
1173
1174-#include <glib/gmem.h>
1175+#include <glib.h>
1176 #include "nr-pixops.h"
1177 #include "nr-pixblock-pattern.h"
1178
1179diff --git a/src/libnr/nr-pixblock.cpp b/src/libnr/nr-pixblock.cpp
1180index 6b2b12b..a881a37 100644
1181--- a/src/libnr/nr-pixblock.cpp
1182+++ b/src/libnr/nr-pixblock.cpp
1183@@ -13,7 +13,7 @@
1184 #include <cstring>
1185 #include <string>
1186 #include <string.h>
1187-#include <glib/gmem.h>
1188+#include <glib.h>
1189 #include "nr-pixblock.h"
1190
1191 /// Size of buffer that needs no allocation (default 4).
1192diff --git a/src/libnr/nr-point-fns-test.h b/src/libnr/nr-point-fns-test.h
1193index 7d28c9c..eeb28f4 100644
1194--- a/src/libnr/nr-point-fns-test.h
1195+++ b/src/libnr/nr-point-fns-test.h
1196@@ -3,7 +3,7 @@
1197
1198 #include <cassert>
1199 #include <cmath>
1200-#include <glib/gmacros.h>
1201+#include <glib.h>
1202 #include <stdlib.h>
1203
1204 #include "libnr/nr-point-fns.h"
1205diff --git a/src/libnr/nr-rotate-fns-test.h b/src/libnr/nr-rotate-fns-test.h
1206index e3bfe30..d1c01cd 100644
1207--- a/src/libnr/nr-rotate-fns-test.h
1208+++ b/src/libnr/nr-rotate-fns-test.h
1209@@ -1,7 +1,7 @@
1210 #include <cxxtest/TestSuite.h>
1211
1212 #include <cmath>
1213-#include <glib/gmacros.h>
1214+#include <glib.h>
1215
1216 #include <libnr/nr-rotate-fns.h>
1217
1218diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp
1219index 067254b..4130bfc 100644
1220--- a/src/libnrtype/FontFactory.cpp
1221+++ b/src/libnrtype/FontFactory.cpp
1222@@ -15,7 +15,7 @@
1223 #endif
1224
1225 #include <glibmm.h>
1226-#include <glib/gmem.h>
1227+#include <glib.h>
1228 #include <glibmm/i18n.h> // _()
1229 #include <pango/pangoft2.h>
1230 #include "libnrtype/FontFactory.h"
1231diff --git a/src/libnrtype/Layout-TNG-Output.cpp b/src/libnrtype/Layout-TNG-Output.cpp
1232index f34b93d..ab03b16 100644
1233--- a/src/libnrtype/Layout-TNG-Output.cpp
1234+++ b/src/libnrtype/Layout-TNG-Output.cpp
1235@@ -8,7 +8,7 @@
1236 *
1237 * Released under GNU GPL, read the file 'COPYING' for more information
1238 */
1239-#include <glib/gmem.h>
1240+#include <glib.h>
1241 #include "Layout-TNG.h"
1242 #include "display/nr-arena-glyphs.h"
1243 #include "style.h"
1244diff --git a/src/libnrtype/nr-type-primitives.cpp b/src/libnrtype/nr-type-primitives.cpp
1245index 34b1e43..698f3f8 100644
1246--- a/src/libnrtype/nr-type-primitives.cpp
1247+++ b/src/libnrtype/nr-type-primitives.cpp
1248@@ -14,7 +14,7 @@
1249
1250 #include <stdlib.h>
1251 #include <string.h>
1252-#include <glib/gmem.h>
1253+#include <glib.h>
1254 #include <libnr/nr-macros.h>
1255 #include "nr-type-primitives.h"
1256
1257diff --git a/src/libnrtype/nr-type-primitives.h b/src/libnrtype/nr-type-primitives.h
1258index 92b94e9..9bb181c 100644
1259--- a/src/libnrtype/nr-type-primitives.h
1260+++ b/src/libnrtype/nr-type-primitives.h
1261@@ -11,7 +11,7 @@
1262 * This code is in public domain
1263 */
1264
1265-#include <glib/gtypes.h>
1266+#include <glib.h>
1267
1268 struct NRNameList;
1269 struct NRStyleList;
1270diff --git a/src/livarot/AlphaLigne.cpp b/src/livarot/AlphaLigne.cpp
1271index f878c1b..5b8321b 100644
1272--- a/src/livarot/AlphaLigne.cpp
1273+++ b/src/livarot/AlphaLigne.cpp
1274@@ -12,7 +12,7 @@
1275 #include <math.h>
1276 #include <stdio.h>
1277 #include <stdlib.h>
1278-#include <glib/gmem.h>
1279+#include <glib.h>
1280
1281 AlphaLigne::AlphaLigne(int iMin,int iMax)
1282 {
1283diff --git a/src/livarot/BitLigne.cpp b/src/livarot/BitLigne.cpp
1284index c4c1346..d7cce26 100644
1285--- a/src/livarot/BitLigne.cpp
1286+++ b/src/livarot/BitLigne.cpp
1287@@ -15,7 +15,7 @@
1288 #include <string>
1289 #include <cmath>
1290 #include <cstdio>
1291-#include <glib/gmem.h>
1292+#include <glib.h>
1293
1294 BitLigne::BitLigne(int ist,int ien,float iScale)
1295 {
1296diff --git a/src/livarot/PathSimplify.cpp b/src/livarot/PathSimplify.cpp
1297index 0f440de..efcdfd4 100644
1298--- a/src/livarot/PathSimplify.cpp
1299+++ b/src/livarot/PathSimplify.cpp
1300@@ -6,7 +6,7 @@
1301 *
1302 */
1303
1304-#include <glib/gmem.h>
1305+#include <glib.h>
1306 #include <libnr/nr-point-matrix-ops.h>
1307 #include "livarot/Path.h"
1308 #include "livarot/path-description.h"
1309diff --git a/src/livarot/Shape.cpp b/src/livarot/Shape.cpp
1310index 9107844..e260e97 100644
1311--- a/src/livarot/Shape.cpp
1312+++ b/src/livarot/Shape.cpp
1313@@ -8,7 +8,7 @@
1314
1315 #include <cstdio>
1316 #include <cstdlib>
1317-#include <glib/gmem.h>
1318+#include <glib.h>
1319 #include "Shape.h"
1320 #include "livarot/sweep-event-queue.h"
1321 #include "livarot/sweep-tree-list.h"
1322diff --git a/src/livarot/ShapeSweep.cpp b/src/livarot/ShapeSweep.cpp
1323index 00a0dd9..d3d5ef1 100644
1324--- a/src/livarot/ShapeSweep.cpp
1325+++ b/src/livarot/ShapeSweep.cpp
1326@@ -9,7 +9,7 @@
1327 #include <cstdio>
1328 #include <cstdlib>
1329 #include <cstring>
1330-#include <glib/gmem.h>
1331+#include <glib.h>
1332 #include "Shape.h"
1333 #include "livarot/sweep-event-queue.h"
1334 #include "livarot/sweep-tree-list.h"
1335diff --git a/src/livarot/int-line.cpp b/src/livarot/int-line.cpp
1336index c1e388f..d03d62c 100644
1337--- a/src/livarot/int-line.cpp
1338+++ b/src/livarot/int-line.cpp
1339@@ -9,7 +9,7 @@
1340 *
1341 */
1342
1343-#include <glib/gmem.h>
1344+#include <glib.h>
1345 #include <cmath>
1346 #include <cstring>
1347 #include <string>
1348diff --git a/src/livarot/sweep-event.cpp b/src/livarot/sweep-event.cpp
1349index 88d895e..28fead2 100644
1350--- a/src/livarot/sweep-event.cpp
1351+++ b/src/livarot/sweep-event.cpp
1352@@ -1,4 +1,4 @@
1353-#include <glib/gmem.h>
1354+#include <glib.h>
1355 #include "livarot/sweep-event-queue.h"
1356 #include "livarot/sweep-tree.h"
1357 #include "livarot/sweep-event.h"
1358diff --git a/src/livarot/sweep-tree-list.cpp b/src/livarot/sweep-tree-list.cpp
1359index 1d2dcec..5d3f69e 100644
1360--- a/src/livarot/sweep-tree-list.cpp
1361+++ b/src/livarot/sweep-tree-list.cpp
1362@@ -1,4 +1,4 @@
1363-#include <glib/gmem.h>
1364+#include <glib.h>
1365 #include "livarot/sweep-tree.h"
1366 #include "livarot/sweep-tree-list.h"
1367
1368diff --git a/src/live_effects/parameter/array.h b/src/live_effects/parameter/array.h
1369index e5f2301..ca22a07 100644
1370--- a/src/live_effects/parameter/array.h
1371+++ b/src/live_effects/parameter/array.h
1372@@ -11,7 +11,7 @@
1373
1374 #include <vector>
1375
1376-#include <glib/gtypes.h>
1377+#include <glib.h>
1378
1379 #include <gtkmm/tooltips.h>
1380
1381diff --git a/src/live_effects/parameter/bool.h b/src/live_effects/parameter/bool.h
1382index 8f5196d..851476f 100644
1383--- a/src/live_effects/parameter/bool.h
1384+++ b/src/live_effects/parameter/bool.h
1385@@ -9,7 +9,7 @@
1386 * Released under GNU GPL, read the file 'COPYING' for more information
1387 */
1388
1389-#include <glib/gtypes.h>
1390+#include <glib.h>
1391
1392 #include "live_effects/parameter/parameter.h"
1393
1394diff --git a/src/live_effects/parameter/enum.h b/src/live_effects/parameter/enum.h
1395index 05f3bdd..2d2268e 100644
1396--- a/src/live_effects/parameter/enum.h
1397+++ b/src/live_effects/parameter/enum.h
1398@@ -9,7 +9,7 @@
1399 * Released under GNU GPL, read the file 'COPYING' for more information
1400 */
1401
1402-#include <glib/gtypes.h>
1403+#include <glib.h>
1404
1405 #include "ui/widget/registered-enums.h"
1406 #include <gtkmm/tooltips.h>
1407diff --git a/src/live_effects/parameter/path.h b/src/live_effects/parameter/path.h
1408index 8fe9382..792c98a 100644
1409--- a/src/live_effects/parameter/path.h
1410+++ b/src/live_effects/parameter/path.h
1411@@ -9,7 +9,7 @@
1412 * Released under GNU GPL, read the file 'COPYING' for more information
1413 */
1414
1415-#include <glib/gtypes.h>
1416+#include <glib.h>
1417 #include <2geom/path.h>
1418
1419 #include <gtkmm/tooltips.h>
1420diff --git a/src/live_effects/parameter/point.h b/src/live_effects/parameter/point.h
1421index ec61fcd..38fab1c 100644
1422--- a/src/live_effects/parameter/point.h
1423+++ b/src/live_effects/parameter/point.h
1424@@ -9,7 +9,7 @@
1425 * Released under GNU GPL, read the file 'COPYING' for more information
1426 */
1427
1428-#include <glib/gtypes.h>
1429+#include <glib.h>
1430 #include <2geom/point.h>
1431
1432 #include <gtkmm/tooltips.h>
1433diff --git a/src/live_effects/parameter/text.h b/src/live_effects/parameter/text.h
1434index 8539a80..8265430 100644
1435--- a/src/live_effects/parameter/text.h
1436+++ b/src/live_effects/parameter/text.h
1437@@ -13,7 +13,7 @@
1438 * Released under GNU GPL, read the file 'COPYING' for more information
1439 */
1440
1441-#include <glib/gtypes.h>
1442+#include <glib.h>
1443
1444 #include "display/canvas-bpath.h"
1445 #include "live_effects/parameter/parameter.h"
1446diff --git a/src/live_effects/parameter/vector.h b/src/live_effects/parameter/vector.h
1447index a4c29d3..09581d2 100644
1448--- a/src/live_effects/parameter/vector.h
1449+++ b/src/live_effects/parameter/vector.h
1450@@ -9,7 +9,7 @@
1451 * Released under GNU GPL, read the file 'COPYING' for more information
1452 */
1453
1454-#include <glib/gtypes.h>
1455+#include <glib.h>
1456 #include <2geom/point.h>
1457
1458 #include <gtkmm/tooltips.h>
1459diff --git a/src/main-cmdlineact.h b/src/main-cmdlineact.h
1460index aca039f..03f0eb0 100644
1461--- a/src/main-cmdlineact.h
1462+++ b/src/main-cmdlineact.h
1463@@ -15,7 +15,7 @@
1464 * Released under GNU GPL v2.x, read the file 'COPYING' for more information
1465 */
1466
1467-#include <glib/gtypes.h>
1468+#include <glib.h>
1469
1470 namespace Inkscape {
1471
1472diff --git a/src/main.cpp b/src/main.cpp
1473index d4b8271..5852d36 100644
1474--- a/src/main.cpp
1475+++ b/src/main.cpp
1476@@ -48,7 +48,6 @@
1477
1478 #include <libxml/tree.h>
1479 #include <glib.h>
1480-#include <glib/gprintf.h>
1481 #include <glib-object.h>
1482 #include <gtk/gtk.h>
1483
1484diff --git a/src/message-context.cpp b/src/message-context.cpp
1485index 5055f41..6182c2c 100644
1486--- a/src/message-context.cpp
1487+++ b/src/message-context.cpp
1488@@ -9,7 +9,7 @@
1489 * Released under GNU GPL, read the file 'COPYING' for more information
1490 */
1491
1492-#include <glib/gstrfuncs.h>
1493+#include <glib.h>
1494 #include "message-context.h"
1495 #include "message-stack.h"
1496
1497diff --git a/src/message-stack.cpp b/src/message-stack.cpp
1498index 05aec87..1c407e3 100644
1499--- a/src/message-stack.cpp
1500+++ b/src/message-stack.cpp
1501@@ -10,7 +10,7 @@
1502 */
1503
1504 #include <string.h>
1505-#include <glib/gstrfuncs.h>
1506+#include <glib.h>
1507 #include <cstring>
1508 #include <string>
1509 #include "message-stack.h"
1510diff --git a/src/modifier-fns.h b/src/modifier-fns.h
1511index 02d3e8f..368791b 100644
1512--- a/src/modifier-fns.h
1513+++ b/src/modifier-fns.h
1514@@ -12,7 +12,7 @@
1515 */
1516
1517 #include <gdk/gdk.h>
1518-#include <glib/gtypes.h>
1519+#include <glib.h>
1520
1521 inline bool
1522 mod_shift(guint const state)
1523diff --git a/src/number-opt-number.h b/src/number-opt-number.h
1524index 0025f2d..6a0e72f 100644
1525--- a/src/number-opt-number.h
1526+++ b/src/number-opt-number.h
1527@@ -18,7 +18,6 @@
1528 #endif
1529
1530 #include <glib.h>
1531-#include <glib/gprintf.h>
1532 //todo: use glib instead of stdlib
1533 #include <stdlib.h>
1534 #include "svg/stringstream.h"
1535diff --git a/src/object-hierarchy.h b/src/object-hierarchy.h
1536index c127a48..fa23219 100644
1537--- a/src/object-hierarchy.h
1538+++ b/src/object-hierarchy.h
1539@@ -17,7 +17,7 @@
1540 #include <stddef.h>
1541 #include <sigc++/connection.h>
1542 #include <sigc++/signal.h>
1543-#include <glib/gmessages.h>
1544+#include <glib.h>
1545
1546 class SPObject;
1547
1548diff --git a/src/path-chemistry.cpp b/src/path-chemistry.cpp
1549index c44ab5b..c97b7c7 100644
1550--- a/src/path-chemistry.cpp
1551+++ b/src/path-chemistry.cpp
1552@@ -22,7 +22,7 @@
1553 #include "xml/repr.h"
1554 #include "svg/svg.h"
1555 #include "display/curve.h"
1556-#include <glib/gmem.h>
1557+#include <glib.h>
1558 #include <glibmm/i18n.h>
1559 #include "sp-path.h"
1560 #include "sp-text.h"
1561diff --git a/src/removeoverlap.h b/src/removeoverlap.h
1562index 5b16e70..1ba4157 100644
1563--- a/src/removeoverlap.h
1564+++ b/src/removeoverlap.h
1565@@ -13,7 +13,7 @@
1566 #ifndef SEEN_REMOVEOVERLAP_H
1567 #define SEEN_REMOVEOVERLAP_H
1568
1569-#include <glib/gslist.h>
1570+#include <glib.h>
1571
1572 void removeoverlap(GSList const *items, double xGap, double yGap);
1573
1574diff --git a/src/sp-conn-end-pair.h b/src/sp-conn-end-pair.h
1575index bc5fa12..7ba42e9 100644
1576--- a/src/sp-conn-end-pair.h
1577+++ b/src/sp-conn-end-pair.h
1578@@ -11,7 +11,7 @@
1579 *
1580 * Released under GNU GPL, read the file 'COPYING' for more information
1581 */
1582-#include <glib/gtypes.h>
1583+#include <glib.h>
1584
1585 #include "forward.h"
1586 #include "libnr/nr-point.h"
1587diff --git a/src/sp-conn-end.h b/src/sp-conn-end.h
1588index 052e8dd..032f12e 100644
1589--- a/src/sp-conn-end.h
1590+++ b/src/sp-conn-end.h
1591@@ -1,7 +1,7 @@
1592 #ifndef SEEN_SP_CONN_END
1593 #define SEEN_SP_CONN_END
1594
1595-#include <glib/gtypes.h>
1596+#include <glib.h>
1597 #include <stddef.h>
1598 #include <sigc++/connection.h>
1599
1600diff --git a/src/sp-filter-fns.h b/src/sp-filter-fns.h
1601index 4e1b012..a1e2075 100644
1602--- a/src/sp-filter-fns.h
1603+++ b/src/sp-filter-fns.h
1604@@ -5,7 +5,7 @@
1605 * Macros and fn declarations related to filters.
1606 */
1607
1608-#include <glib/gtypes.h>
1609+#include <glib.h>
1610 #include <glib-object.h>
1611 #include "libnr/nr-forward.h"
1612 #include "sp-filter-units.h"
1613diff --git a/src/sp-gaussian-blur-fns.h b/src/sp-gaussian-blur-fns.h
1614index 0307392..fe696dc 100644
1615--- a/src/sp-gaussian-blur-fns.h
1616+++ b/src/sp-gaussian-blur-fns.h
1617@@ -6,7 +6,7 @@
1618 */
1619
1620 #include <glib-object.h>
1621-#include <glib/gtypes.h>
1622+#include <glib.h>
1623
1624 namespace Inkscape {
1625 namespace XML {
1626diff --git a/src/sp-gradient-fns.h b/src/sp-gradient-fns.h
1627index aabc3ed..e09717b 100644
1628--- a/src/sp-gradient-fns.h
1629+++ b/src/sp-gradient-fns.h
1630@@ -5,7 +5,7 @@
1631 * Macros and fn declarations related to gradients.
1632 */
1633
1634-#include <glib/gtypes.h>
1635+#include <glib.h>
1636 #include <glib-object.h>
1637 #include <2geom/forward.h>
1638 #include "sp-gradient-spread.h"
1639diff --git a/src/sp-gradient-vector.h b/src/sp-gradient-vector.h
1640index 7bdfb51..d341daa 100644
1641--- a/src/sp-gradient-vector.h
1642+++ b/src/sp-gradient-vector.h
1643@@ -1,7 +1,7 @@
1644 #ifndef SEEN_SP_GRADIENT_VECTOR_H
1645 #define SEEN_SP_GRADIENT_VECTOR_H
1646
1647-#include <glib/gtypes.h>
1648+#include <glib.h>
1649 #include <vector>
1650 #include "color.h"
1651
1652diff --git a/src/sp-image.cpp b/src/sp-image.cpp
1653index 322e2d1..0c7f9ba 100644
1654--- a/src/sp-image.cpp
1655+++ b/src/sp-image.cpp
1656@@ -30,6 +30,7 @@
1657 //#include <gdk-pixbuf/gdk-pixbuf-io.h>
1658 #include "display/nr-arena-image.h"
1659 #include <display/curve.h>
1660+#include <glib.h>
1661 #include <glib/gstdio.h>
1662
1663 //Added for preserveAspectRatio support -- EAF
1664diff --git a/src/sp-linear-gradient-fns.h b/src/sp-linear-gradient-fns.h
1665index 0962bae..636cc1c 100644
1666--- a/src/sp-linear-gradient-fns.h
1667+++ b/src/sp-linear-gradient-fns.h
1668@@ -6,7 +6,7 @@
1669 */
1670
1671 #include <glib-object.h>
1672-#include <glib/gtypes.h>
1673+#include <glib.h>
1674
1675 namespace Inkscape {
1676 namespace XML {
1677diff --git a/src/sp-metrics.h b/src/sp-metrics.h
1678index 23c1b6c..c2f9687 100644
1679--- a/src/sp-metrics.h
1680+++ b/src/sp-metrics.h
1681@@ -1,8 +1,7 @@
1682 #ifndef SP_METRICS_H
1683 #define SP_METRICS_H
1684
1685-#include <glib/gstring.h>
1686-#include <glib/gtypes.h>
1687+#include <glib.h>
1688 #include "sp-metric.h"
1689
1690 gdouble sp_absolute_metric_to_metric (gdouble length_src, const SPMetric metric_src, const SPMetric metric_dst);
1691diff --git a/src/sp-radial-gradient.h b/src/sp-radial-gradient.h
1692index bec6cbe..528b527 100644
1693--- a/src/sp-radial-gradient.h
1694+++ b/src/sp-radial-gradient.h
1695@@ -5,7 +5,7 @@
1696 * SPRadialGradient: SVG <radialgradient> implementtion.
1697 */
1698
1699-#include <glib/gtypes.h>
1700+#include <glib.h>
1701 #include "sp-gradient.h"
1702 #include "svg/svg-length.h"
1703 #include "sp-radial-gradient-fns.h"
1704diff --git a/src/sp-stop.h b/src/sp-stop.h
1705index 2cf8ad6..96922eb 100644
1706--- a/src/sp-stop.h
1707+++ b/src/sp-stop.h
1708@@ -8,7 +8,7 @@
1709 * Authors?
1710 */
1711
1712-#include <glib/gtypes.h>
1713+#include <glib.h>
1714 #include <glibmm/ustring.h>
1715 #include "sp-object.h"
1716 #include "color.h"
1717diff --git a/src/sp-text.h b/src/sp-text.h
1718index b90fe37..5db61ff 100644
1719--- a/src/sp-text.h
1720+++ b/src/sp-text.h
1721@@ -13,7 +13,7 @@
1722 * Released under GNU GPL, read the file 'COPYING' for more information
1723 */
1724
1725-#include <glib/gtypes.h>
1726+#include <glib.h>
1727 #include <stddef.h>
1728 #include <sigc++/sigc++.h>
1729 #include "sp-item.h"
1730diff --git a/src/sp-textpath.h b/src/sp-textpath.h
1731index 1931966..18b42ec 100644
1732--- a/src/sp-textpath.h
1733+++ b/src/sp-textpath.h
1734@@ -1,7 +1,7 @@
1735 #ifndef INKSCAPE_SP_TEXTPATH_H
1736 #define INKSCAPE_SP_TEXTPATH_H
1737
1738-#include <glib/gtypes.h>
1739+#include <glib.h>
1740 #include "svg/svg-length.h"
1741 #include "sp-item.h"
1742 #include "sp-text.h"
1743diff --git a/src/sp-tspan.h b/src/sp-tspan.h
1744index def8051..6c40d86 100644
1745--- a/src/sp-tspan.h
1746+++ b/src/sp-tspan.h
1747@@ -5,7 +5,7 @@
1748 * tspan and textpath, based on the flowtext routines
1749 */
1750
1751-#include <glib/gtypes.h>
1752+#include <glib.h>
1753 #include "sp-item.h"
1754 #include "text-tag-attributes.h"
1755
1756diff --git a/src/splivarot.cpp b/src/splivarot.cpp
1757index 128fa23..89360d8 100644
1758--- a/src/splivarot.cpp
1759+++ b/src/splivarot.cpp
1760@@ -20,7 +20,7 @@
1761 #include <cstring>
1762 #include <string>
1763 #include <vector>
1764-#include <glib/gmem.h>
1765+#include <glib.h>
1766 #include "xml/repr.h"
1767 #include "svg/svg.h"
1768 #include "sp-path.h"
1769diff --git a/src/spray-context.cpp b/src/spray-context.cpp
1770index 2bdac19..7d57168 100644
1771--- a/src/spray-context.cpp
1772+++ b/src/spray-context.cpp
1773@@ -29,7 +29,7 @@
1774 #include "svg/svg.h"
1775 #include "display/canvas-bpath.h"
1776
1777-#include <glib/gmem.h>
1778+#include <glib.h>
1779 #include "macros.h"
1780 #include "document.h"
1781 #include "selection.h"
1782diff --git a/src/svg/css-ostringstream.cpp b/src/svg/css-ostringstream.cpp
1783index a6eb278..865f6ae 100644
1784--- a/src/svg/css-ostringstream.cpp
1785+++ b/src/svg/css-ostringstream.cpp
1786@@ -1,8 +1,7 @@
1787 #include "svg/css-ostringstream.h"
1788 #include "svg/strip-trailing-zeros.h"
1789 #include "preferences.h"
1790-#include <glib/gmessages.h>
1791-#include <glib/gstrfuncs.h>
1792+#include <glib.h>
1793
1794 Inkscape::CSSOStringStream::CSSOStringStream()
1795 {
1796diff --git a/src/svg/css-ostringstream.h b/src/svg/css-ostringstream.h
1797index 48ecf29..93bf32d 100644
1798--- a/src/svg/css-ostringstream.h
1799+++ b/src/svg/css-ostringstream.h
1800@@ -1,7 +1,7 @@
1801 #ifndef SVG_CSS_OSTRINGSTREAM_H_INKSCAPE
1802 #define SVG_CSS_OSTRINGSTREAM_H_INKSCAPE
1803
1804-#include <glib/gtypes.h>
1805+#include <glib.h>
1806 #include <sstream>
1807
1808 namespace Inkscape {
1809diff --git a/src/svg/stringstream.h b/src/svg/stringstream.h
1810index 60ed74e..4623cbc 100644
1811--- a/src/svg/stringstream.h
1812+++ b/src/svg/stringstream.h
1813@@ -1,7 +1,7 @@
1814 #ifndef INKSCAPE_STRINGSTREAM_H
1815 #define INKSCAPE_STRINGSTREAM_H
1816
1817-#include <glib/gtypes.h>
1818+#include <glib.h>
1819 #include <sstream>
1820 #include <string>
1821
1822diff --git a/src/svg/strip-trailing-zeros.cpp b/src/svg/strip-trailing-zeros.cpp
1823index 769834d..daad8b9 100644
1824--- a/src/svg/strip-trailing-zeros.cpp
1825+++ b/src/svg/strip-trailing-zeros.cpp
1826@@ -1,7 +1,7 @@
1827
1828 #include <cstring>
1829 #include <string>
1830-#include <glib/gmessages.h>
1831+#include <glib.h>
1832
1833 #include "svg/strip-trailing-zeros.h"
1834
1835diff --git a/src/svg/svg-affine.cpp b/src/svg/svg-affine.cpp
1836index 91a9fa7..658991a 100644
1837--- a/src/svg/svg-affine.cpp
1838+++ b/src/svg/svg-affine.cpp
1839@@ -19,7 +19,7 @@
1840 #include <string>
1841 #include <cstdlib>
1842 #include <cstdio>
1843-#include <glib/gstrfuncs.h>
1844+#include <glib.h>
1845 #include <libnr/nr-matrix-fns.h>
1846 #include <libnr/nr-matrix-ops.h>
1847 #include <2geom/transforms.h>
1848diff --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp
1849index 04f3877..4d727c3 100644
1850--- a/src/svg/svg-color.cpp
1851+++ b/src/svg/svg-color.cpp
1852@@ -23,12 +23,7 @@
1853 #include <string>
1854 #include <cassert>
1855 #include <math.h>
1856-#include <glib/gmem.h>
1857-#include <glib.h> // g_assert
1858-#include <glib/gmessages.h>
1859-#include <glib/gstrfuncs.h>
1860-#include <glib/ghash.h>
1861-#include <glib/gutils.h>
1862+#include <glib.h>
1863 #include <errno.h>
1864
1865 #include "strneq.h"
1866diff --git a/src/svg/svg-color.h b/src/svg/svg-color.h
1867index a3868c1..d1c7bee 100644
1868--- a/src/svg/svg-color.h
1869+++ b/src/svg/svg-color.h
1870@@ -1,7 +1,7 @@
1871 #ifndef SVG_SVG_COLOR_H_SEEN
1872 #define SVG_SVG_COLOR_H_SEEN
1873
1874-#include <glib/gtypes.h>
1875+#include <glib.h>
1876
1877 class SVGICCColor;
1878
1879diff --git a/src/svg/svg-length.cpp b/src/svg/svg-length.cpp
1880index 94f1cf3..ae5f758 100644
1881--- a/src/svg/svg-length.cpp
1882+++ b/src/svg/svg-length.cpp
1883@@ -19,7 +19,7 @@
1884 #include <cstring>
1885 #include <string>
1886 #include <math.h>
1887-#include <glib/gstrfuncs.h>
1888+#include <glib.h>
1889
1890 #include "svg.h"
1891 #include "stringstream.h"
1892diff --git a/src/svg/svg-length.h b/src/svg/svg-length.h
1893index 1f4be81..f5631b1 100644
1894--- a/src/svg/svg-length.h
1895+++ b/src/svg/svg-length.h
1896@@ -16,7 +16,7 @@
1897 * Released under GNU GPL, read the file 'COPYING' for more information
1898 */
1899
1900-#include <glib/gtypes.h>
1901+#include <glib.h>
1902
1903 class SVGLength
1904 {
1905diff --git a/src/svg/svg-path-geom-test.h b/src/svg/svg-path-geom-test.h
1906index 1a084d5..a1bd4d7 100644
1907--- a/src/svg/svg-path-geom-test.h
1908+++ b/src/svg/svg-path-geom-test.h
1909@@ -8,7 +8,7 @@
1910 #include <stdio.h>
1911 #include <string>
1912 #include <vector>
1913-#include <glib/gmem.h>
1914+#include <glib.h>
1915
1916 class SvgPathGeomTest : public CxxTest::TestSuite
1917 {
1918diff --git a/src/svg/svg-path.cpp b/src/svg/svg-path.cpp
1919index bbf1589..b58ec40 100644
1920--- a/src/svg/svg-path.cpp
1921+++ b/src/svg/svg-path.cpp
1922@@ -31,10 +31,7 @@
1923 #include <cstring>
1924 #include <string>
1925 #include <cassert>
1926-#include <glib/gmem.h>
1927-#include <glib/gmessages.h>
1928-#include <glib/gstrfuncs.h>
1929-#include <glib.h> // g_assert()
1930+#include <glib.h>
1931
1932 #include "svg/svg.h"
1933 #include "svg/path-string.h"
1934diff --git a/src/svg/svg.h b/src/svg/svg.h
1935index 0b2c3ae..7ff8ecc 100644
1936--- a/src/svg/svg.h
1937+++ b/src/svg/svg.h
1938@@ -11,7 +11,7 @@
1939 *
1940 * Released under GNU GPL, read the file 'COPYING' for more information
1941 */
1942-#include <glib/gtypes.h>
1943+#include <glib.h>
1944 #include <vector>
1945 #include <cstring>
1946 #include <string>
1947diff --git a/src/text-editing.h b/src/text-editing.h
1948index 038458f..9777c67 100644
1949--- a/src/text-editing.h
1950+++ b/src/text-editing.h
1951@@ -13,7 +13,7 @@
1952 * Released under GNU GPL, read the file 'COPYING' for more information
1953 */
1954
1955-#include <glib/gtypes.h>
1956+#include <glib.h>
1957 #include <utility> // std::pair
1958 #include "libnrtype/Layout-TNG.h"
1959 #include <libnr/nr-forward.h>
1960diff --git a/src/text-tag-attributes.h b/src/text-tag-attributes.h
1961index 197bfb7..1c73869 100644
1962--- a/src/text-tag-attributes.h
1963+++ b/src/text-tag-attributes.h
1964@@ -2,7 +2,7 @@
1965 #define INKSCAPE_TEXT_TAG_ATTRIBUTES_H
1966
1967 #include <vector>
1968-#include <glib/gtypes.h>
1969+#include <glib.h>
1970 #include "libnrtype/Layout-TNG.h"
1971 #include "svg/svg-length.h"
1972
1973diff --git a/src/trace/potrace/potracelib.cpp b/src/trace/potrace/potracelib.cpp
1974index 136f7a9..9505aa0 100644
1975--- a/src/trace/potrace/potracelib.cpp
1976+++ b/src/trace/potrace/potracelib.cpp
1977@@ -4,7 +4,7 @@
1978
1979 #include <stdlib.h>
1980 #include <string.h>
1981-#include <glib/gstrfuncs.h>
1982+#include <glib.h>
1983
1984 #include "potracelib.h"
1985 #include "inkscape-version.h"
1986diff --git a/src/tweak-context.cpp b/src/tweak-context.cpp
1987index 904d0cb..ce6a515 100644
1988--- a/src/tweak-context.cpp
1989+++ b/src/tweak-context.cpp
1990@@ -22,7 +22,7 @@
1991 #include "svg/svg.h"
1992 #include "display/canvas-bpath.h"
1993
1994-#include <glib/gmem.h>
1995+#include <glib.h>
1996 #include "macros.h"
1997 #include "document.h"
1998 #include "selection.h"
1999diff --git a/src/ui/cache/svg_preview_cache.cpp b/src/ui/cache/svg_preview_cache.cpp
2000index 6e05f6c..c13d41f 100644
2001--- a/src/ui/cache/svg_preview_cache.cpp
2002+++ b/src/ui/cache/svg_preview_cache.cpp
2003@@ -19,7 +19,7 @@
2004 # include "config.h"
2005 #endif
2006
2007-#include <glib/gmem.h>
2008+#include <glib.h>
2009 #include <gtk/gtk.h>
2010 #include "sp-namedview.h"
2011 #include "selection.h"
2012diff --git a/src/ui/dialog/desktop-tracker.h b/src/ui/dialog/desktop-tracker.h
2013index b5b83b5..dc492d2 100644
2014--- a/src/ui/dialog/desktop-tracker.h
2015+++ b/src/ui/dialog/desktop-tracker.h
2016@@ -13,7 +13,7 @@
2017
2018 #include <stddef.h>
2019 #include <sigc++/connection.h>
2020-#include <glib/gtypes.h>
2021+#include <glib.h>
2022
2023 typedef struct _GtkWidget GtkWidget;
2024 class SPDesktop;
2025diff --git a/src/ui/dialog/dialog-manager.h b/src/ui/dialog/dialog-manager.h
2026index a97b58c..f088b16 100644
2027--- a/src/ui/dialog/dialog-manager.h
2028+++ b/src/ui/dialog/dialog-manager.h
2029@@ -14,7 +14,7 @@
2030 #ifndef INKSCAPE_UI_DIALOG_MANAGER_H
2031 #define INKSCAPE_UI_DIALOG_MANAGER_H
2032
2033-#include <glib/gquark.h>
2034+#include <glib.h>
2035 #include "dialog.h"
2036 #include <map>
2037
2038diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
2039index cbd2769..306e990 100644
2040--- a/src/ui/dialog/icon-preview.cpp
2041+++ b/src/ui/dialog/icon-preview.cpp
2042@@ -16,7 +16,7 @@
2043 #endif
2044
2045 #include <gtk/gtk.h>
2046-#include <glib/gmem.h>
2047+#include <glib.h>
2048 #include <glibmm/i18n.h>
2049 #include <gtkmm/alignment.h>
2050 #include <gtkmm/buttonbox.h>
2051diff --git a/src/ui/dialog/input.cpp b/src/ui/dialog/input.cpp
2052index 8c98515..1cd8eac 100644
2053--- a/src/ui/dialog/input.cpp
2054+++ b/src/ui/dialog/input.cpp
2055@@ -11,7 +11,7 @@
2056 #include <map>
2057 #include <set>
2058 #include <list>
2059-#include <glib/gprintf.h>
2060+#include <glib.h>
2061 #include <glibmm/i18n.h>
2062 #include <gtkmm/alignment.h>
2063 #include <gtkmm/cellrenderercombo.h>
2064diff --git a/src/ui/widget/icon-widget.cpp b/src/ui/widget/icon-widget.cpp
2065index 64415f4..210b3dc 100644
2066--- a/src/ui/widget/icon-widget.cpp
2067+++ b/src/ui/widget/icon-widget.cpp
2068@@ -14,7 +14,7 @@
2069 # include <config.h>
2070 #endif
2071
2072-#include <glib/gmem.h>
2073+#include <glib.h>
2074 #include "icon-widget.h"
2075
2076 namespace Inkscape {
2077diff --git a/src/ui/widget/spin-slider.cpp b/src/ui/widget/spin-slider.cpp
2078index e3e73a5..69bfb6d 100644
2079--- a/src/ui/widget/spin-slider.cpp
2080+++ b/src/ui/widget/spin-slider.cpp
2081@@ -10,7 +10,7 @@
2082 * Released under GNU GPL. Read the file 'COPYING' for more information.
2083 */
2084
2085-#include "glib/gstrfuncs.h"
2086+#include <glib.h>
2087 #include "glibmm/i18n.h"
2088
2089 #include "spin-slider.h"
2090diff --git a/src/unclump.h b/src/unclump.h
2091index c5a8bf7..82dd272 100644
2092--- a/src/unclump.h
2093+++ b/src/unclump.h
2094@@ -11,7 +11,7 @@
2095 #ifndef SEEN_DIALOGS_UNCLUMP_H
2096 #define SEEN_DIALOGS_UNCLUMP_H
2097
2098-#include <glib/gslist.h>
2099+#include <glib.h>
2100
2101 void unclump(GSList *items);
2102
2103diff --git a/src/uri.h b/src/uri.h
2104index 1c890a6..38a4707 100644
2105--- a/src/uri.h
2106+++ b/src/uri.h
2107@@ -14,7 +14,7 @@
2108 #ifndef INKSCAPE_URI_H
2109 #define INKSCAPE_URI_H
2110
2111-#include <glib/gtypes.h>
2112+#include <glib.h>
2113 #include <exception>
2114 #include <libxml/uri.h>
2115 #include "bad-uri-exception.h"
2116diff --git a/src/util/glib-list-iterators.h b/src/util/glib-list-iterators.h
2117index 586bc31..9e73fa6 100644
2118--- a/src/util/glib-list-iterators.h
2119+++ b/src/util/glib-list-iterators.h
2120@@ -17,8 +17,7 @@
2121
2122 #include <cstddef>
2123 #include <iterator>
2124-#include "glib/gslist.h"
2125-#include "glib/glist.h"
2126+#include <glib.h>
2127
2128 namespace Inkscape {
2129
2130diff --git a/src/util/share.cpp b/src/util/share.cpp
2131index 2f693fa..f74de23 100644
2132--- a/src/util/share.cpp
2133+++ b/src/util/share.cpp
2134@@ -10,7 +10,7 @@
2135 */
2136
2137 #include "util/share.h"
2138-#include <glib/gmessages.h>
2139+#include <glib.h>
2140
2141 namespace Inkscape {
2142 namespace Util {
2143diff --git a/src/version.cpp b/src/version.cpp
2144index edaa600..ef7fbe2 100644
2145--- a/src/version.cpp
2146+++ b/src/version.cpp
2147@@ -12,7 +12,7 @@
2148 */
2149
2150 #include <stdio.h>
2151-#include <glib/gstrfuncs.h>
2152+#include <glib.h>
2153 #include "version.h"
2154
2155 gboolean sp_version_from_string(const gchar *string, Inkscape::Version *version)
2156diff --git a/src/version.h b/src/version.h
2157index c620631..0a0381c 100644
2158--- a/src/version.h
2159+++ b/src/version.h
2160@@ -10,7 +10,7 @@
2161 #ifndef SEEN_INKSCAPE_VERSION_H
2162 #define SEEN_INKSCAPE_VERSION_H
2163
2164-#include <glib/gtypes.h>
2165+#include <glib.h>
2166
2167 #define SVG_VERSION "1.1"
2168
2169diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp
2170index 851abe9..2a814fe 100644
2171--- a/src/widgets/icon.cpp
2172+++ b/src/widgets/icon.cpp
2173@@ -16,7 +16,7 @@
2174 #endif
2175
2176 #include <cstring>
2177-#include <glib/gmem.h>
2178+#include <glib.h>
2179 #include <gtk/gtk.h>
2180 #include <gtkmm.h>
2181
2182diff --git a/src/widgets/sp-color-icc-selector.h b/src/widgets/sp-color-icc-selector.h
2183index f76b258..f6e7cca 100644
2184--- a/src/widgets/sp-color-icc-selector.h
2185+++ b/src/widgets/sp-color-icc-selector.h
2186@@ -1,7 +1,7 @@
2187 #ifndef SEEN_SP_COLOR_ICC_SELECTOR_H
2188 #define SEEN_SP_COLOR_ICC_SELECTOR_H
2189
2190-#include <glib/gtypes.h>
2191+#include <glib.h>
2192 #include <gtk/gtk.h>
2193
2194 #include "../color.h"
2195diff --git a/src/widgets/sp-color-scales.h b/src/widgets/sp-color-scales.h
2196index b50c386..38219b5 100644
2197--- a/src/widgets/sp-color-scales.h
2198+++ b/src/widgets/sp-color-scales.h
2199@@ -1,7 +1,7 @@
2200 #ifndef SEEN_SP_COLOR_SCALES_H
2201 #define SEEN_SP_COLOR_SCALES_H
2202
2203-#include <glib/gtypes.h>
2204+#include <glib.h>
2205 #include <gtk/gtk.h>
2206
2207 #include <color.h>
2208diff --git a/src/widgets/sp-color-wheel-selector.h b/src/widgets/sp-color-wheel-selector.h
2209index 56bc8af..4124b1f 100644
2210--- a/src/widgets/sp-color-wheel-selector.h
2211+++ b/src/widgets/sp-color-wheel-selector.h
2212@@ -1,7 +1,7 @@
2213 #ifndef SEEN_SP_COLOR_WHEEL_SELECTOR_H
2214 #define SEEN_SP_COLOR_WHEEL_SELECTOR_H
2215
2216-#include <glib/gtypes.h>
2217+#include <glib.h>
2218 #include <gtk/gtk.h>
2219
2220 #include "../color.h"
2221diff --git a/src/widgets/spinbutton-events.h b/src/widgets/spinbutton-events.h
2222index a9ff741..5092861 100644
2223--- a/src/widgets/spinbutton-events.h
2224+++ b/src/widgets/spinbutton-events.h
2225@@ -9,7 +9,7 @@
2226 * Released under GNU GPL, read the file 'COPYING' for more information
2227 */
2228
2229-#include <glib/gtypes.h>
2230+#include <glib.h>
2231 #include <gtk/gtk.h> /* GtkWidget */
2232
2233 gboolean spinbutton_focus_in (GtkWidget *w, GdkEventKey *event, gpointer data);
2234diff --git a/src/widgets/spw-utilities.h b/src/widgets/spw-utilities.h
2235index 78f7937..f0ec2f4 100644
2236--- a/src/widgets/spw-utilities.h
2237+++ b/src/widgets/spw-utilities.h
2238@@ -18,7 +18,7 @@
2239 SPObject, that reacts to modification.
2240 */
2241
2242-#include <glib/gtypes.h>
2243+#include <glib.h>
2244
2245 typedef struct _GtkWidget GtkWidget;
2246
2247diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
2248index f020b0c..907952f 100644
2249--- a/src/widgets/stroke-style.cpp
2250+++ b/src/widgets/stroke-style.cpp
2251@@ -18,7 +18,7 @@
2252
2253 #define noSP_SS_VERBOSE
2254
2255-#include <glib/gmem.h>
2256+#include <glib.h>
2257 #include <gtk/gtk.h>
2258 #include <glibmm/i18n.h>
2259
2260diff --git a/src/xml/attribute-record.h b/src/xml/attribute-record.h
2261index bab0b5a..a61329b 100644
2262--- a/src/xml/attribute-record.h
2263+++ b/src/xml/attribute-record.h
2264@@ -5,8 +5,7 @@
2265 #ifndef SEEN_XML_SP_REPR_ATTR_H
2266 #define SEEN_XML_SP_REPR_ATTR_H
2267
2268-#include <glib/gquark.h>
2269-#include <glib/gtypes.h>
2270+#include <glib.h>
2271 #include "gc-managed.h"
2272 #include "util/share.h"
2273
2274diff --git a/src/xml/comment-node.h b/src/xml/comment-node.h
2275index 698a30a..ec94691 100644
2276--- a/src/xml/comment-node.h
2277+++ b/src/xml/comment-node.h
2278@@ -15,7 +15,7 @@
2279 #ifndef SEEN_INKSCAPE_XML_COMMENT_NODE_H
2280 #define SEEN_INKSCAPE_XML_COMMENT_NODE_H
2281
2282-#include <glib/gquark.h>
2283+#include <glib.h>
2284 #include "xml/simple-node.h"
2285
2286 namespace Inkscape {
2287diff --git a/src/xml/croco-node-iface.cpp b/src/xml/croco-node-iface.cpp
2288index db98e3d..e67eeac 100644
2289--- a/src/xml/croco-node-iface.cpp
2290+++ b/src/xml/croco-node-iface.cpp
2291@@ -1,7 +1,7 @@
2292
2293 #include <cstring>
2294 #include <string>
2295-#include <glib/gstrfuncs.h>
2296+#include <glib.h>
2297
2298 #include "xml/croco-node-iface.h"
2299 #include "xml/node.h"
2300diff --git a/src/xml/event.h b/src/xml/event.h
2301index c622577..acd2bfc 100644
2302--- a/src/xml/event.h
2303+++ b/src/xml/event.h
2304@@ -18,8 +18,7 @@
2305 #ifndef SEEN_INKSCAPE_XML_SP_REPR_ACTION_H
2306 #define SEEN_INKSCAPE_XML_SP_REPR_ACTION_H
2307
2308-#include <glib/gtypes.h>
2309-#include <glib/gquark.h>
2310+#include <glib.h>
2311 #include <glibmm/ustring.h>
2312
2313 #include <iterator>
2314diff --git a/src/xml/node-event-vector.h b/src/xml/node-event-vector.h
2315index 0c291c2..e639687 100644
2316--- a/src/xml/node-event-vector.h
2317+++ b/src/xml/node-event-vector.h
2318@@ -14,7 +14,7 @@
2319 #ifndef SEEN_INKSCAPE_XML_SP_REPR_EVENT_VECTOR
2320 #define SEEN_INKSCAPE_XML_SP_REPR_EVENT_VECTOR
2321
2322-#include <glib/gtypes.h>
2323+#include <glib.h>
2324
2325 #include "xml/node.h"
2326
2327diff --git a/src/xml/node-observer.h b/src/xml/node-observer.h
2328index ca787c2..44f11e5 100644
2329--- a/src/xml/node-observer.h
2330+++ b/src/xml/node-observer.h
2331@@ -18,7 +18,7 @@
2332 #ifndef SEEN_INKSCAPE_XML_NODE_OBSERVER_H
2333 #define SEEN_INKSCAPE_XML_NODE_OBSERVER_H
2334
2335-#include <glib/gquark.h>
2336+#include <glib.h>
2337 #include "util/share.h"
2338 #include "xml/xml-forward.h"
2339
2340diff --git a/src/xml/node.h b/src/xml/node.h
2341index abcccdb..ad3f3de 100644
2342--- a/src/xml/node.h
2343+++ b/src/xml/node.h
2344@@ -18,7 +18,7 @@
2345 #ifndef SEEN_INKSCAPE_XML_NODE_H
2346 #define SEEN_INKSCAPE_XML_NODE_H
2347
2348-#include <glib/gtypes.h>
2349+#include <glib.h>
2350 #include "gc-anchored.h"
2351 #include "util/list.h"
2352 #include "xml/xml-forward.h"
2353diff --git a/src/xml/pi-node.h b/src/xml/pi-node.h
2354index 4aa1f84..548216a 100644
2355--- a/src/xml/pi-node.h
2356+++ b/src/xml/pi-node.h
2357@@ -14,7 +14,7 @@
2358 #ifndef SEEN_INKSCAPE_XML_PI_NODE_H
2359 #define SEEN_INKSCAPE_XML_PI_NODE_H
2360
2361-#include <glib/gquark.h>
2362+#include <glib.h>
2363 #include "xml/simple-node.h"
2364
2365 namespace Inkscape {
2366diff --git a/src/xml/quote.cpp b/src/xml/quote.cpp
2367index 37f00ba..166cf26 100644
2368--- a/src/xml/quote.cpp
2369+++ b/src/xml/quote.cpp
2370@@ -12,7 +12,7 @@
2371 */
2372
2373 #include <cstring>
2374-#include <glib/gmem.h>
2375+#include <glib.h>
2376
2377
2378 /** \return strlen(xml_quote_strdup(\a val)) (without doing the malloc).
2379diff --git a/src/xml/rebase-hrefs.cpp b/src/xml/rebase-hrefs.cpp
2380index c387672..c27e9dd 100644
2381--- a/src/xml/rebase-hrefs.cpp
2382+++ b/src/xml/rebase-hrefs.cpp
2383@@ -7,9 +7,7 @@
2384 #include "util/share.h"
2385 #include "xml/attribute-record.h"
2386 #include "xml/node.h"
2387-#include <glib/gmem.h>
2388-#include <glib/gurifuncs.h>
2389-#include <glib/gutils.h>
2390+#include <glib.h>
2391 using Inkscape::XML::AttributeRecord;
2392
2393
2394diff --git a/src/xml/rebase-hrefs.h b/src/xml/rebase-hrefs.h
2395index b4f288c..ae29a75 100644
2396--- a/src/xml/rebase-hrefs.h
2397+++ b/src/xml/rebase-hrefs.h
2398@@ -1,7 +1,7 @@
2399 #ifndef REBASE_HREFS_H_SEEN
2400 #define REBASE_HREFS_H_SEEN
2401
2402-#include <glib/gtypes.h>
2403+#include <glib.h>
2404 #include "util/list.h"
2405 #include "xml/attribute-record.h"
2406 struct SPDocument;
2407diff --git a/src/xml/repr.h b/src/xml/repr.h
2408index 549822e..b6482e6 100644
2409--- a/src/xml/repr.h
2410+++ b/src/xml/repr.h
2411@@ -14,7 +14,7 @@
2412 #define __SP_REPR_H__
2413
2414 #include <stdio.h>
2415-#include <glib/gtypes.h>
2416+#include <glib.h>
2417 #include "gc-anchored.h"
2418
2419 #include "xml/node.h"
2420diff --git a/src/xml/simple-node.cpp b/src/xml/simple-node.cpp
2421index 7ecdc1b..0c781e2 100644
2422--- a/src/xml/simple-node.cpp
2423+++ b/src/xml/simple-node.cpp
2424@@ -16,7 +16,7 @@
2425
2426 #include <cstring>
2427 #include <string>
2428-#include <glib/gstrfuncs.h>
2429+#include <glib.h>
2430
2431 #include "xml/node.h"
2432 #include "xml/simple-node.h"
2433diff --git a/src/xml/text-node.h b/src/xml/text-node.h
2434index ef6e477..5948bc1 100644
2435--- a/src/xml/text-node.h
2436+++ b/src/xml/text-node.h
2437@@ -15,7 +15,7 @@
2438 #ifndef SEEN_INKSCAPE_XML_TEXT_NODE_H
2439 #define SEEN_INKSCAPE_XML_TEXT_NODE_H
2440
2441-#include <glib/gquark.h>
2442+#include <glib.h>
2443 #include "xml/simple-node.h"
2444
2445 namespace Inkscape {
Scalable vector graphics editor
This page took 0.422005 seconds and 4 git commands to generate.