1 Adjust for new glib.h include rules.
3 diff --git a/src/application/application.h b/src/application/application.h
4 index fce6bd4..749790a 100644
5 --- a/src/application/application.h
6 +++ b/src/application/application.h
8 #ifndef INKSCAPE_APPLICATION_APPLICATION_H
9 #define INKSCAPE_APPLICATION_APPLICATION_H
11 -#include <glib/gtypes.h>
16 diff --git a/src/application/editor.h b/src/application/editor.h
17 index 4545022..6a11ec9 100644
18 --- a/src/application/editor.h
19 +++ b/src/application/editor.h
21 #define INKSCAPE_APPLICATION_EDITOR_H
23 #include <sigc++/sigc++.h>
24 -#include <glib/gslist.h>
26 #include <glibmm/ustring.h>
28 #include "app-prototype.h"
29 diff --git a/src/attributes-test.h b/src/attributes-test.h
30 index 6677294..2621f93 100644
31 --- a/src/attributes-test.h
32 +++ b/src/attributes-test.h
37 -#include <glib/gprintf.h>
38 #include "attributes.h"
41 diff --git a/src/attributes.cpp b/src/attributes.cpp
42 index 5d3a008..97b23c6 100644
43 --- a/src/attributes.cpp
44 +++ b/src/attributes.cpp
49 -#include <glib.h> // g_assert()
50 -#include <glib/ghash.h>
52 #include "attributes.h"
55 diff --git a/src/attributes.h b/src/attributes.h
56 index 82ac962..4cd3459 100644
57 --- a/src/attributes.h
58 +++ b/src/attributes.h
61 * Released under GNU GPL, read the file 'COPYING' for more information
63 -#include <glib/gtypes.h>
64 -#include <glib/gmessages.h>
67 unsigned int sp_attribute_lookup(gchar const *key);
68 unsigned char const *sp_attribute_name(unsigned int id);
69 diff --git a/src/bind/javabind.cpp b/src/bind/javabind.cpp
70 index 6dc8c9a..36d55f6 100644
71 --- a/src/bind/javabind.cpp
72 +++ b/src/bind/javabind.cpp
74 #include "javabind-private.h"
75 #include <path-prefix.h>
77 -#include <glib/gmessages.h>
80 //For repr and document
82 diff --git a/src/color-profile-fns.h b/src/color-profile-fns.h
83 index c8c51b5..41d8fc6 100644
84 --- a/src/color-profile-fns.h
85 +++ b/src/color-profile-fns.h
89 #include <glib-object.h>
90 -#include <glib/gtypes.h>
94 #include <glibmm/ustring.h>
95 diff --git a/src/color-profile.h b/src/color-profile.h
96 index fa8f353..029b232 100644
97 --- a/src/color-profile.h
98 +++ b/src/color-profile.h
100 * SPColorProfile: SVG <color-profile> implementation
103 -#include <glib/gtypes.h>
105 #include <sp-object.h>
106 #include <glibmm/ustring.h>
108 diff --git a/src/color-rgba.h b/src/color-rgba.h
109 index fc52b19..39b2975 100644
110 --- a/src/color-rgba.h
111 +++ b/src/color-rgba.h
113 #ifndef SEEN_COLOR_RGBA_H
114 #define SEEN_COLOR_RGBA_H
116 -#include <glib.h> // g_assert()
117 -#include <glib/gmessages.h>
119 #include "libnr/nr-pixops.h"
120 #include "decimal-round.h"
122 diff --git a/src/conn-avoid-ref.h b/src/conn-avoid-ref.h
123 index 653b1d7..f276634 100644
124 --- a/src/conn-avoid-ref.h
125 +++ b/src/conn-avoid-ref.h
127 * Released under GNU GPL, read the file 'COPYING' for more information
130 -#include <glib/gslist.h>
133 #include <sigc++/connection.h>
135 diff --git a/src/debug/logger.cpp b/src/debug/logger.cpp
136 index f28d275..27c6d19 100644
137 --- a/src/debug/logger.cpp
138 +++ b/src/debug/logger.cpp
143 -#include <glib/gmessages.h>
145 #include "inkscape-version.h"
146 #include "debug/logger.h"
147 #include "debug/simple-event.h"
148 diff --git a/src/debug/simple-event.h b/src/debug/simple-event.h
149 index 74301a6..ea28cf5 100644
150 --- a/src/debug/simple-event.h
151 +++ b/src/debug/simple-event.h
156 -#include <glib.h> // g_assert()
157 -#include <glib/gstrfuncs.h>
158 -#include <glib/gmessages.h>
161 #include "gc-alloc.h"
162 #include "debug/event.h"
163 diff --git a/src/debug/timestamp.cpp b/src/debug/timestamp.cpp
164 index 8814f37..26a9ce0 100644
165 --- a/src/debug/timestamp.cpp
166 +++ b/src/debug/timestamp.cpp
171 -#include <glib/gtypes.h>
172 -#include <glib/gmain.h>
174 #include <glibmm/ustring.h>
175 #include "debug/simple-event.h"
177 diff --git a/src/desktop-style.h b/src/desktop-style.h
178 index e1ca5b3..95b3bf9 100644
179 --- a/src/desktop-style.h
180 +++ b/src/desktop-style.h
182 * Released under GNU GPL, read the file 'COPYING' for more information
185 -#include <glib/gtypes.h>
190 diff --git a/src/dialogs/clonetiler.cpp b/src/dialogs/clonetiler.cpp
191 index 55884fe..b846f48 100644
192 --- a/src/dialogs/clonetiler.cpp
193 +++ b/src/dialogs/clonetiler.cpp
198 -#include <glib/gmem.h>
201 #include <glibmm/i18n.h>
203 diff --git a/src/dir-util.cpp b/src/dir-util.cpp
204 index 67db036..8fe1315 100644
205 --- a/src/dir-util.cpp
206 +++ b/src/dir-util.cpp
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>
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.
220 diff --git a/src/dir-util.h b/src/dir-util.h
221 index 9bdfafa..6b16fcc 100644
228 -#include <glib/gtypes.h>
231 char const *sp_relative_path_from_path(char const *path, char const *base);
232 char const *sp_extension_from_path(char const *path);
233 diff --git a/src/display/canvas-bpath.h b/src/display/canvas-bpath.h
234 index b97bbcc..6db6fa3 100644
235 --- a/src/display/canvas-bpath.h
236 +++ b/src/display/canvas-bpath.h
241 -#include <glib/gtypes.h>
244 #include <display/sp-canvas.h>
246 diff --git a/src/display/curve.cpp b/src/display/curve.cpp
247 index 73b8dc3..b17ef51 100644
248 --- a/src/display/curve.cpp
249 +++ b/src/display/curve.cpp
252 #include "display/curve.h"
254 -#include <glib/gmessages.h>
256 #include <2geom/pathvector.h>
257 #include <2geom/sbasis-geometric.h>
258 #include <2geom/sbasis-to-bezier.h>
259 diff --git a/src/display/curve.h b/src/display/curve.h
260 index fe07201..64731c4 100644
261 --- a/src/display/curve.h
262 +++ b/src/display/curve.h
264 * Released under GNU GPL
267 -#include <glib/gtypes.h>
268 -#include <glib/gslist.h>
271 #include <2geom/forward.h>
273 diff --git a/src/display/gnome-canvas-acetate.h b/src/display/gnome-canvas-acetate.h
274 index 40574e1..2f84931 100644
275 --- a/src/display/gnome-canvas-acetate.h
276 +++ b/src/display/gnome-canvas-acetate.h
278 * Released under GNU GPL, read the file 'COPYING' for more information
281 -#include <glib/gtypes.h>
283 #include "display/sp-canvas.h"
286 diff --git a/src/display/nr-3dutils.cpp b/src/display/nr-3dutils.cpp
287 index 89c2194..db8800f 100644
288 --- a/src/display/nr-3dutils.cpp
289 +++ b/src/display/nr-3dutils.cpp
291 * Released under GNU GPL, read the file 'COPYING' for more information
294 -#include <glib/gmessages.h>
297 #include "libnr/nr-pixblock.h"
298 #include "display/nr-3dutils.h"
299 diff --git a/src/display/nr-arena.h b/src/display/nr-arena.h
300 index 76b071e..1d23511 100644
301 --- a/src/display/nr-arena.h
302 +++ b/src/display/nr-arena.h
304 * Released under GNU GPL, read the file 'COPYING' for more information
307 -#include <glib/gmacros.h>
310 #include "display/rendermode.h"
312 diff --git a/src/display/nr-filter-diffuselighting.cpp b/src/display/nr-filter-diffuselighting.cpp
313 index 0fe4c59..1e08e11 100644
314 --- a/src/display/nr-filter-diffuselighting.cpp
315 +++ b/src/display/nr-filter-diffuselighting.cpp
317 * Released under GNU GPL, read the file 'COPYING' for more information
320 -#include <glib/gmessages.h>
323 #include "display/nr-3dutils.h"
324 #include "display/nr-arena-item.h"
325 diff --git a/src/display/nr-filter-specularlighting.cpp b/src/display/nr-filter-specularlighting.cpp
326 index 6a6ce38..dbe6764 100644
327 --- a/src/display/nr-filter-specularlighting.cpp
328 +++ b/src/display/nr-filter-specularlighting.cpp
330 * Released under GNU GPL, read the file 'COPYING' for more information
333 -#include <glib/gmessages.h>
337 #include "display/nr-3dutils.h"
338 diff --git a/src/display/nr-plain-stuff.cpp b/src/display/nr-plain-stuff.cpp
339 index 62a6110..e37ad96 100644
340 --- a/src/display/nr-plain-stuff.cpp
341 +++ b/src/display/nr-plain-stuff.cpp
343 * Released under GNU GPL
346 -#include <glib/gmessages.h>
348 #include <libnr/nr-pixops.h>
349 #include "nr-plain-stuff.h"
351 diff --git a/src/display/nr-plain-stuff.h b/src/display/nr-plain-stuff.h
352 index c568f38..99176a3 100644
353 --- a/src/display/nr-plain-stuff.h
354 +++ b/src/display/nr-plain-stuff.h
356 * Released under GNU GPL
359 -#include <glib/gtypes.h>
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);
364 diff --git a/src/display/sodipodi-ctrlrect.h b/src/display/sodipodi-ctrlrect.h
365 index 7e5f515..7e00565 100644
366 --- a/src/display/sodipodi-ctrlrect.h
367 +++ b/src/display/sodipodi-ctrlrect.h
372 -#include <glib/gtypes.h>
374 #include "sp-canvas.h"
376 #define SP_TYPE_CTRLRECT (sp_ctrlrect_get_type ())
377 diff --git a/src/display/sp-canvas.h b/src/display/sp-canvas.h
378 index 3d23bf0..14c1410 100644
379 --- a/src/display/sp-canvas.h
380 +++ b/src/display/sp-canvas.h
385 -#include <glib/gtypes.h>
390 diff --git a/src/document-subset.cpp b/src/document-subset.cpp
391 index 1988865..020e6af 100644
392 --- a/src/document-subset.cpp
393 +++ b/src/document-subset.cpp
395 #include "document.h"
396 #include "sp-object.h"
398 -#include <glib/gmessages.h>
401 #include <sigc++/signal.h>
402 #include <sigc++/functors/mem_fun.h>
403 diff --git a/src/draw-anchor.h b/src/draw-anchor.h
404 index 0277616..af281d3 100644
405 --- a/src/draw-anchor.h
406 +++ b/src/draw-anchor.h
411 -#include <glib/gtypes.h>
413 #include <2geom/point.h>
415 struct SPDrawContext;
416 diff --git a/src/dyna-draw-context.cpp b/src/dyna-draw-context.cpp
417 index bb8e690..7a61a88 100644
418 --- a/src/dyna-draw-context.cpp
419 +++ b/src/dyna-draw-context.cpp
421 #include <2geom/pathvector.h>
422 #include <2geom/bezier-utils.h>
423 #include "display/curve.h"
424 -#include <glib/gmem.h>
427 #include "document.h"
428 #include "selection.h"
429 diff --git a/src/eraser-context.cpp b/src/eraser-context.cpp
430 index c198d93..c0bdec6 100644
431 --- a/src/eraser-context.cpp
432 +++ b/src/eraser-context.cpp
434 #include "display/canvas-bpath.h"
435 #include <2geom/bezier-utils.h>
437 -#include <glib/gmem.h>
440 #include "document.h"
441 #include "selection.h"
442 diff --git a/src/extension/internal/bitmap/imagemagick.cpp b/src/extension/internal/bitmap/imagemagick.cpp
443 index e907612..9a5a506 100644
444 --- a/src/extension/internal/bitmap/imagemagick.cpp
445 +++ b/src/extension/internal/bitmap/imagemagick.cpp
447 #include <gtkmm/spinbutton.h>
451 #include <glib/gstdio.h>
454 diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp
455 index 596f1fe..d65722b 100644
456 --- a/src/extension/internal/cairo-render-context.cpp
457 +++ b/src/extension/internal/cairo-render-context.cpp
460 #include <2geom/pathvector.h>
462 -#include <glib/gmem.h>
465 #include <glibmm/i18n.h>
466 #include "display/nr-arena.h"
467 diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp
468 index 7060251..489af18 100644
469 --- a/src/extension/internal/cairo-renderer.cpp
470 +++ b/src/extension/internal/cairo-renderer.cpp
472 #include <2geom/transforms.h>
473 #include <2geom/pathvector.h>
475 -#include <glib/gmem.h>
478 #include <glibmm/i18n.h>
479 #include "display/nr-arena.h"
480 diff --git a/src/extension/internal/gdkpixbuf-input.cpp b/src/extension/internal/gdkpixbuf-input.cpp
481 index df7f348..a999c43 100644
482 --- a/src/extension/internal/gdkpixbuf-input.cpp
483 +++ b/src/extension/internal/gdkpixbuf-input.cpp
488 -#include <glib/gprintf.h>
490 #include <glibmm/i18n.h>
491 #include "document-private.h"
492 #include <dir-util.h>
493 diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
494 index 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;
501 -#include <glib/gtypes.h>
505 namespace Extension {
506 diff --git a/src/extension/internal/win32.cpp b/src/extension/internal/win32.cpp
507 index 21f2788..18855b2 100644
508 --- a/src/extension/internal/win32.cpp
509 +++ b/src/extension/internal/win32.cpp
514 -#include <glib/gmem.h>
516 #include <libnr/nr-macros.h>
517 #include <2geom/transforms.h>
519 diff --git a/src/extract-uri.h b/src/extract-uri.h
520 index 1975d9b..884b43a 100644
521 --- a/src/extract-uri.h
522 +++ b/src/extract-uri.h
524 #ifndef SEEN_EXTRACT_URI_H
525 #define SEEN_EXTRACT_URI_H
527 -#include <glib/gtypes.h>
530 gchar *extract_uri(gchar const *s, gchar const** endptr = 0);
532 diff --git a/src/file.cpp b/src/file.cpp
533 index 1128a5a..3714560 100644
540 -#include <glib/gmem.h>
542 #include <glibmm/i18n.h>
543 #include <libnr/nr-pixops.h>
545 diff --git a/src/file.h b/src/file.h
546 index dec7e3f..88d0fa0 100644
553 -#include <glib/gslist.h>
557 #include "extension/extension-forward.h"
558 diff --git a/src/filters/blend-fns.h b/src/filters/blend-fns.h
559 index f08ed9d..39bf2b4 100644
560 --- a/src/filters/blend-fns.h
561 +++ b/src/filters/blend-fns.h
565 #include <glib-object.h>
566 -#include <glib/gtypes.h>
571 diff --git a/src/filters/colormatrix-fns.h b/src/filters/colormatrix-fns.h
572 index 3a4a8d3..e023d4d 100644
573 --- a/src/filters/colormatrix-fns.h
574 +++ b/src/filters/colormatrix-fns.h
578 #include <glib-object.h>
579 -#include <glib/gtypes.h>
584 diff --git a/src/filters/componenttransfer-fns.h b/src/filters/componenttransfer-fns.h
585 index 4998377..06248d6 100644
586 --- a/src/filters/componenttransfer-fns.h
587 +++ b/src/filters/componenttransfer-fns.h
591 #include <glib-object.h>
592 -#include <glib/gtypes.h>
597 diff --git a/src/filters/composite-fns.h b/src/filters/composite-fns.h
598 index c79cb17..51610fd 100644
599 --- a/src/filters/composite-fns.h
600 +++ b/src/filters/composite-fns.h
604 #include <glib-object.h>
605 -#include <glib/gtypes.h>
610 diff --git a/src/filters/convolvematrix-fns.h b/src/filters/convolvematrix-fns.h
611 index 76baf7f..931ad94 100644
612 --- a/src/filters/convolvematrix-fns.h
613 +++ b/src/filters/convolvematrix-fns.h
617 #include <glib-object.h>
618 -#include <glib/gtypes.h>
623 diff --git a/src/filters/diffuselighting-fns.h b/src/filters/diffuselighting-fns.h
624 index b91ed80..18a9375 100644
625 --- a/src/filters/diffuselighting-fns.h
626 +++ b/src/filters/diffuselighting-fns.h
630 #include <glib-object.h>
631 -#include <glib/gtypes.h>
636 diff --git a/src/filters/displacementmap-fns.h b/src/filters/displacementmap-fns.h
637 index 6d92c6b..4b8ed74 100644
638 --- a/src/filters/displacementmap-fns.h
639 +++ b/src/filters/displacementmap-fns.h
643 #include <glib-object.h>
644 -#include <glib/gtypes.h>
649 diff --git a/src/filters/flood-fns.h b/src/filters/flood-fns.h
650 index 8cc5072..0cd4bd3 100644
651 --- a/src/filters/flood-fns.h
652 +++ b/src/filters/flood-fns.h
656 #include <glib-object.h>
657 -#include <glib/gtypes.h>
662 diff --git a/src/filters/image-fns.h b/src/filters/image-fns.h
663 index 0a8b453..5748486 100644
664 --- a/src/filters/image-fns.h
665 +++ b/src/filters/image-fns.h
669 #include <glib-object.h>
670 -#include <glib/gtypes.h>
675 diff --git a/src/filters/merge-fns.h b/src/filters/merge-fns.h
676 index 24bda1a..9787d59 100644
677 --- a/src/filters/merge-fns.h
678 +++ b/src/filters/merge-fns.h
682 #include <glib-object.h>
683 -#include <glib/gtypes.h>
688 diff --git a/src/filters/morphology-fns.h b/src/filters/morphology-fns.h
689 index a055040..a6f1b58 100644
690 --- a/src/filters/morphology-fns.h
691 +++ b/src/filters/morphology-fns.h
695 #include <glib-object.h>
696 -#include <glib/gtypes.h>
701 diff --git a/src/filters/offset-fns.h b/src/filters/offset-fns.h
702 index 38561c1..32fbda7 100644
703 --- a/src/filters/offset-fns.h
704 +++ b/src/filters/offset-fns.h
708 #include <glib-object.h>
709 -#include <glib/gtypes.h>
714 diff --git a/src/filters/specularlighting-fns.h b/src/filters/specularlighting-fns.h
715 index bd48ba6..70cd5d4 100644
716 --- a/src/filters/specularlighting-fns.h
717 +++ b/src/filters/specularlighting-fns.h
721 #include <glib-object.h>
722 -#include <glib/gtypes.h>
727 diff --git a/src/filters/tile-fns.h b/src/filters/tile-fns.h
728 index b7c4c5f..4a99a51 100644
729 --- a/src/filters/tile-fns.h
730 +++ b/src/filters/tile-fns.h
734 #include <glib-object.h>
735 -#include <glib/gtypes.h>
740 diff --git a/src/filters/turbulence-fns.h b/src/filters/turbulence-fns.h
741 index 43b4450..de9f228 100644
742 --- a/src/filters/turbulence-fns.h
743 +++ b/src/filters/turbulence-fns.h
747 #include <glib-object.h>
748 -#include <glib/gtypes.h>
753 diff --git a/src/gc-anchored.h b/src/gc-anchored.h
754 index 917930a..119b86a 100644
755 --- a/src/gc-anchored.h
756 +++ b/src/gc-anchored.h
758 #ifndef SEEN_INKSCAPE_GC_ANCHORED_H
759 #define SEEN_INKSCAPE_GC_ANCHORED_H
761 -#include <glib/gmessages.h>
763 #include "gc-managed.h"
766 diff --git a/src/gc-core.h b/src/gc-core.h
767 index af327dc..b99e1c5 100644
774 -#include <glib/gmain.h>
779 diff --git a/src/gc.cpp b/src/gc.cpp
780 index 8622059..5a636e7 100644
787 -#include <glib/gmessages.h>
789 #include <sigc++/functors/ptr_fun.h>
790 #include <glibmm/main.h>
792 diff --git a/src/gradient-drag.h b/src/gradient-drag.h
793 index 40ab065..4fa471b 100644
794 --- a/src/gradient-drag.h
795 +++ b/src/gradient-drag.h
797 * Released under GNU GPL, read the file 'COPYING' for more information
800 -#include <glib/gslist.h>
803 #include <sigc++/sigc++.h>
805 diff --git a/src/help.h b/src/help.h
806 index ef5d703..7241c82 100644
810 * Released under GNU GPL, read the file 'COPYING' for more information
813 -#include <glib/gtypes.h>
817 void sp_help_about(void);
818 diff --git a/src/helper/gnome-utils.h b/src/helper/gnome-utils.h
819 index 0a28c95..62676c7 100644
820 --- a/src/helper/gnome-utils.h
821 +++ b/src/helper/gnome-utils.h
823 #ifndef __GNOME_UTILS_H__
824 #define __GNOME_UTILS_H__
826 -#include <glib/gtypes.h>
827 -#include <glib/glist.h>
830 GList *gnome_uri_list_extract_uris(gchar const *uri_list);
832 diff --git a/src/helper/pixbuf-ops.cpp b/src/helper/pixbuf-ops.cpp
833 index 3be63aa..d7d2e57 100644
834 --- a/src/helper/pixbuf-ops.cpp
835 +++ b/src/helper/pixbuf-ops.cpp
837 #include <interface.h>
838 #include <libnr/nr-pixops.h>
840 -#include <glib/gmessages.h>
842 #include "png-write.h"
843 #include <display/nr-arena-item.h>
844 diff --git a/src/helper/pixbuf-ops.h b/src/helper/pixbuf-ops.h
845 index a985be2..af57327 100644
846 --- a/src/helper/pixbuf-ops.h
847 +++ b/src/helper/pixbuf-ops.h
849 * Released under GNU GPL, read the file 'COPYING' for more information
852 -#include <glib/gtypes.h>
857 diff --git a/src/helper/png-write.cpp b/src/helper/png-write.cpp
858 index b1c135d..5cb37d9 100644
859 --- a/src/helper/png-write.cpp
860 +++ b/src/helper/png-write.cpp
862 #include <libnr/nr-pixops.h>
863 #include <libnr/nr-translate-scale-ops.h>
864 #include <2geom/rect.h>
865 -#include <glib/gmessages.h>
868 #include "png-write.h"
870 diff --git a/src/helper/png-write.h b/src/helper/png-write.h
871 index 83321aa..f8ba4bb 100644
872 --- a/src/helper/png-write.h
873 +++ b/src/helper/png-write.h
875 * Released under GNU GPL, read the file 'COPYING' for more information
878 -#include <glib/gtypes.h>
880 #include <2geom/forward.h>
883 diff --git a/src/helper/stlport.h b/src/helper/stlport.h
884 index c9389e8..c7b00eb 100644
885 --- a/src/helper/stlport.h
886 +++ b/src/helper/stlport.h
891 -#include <glib/glist.h>
892 -#include <glib/gslist.h>
895 template <typename T>
897 diff --git a/src/helper/stock-items.h b/src/helper/stock-items.h
898 index ddad554..4576d51 100644
899 --- a/src/helper/stock-items.h
900 +++ b/src/helper/stock-items.h
905 -#include <glib/gtypes.h>
910 diff --git a/src/helper/unit-menu.h b/src/helper/unit-menu.h
911 index cdaa826..fc8a600 100644
912 --- a/src/helper/unit-menu.h
913 +++ b/src/helper/unit-menu.h
918 -#include <glib/gtypes.h>
922 #include <helper/helper-forward.h>
923 diff --git a/src/helper/units.h b/src/helper/units.h
924 index 8dc62fe..93bd706 100644
925 --- a/src/helper/units.h
926 +++ b/src/helper/units.h
931 -#include <glib/gmessages.h>
932 -#include <glib/gslist.h>
933 -#include <glib/gtypes.h>
935 #include "sp-metric.h"
938 diff --git a/src/inkscape.h b/src/inkscape.h
939 index ca28942..5538d4f 100644
946 -#include <glib/gtypes.h>
951 diff --git a/src/inkview.cpp b/src/inkview.cpp
952 index 6fe989e..9d76378 100644
953 --- a/src/inkview.cpp
954 +++ b/src/inkview.cpp
956 #include <sys/stat.h>
959 -#include <glib/gmem.h>
961 #include <libnr/nr-macros.h>
963 // #include <stropts.h>
964 diff --git a/src/io/inkjar.h b/src/io/inkjar.h
965 index 0fe088b..ea4b0ee 100644
966 --- a/src/io/inkjar.h
967 +++ b/src/io/inkjar.h
972 -#include <glib/garray.h>
973 -#include <glib/gtypes.h>
978 diff --git a/src/io/resource.cpp b/src/io/resource.cpp
979 index 1f6f845..14b8beb 100644
980 --- a/src/io/resource.cpp
981 +++ b/src/io/resource.cpp
986 -#include <glib.h> // g_assert()
987 -#include <glib/gmessages.h>
988 -#include <glib/gstrfuncs.h>
989 -#include <glib/gfileutils.h>
991 #include "path-prefix.h"
992 #include "inkscape.h"
993 #include "io/resource.h"
994 diff --git a/src/io/sys.cpp b/src/io/sys.cpp
995 index 143108a..529f7ce 100644
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>
1007 diff --git a/src/io/sys.h b/src/io/sys.h
1008 index 8623f6b..83ffdb4 100644
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>
1019 #include <glibmm/spawn.h>
1022 diff --git a/src/knot-holder-entity.h b/src/knot-holder-entity.h
1023 index c8fd29d..84afaa4 100644
1024 --- a/src/knot-holder-entity.h
1025 +++ b/src/knot-holder-entity.h
1027 * Released under GNU GPL
1030 -#include <glib/gtypes.h>
1033 #include <2geom/forward.h>
1034 #include "snapper.h"
1035 diff --git a/src/knotholder.h b/src/knotholder.h
1036 index 0b37d21..7feb1c7 100644
1037 --- a/src/knotholder.h
1038 +++ b/src/knotholder.h
1043 -#include <glib/gtypes.h>
1045 #include "knot-enums.h"
1046 #include "forward.h"
1047 #include "libnr/nr-forward.h"
1048 diff --git a/src/libcroco/cr-libxml-node-iface.h b/src/libcroco/cr-libxml-node-iface.h
1049 index 5da0d9a..b4a6212 100644
1050 --- a/src/libcroco/cr-libxml-node-iface.h
1051 +++ b/src/libcroco/cr-libxml-node-iface.h
1053 #ifndef __CR_LIBXML_NODE_IFACE_H__
1054 #define __CR_LIBXML_NODE_IFACE_H__
1056 -#include <glib/gmacros.h>
1058 #include "cr-node-iface.h"
1061 diff --git a/src/libcroco/cr-node-iface.h b/src/libcroco/cr-node-iface.h
1062 index 9c2d30e..01898d6 100644
1063 --- a/src/libcroco/cr-node-iface.h
1064 +++ b/src/libcroco/cr-node-iface.h
1066 #ifndef __CR_NODE_IFACE_H__
1067 #define __CR_NODE_IFACE_H__
1069 -#include <glib/gmacros.h>
1070 -#include <glib/gtypes.h>
1075 diff --git a/src/libgdl/gdl-stock.h b/src/libgdl/gdl-stock.h
1076 index cb6f7ab..459d00c 100644
1077 --- a/src/libgdl/gdl-stock.h
1078 +++ b/src/libgdl/gdl-stock.h
1080 #ifndef __GDL_STOCK_H__
1081 #define __GDL_STOCK_H__
1083 -#include <glib/gmacros.h> // G_BEGIN_DECLS
1084 +#include <glib.h> // G_BEGIN_DECLS
1088 diff --git a/src/libnr/in-svg-plane-test.h b/src/libnr/in-svg-plane-test.h
1089 index 304182f..1d51125 100644
1090 --- a/src/libnr/in-svg-plane-test.h
1091 +++ b/src/libnr/in-svg-plane-test.h
1093 #include <cxxtest/TestSuite.h>
1095 -#include <glib/gmacros.h>
1099 #include "libnr/in-svg-plane.h"
1100 diff --git a/src/libnr/nr-gradient.cpp b/src/libnr/nr-gradient.cpp
1101 index e6eb9b7..32dac7d 100644
1102 --- a/src/libnr/nr-gradient.cpp
1103 +++ b/src/libnr/nr-gradient.cpp
1105 #include <libnr/nr-blit.h>
1106 #include <libnr/nr-gradient.h>
1107 #include <libnr/nr-matrix-ops.h>
1108 -#include <glib/gtypes.h>
1113 diff --git a/src/libnr/nr-i-coord.h b/src/libnr/nr-i-coord.h
1114 index f87dea3..c9e6b3f 100644
1115 --- a/src/libnr/nr-i-coord.h
1116 +++ b/src/libnr/nr-i-coord.h
1118 #ifndef SEEN_NR_I_COORD_H
1119 #define SEEN_NR_I_COORD_H
1121 -#include <glib/gtypes.h>
1126 diff --git a/src/libnr/nr-matrix.h b/src/libnr/nr-matrix.h
1127 index b1f9d58..471381c 100644
1128 --- a/src/libnr/nr-matrix.h
1129 +++ b/src/libnr/nr-matrix.h
1131 * This code is in public domain.
1134 -#include <glib.h> // g_assert()
1135 -#include <glib/gmessages.h>
1138 #include "libnr/nr-coord.h"
1139 #include "libnr/nr-values.h"
1140 diff --git a/src/libnr/nr-object.cpp b/src/libnr/nr-object.cpp
1141 index d92052d..e4268f1 100644
1142 --- a/src/libnr/nr-object.cpp
1143 +++ b/src/libnr/nr-object.cpp
1148 -#include <glib/gmem.h>
1150 #include <libnr/nr-macros.h>
1152 #include "nr-object.h"
1153 diff --git a/src/libnr/nr-object.h b/src/libnr/nr-object.h
1154 index 2691302..da89385 100644
1155 --- a/src/libnr/nr-object.h
1156 +++ b/src/libnr/nr-object.h
1161 -#include <glib/gtypes.h>
1163 #include "gc-managed.h"
1164 #include "gc-finalized.h"
1165 #include "gc-anchored.h"
1166 diff --git a/src/libnr/nr-pixblock-pattern.cpp b/src/libnr/nr-pixblock-pattern.cpp
1167 index aa32462..a09c957 100644
1168 --- a/src/libnr/nr-pixblock-pattern.cpp
1169 +++ b/src/libnr/nr-pixblock-pattern.cpp
1174 -#include <glib/gmem.h>
1176 #include "nr-pixops.h"
1177 #include "nr-pixblock-pattern.h"
1179 diff --git a/src/libnr/nr-pixblock.cpp b/src/libnr/nr-pixblock.cpp
1180 index 6b2b12b..a881a37 100644
1181 --- a/src/libnr/nr-pixblock.cpp
1182 +++ b/src/libnr/nr-pixblock.cpp
1187 -#include <glib/gmem.h>
1189 #include "nr-pixblock.h"
1191 /// Size of buffer that needs no allocation (default 4).
1192 diff --git a/src/libnr/nr-point-fns-test.h b/src/libnr/nr-point-fns-test.h
1193 index 7d28c9c..eeb28f4 100644
1194 --- a/src/libnr/nr-point-fns-test.h
1195 +++ b/src/libnr/nr-point-fns-test.h
1200 -#include <glib/gmacros.h>
1204 #include "libnr/nr-point-fns.h"
1205 diff --git a/src/libnr/nr-rotate-fns-test.h b/src/libnr/nr-rotate-fns-test.h
1206 index e3bfe30..d1c01cd 100644
1207 --- a/src/libnr/nr-rotate-fns-test.h
1208 +++ b/src/libnr/nr-rotate-fns-test.h
1210 #include <cxxtest/TestSuite.h>
1213 -#include <glib/gmacros.h>
1216 #include <libnr/nr-rotate-fns.h>
1218 diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp
1219 index 067254b..4130bfc 100644
1220 --- a/src/libnrtype/FontFactory.cpp
1221 +++ b/src/libnrtype/FontFactory.cpp
1226 -#include <glib/gmem.h>
1228 #include <glibmm/i18n.h> // _()
1229 #include <pango/pangoft2.h>
1230 #include "libnrtype/FontFactory.h"
1231 diff --git a/src/libnrtype/Layout-TNG-Output.cpp b/src/libnrtype/Layout-TNG-Output.cpp
1232 index f34b93d..ab03b16 100644
1233 --- a/src/libnrtype/Layout-TNG-Output.cpp
1234 +++ b/src/libnrtype/Layout-TNG-Output.cpp
1237 * Released under GNU GPL, read the file 'COPYING' for more information
1239 -#include <glib/gmem.h>
1241 #include "Layout-TNG.h"
1242 #include "display/nr-arena-glyphs.h"
1244 diff --git a/src/libnrtype/nr-type-primitives.cpp b/src/libnrtype/nr-type-primitives.cpp
1245 index 34b1e43..698f3f8 100644
1246 --- a/src/libnrtype/nr-type-primitives.cpp
1247 +++ b/src/libnrtype/nr-type-primitives.cpp
1252 -#include <glib/gmem.h>
1254 #include <libnr/nr-macros.h>
1255 #include "nr-type-primitives.h"
1257 diff --git a/src/libnrtype/nr-type-primitives.h b/src/libnrtype/nr-type-primitives.h
1258 index 92b94e9..9bb181c 100644
1259 --- a/src/libnrtype/nr-type-primitives.h
1260 +++ b/src/libnrtype/nr-type-primitives.h
1262 * This code is in public domain
1265 -#include <glib/gtypes.h>
1270 diff --git a/src/livarot/AlphaLigne.cpp b/src/livarot/AlphaLigne.cpp
1271 index f878c1b..5b8321b 100644
1272 --- a/src/livarot/AlphaLigne.cpp
1273 +++ b/src/livarot/AlphaLigne.cpp
1278 -#include <glib/gmem.h>
1281 AlphaLigne::AlphaLigne(int iMin,int iMax)
1283 diff --git a/src/livarot/BitLigne.cpp b/src/livarot/BitLigne.cpp
1284 index c4c1346..d7cce26 100644
1285 --- a/src/livarot/BitLigne.cpp
1286 +++ b/src/livarot/BitLigne.cpp
1291 -#include <glib/gmem.h>
1294 BitLigne::BitLigne(int ist,int ien,float iScale)
1296 diff --git a/src/livarot/PathSimplify.cpp b/src/livarot/PathSimplify.cpp
1297 index 0f440de..efcdfd4 100644
1298 --- a/src/livarot/PathSimplify.cpp
1299 +++ b/src/livarot/PathSimplify.cpp
1304 -#include <glib/gmem.h>
1306 #include <libnr/nr-point-matrix-ops.h>
1307 #include "livarot/Path.h"
1308 #include "livarot/path-description.h"
1309 diff --git a/src/livarot/Shape.cpp b/src/livarot/Shape.cpp
1310 index 9107844..e260e97 100644
1311 --- a/src/livarot/Shape.cpp
1312 +++ b/src/livarot/Shape.cpp
1317 -#include <glib/gmem.h>
1320 #include "livarot/sweep-event-queue.h"
1321 #include "livarot/sweep-tree-list.h"
1322 diff --git a/src/livarot/ShapeSweep.cpp b/src/livarot/ShapeSweep.cpp
1323 index 00a0dd9..d3d5ef1 100644
1324 --- a/src/livarot/ShapeSweep.cpp
1325 +++ b/src/livarot/ShapeSweep.cpp
1330 -#include <glib/gmem.h>
1333 #include "livarot/sweep-event-queue.h"
1334 #include "livarot/sweep-tree-list.h"
1335 diff --git a/src/livarot/int-line.cpp b/src/livarot/int-line.cpp
1336 index c1e388f..d03d62c 100644
1337 --- a/src/livarot/int-line.cpp
1338 +++ b/src/livarot/int-line.cpp
1343 -#include <glib/gmem.h>
1348 diff --git a/src/livarot/sweep-event.cpp b/src/livarot/sweep-event.cpp
1349 index 88d895e..28fead2 100644
1350 --- a/src/livarot/sweep-event.cpp
1351 +++ b/src/livarot/sweep-event.cpp
1353 -#include <glib/gmem.h>
1355 #include "livarot/sweep-event-queue.h"
1356 #include "livarot/sweep-tree.h"
1357 #include "livarot/sweep-event.h"
1358 diff --git a/src/livarot/sweep-tree-list.cpp b/src/livarot/sweep-tree-list.cpp
1359 index 1d2dcec..5d3f69e 100644
1360 --- a/src/livarot/sweep-tree-list.cpp
1361 +++ b/src/livarot/sweep-tree-list.cpp
1363 -#include <glib/gmem.h>
1365 #include "livarot/sweep-tree.h"
1366 #include "livarot/sweep-tree-list.h"
1368 diff --git a/src/live_effects/parameter/array.h b/src/live_effects/parameter/array.h
1369 index e5f2301..ca22a07 100644
1370 --- a/src/live_effects/parameter/array.h
1371 +++ b/src/live_effects/parameter/array.h
1376 -#include <glib/gtypes.h>
1379 #include <gtkmm/tooltips.h>
1381 diff --git a/src/live_effects/parameter/bool.h b/src/live_effects/parameter/bool.h
1382 index 8f5196d..851476f 100644
1383 --- a/src/live_effects/parameter/bool.h
1384 +++ b/src/live_effects/parameter/bool.h
1386 * Released under GNU GPL, read the file 'COPYING' for more information
1389 -#include <glib/gtypes.h>
1392 #include "live_effects/parameter/parameter.h"
1394 diff --git a/src/live_effects/parameter/enum.h b/src/live_effects/parameter/enum.h
1395 index 05f3bdd..2d2268e 100644
1396 --- a/src/live_effects/parameter/enum.h
1397 +++ b/src/live_effects/parameter/enum.h
1399 * Released under GNU GPL, read the file 'COPYING' for more information
1402 -#include <glib/gtypes.h>
1405 #include "ui/widget/registered-enums.h"
1406 #include <gtkmm/tooltips.h>
1407 diff --git a/src/live_effects/parameter/path.h b/src/live_effects/parameter/path.h
1408 index 8fe9382..792c98a 100644
1409 --- a/src/live_effects/parameter/path.h
1410 +++ b/src/live_effects/parameter/path.h
1412 * Released under GNU GPL, read the file 'COPYING' for more information
1415 -#include <glib/gtypes.h>
1417 #include <2geom/path.h>
1419 #include <gtkmm/tooltips.h>
1420 diff --git a/src/live_effects/parameter/point.h b/src/live_effects/parameter/point.h
1421 index ec61fcd..38fab1c 100644
1422 --- a/src/live_effects/parameter/point.h
1423 +++ b/src/live_effects/parameter/point.h
1425 * Released under GNU GPL, read the file 'COPYING' for more information
1428 -#include <glib/gtypes.h>
1430 #include <2geom/point.h>
1432 #include <gtkmm/tooltips.h>
1433 diff --git a/src/live_effects/parameter/text.h b/src/live_effects/parameter/text.h
1434 index 8539a80..8265430 100644
1435 --- a/src/live_effects/parameter/text.h
1436 +++ b/src/live_effects/parameter/text.h
1438 * Released under GNU GPL, read the file 'COPYING' for more information
1441 -#include <glib/gtypes.h>
1444 #include "display/canvas-bpath.h"
1445 #include "live_effects/parameter/parameter.h"
1446 diff --git a/src/live_effects/parameter/vector.h b/src/live_effects/parameter/vector.h
1447 index a4c29d3..09581d2 100644
1448 --- a/src/live_effects/parameter/vector.h
1449 +++ b/src/live_effects/parameter/vector.h
1451 * Released under GNU GPL, read the file 'COPYING' for more information
1454 -#include <glib/gtypes.h>
1456 #include <2geom/point.h>
1458 #include <gtkmm/tooltips.h>
1459 diff --git a/src/main-cmdlineact.h b/src/main-cmdlineact.h
1460 index aca039f..03f0eb0 100644
1461 --- a/src/main-cmdlineact.h
1462 +++ b/src/main-cmdlineact.h
1464 * Released under GNU GPL v2.x, read the file 'COPYING' for more information
1467 -#include <glib/gtypes.h>
1470 namespace Inkscape {
1472 diff --git a/src/main.cpp b/src/main.cpp
1473 index d4b8271..5852d36 100644
1478 #include <libxml/tree.h>
1480 -#include <glib/gprintf.h>
1481 #include <glib-object.h>
1482 #include <gtk/gtk.h>
1484 diff --git a/src/message-context.cpp b/src/message-context.cpp
1485 index 5055f41..6182c2c 100644
1486 --- a/src/message-context.cpp
1487 +++ b/src/message-context.cpp
1489 * Released under GNU GPL, read the file 'COPYING' for more information
1492 -#include <glib/gstrfuncs.h>
1494 #include "message-context.h"
1495 #include "message-stack.h"
1497 diff --git a/src/message-stack.cpp b/src/message-stack.cpp
1498 index 05aec87..1c407e3 100644
1499 --- a/src/message-stack.cpp
1500 +++ b/src/message-stack.cpp
1505 -#include <glib/gstrfuncs.h>
1509 #include "message-stack.h"
1510 diff --git a/src/modifier-fns.h b/src/modifier-fns.h
1511 index 02d3e8f..368791b 100644
1512 --- a/src/modifier-fns.h
1513 +++ b/src/modifier-fns.h
1517 #include <gdk/gdk.h>
1518 -#include <glib/gtypes.h>
1522 mod_shift(guint const state)
1523 diff --git a/src/number-opt-number.h b/src/number-opt-number.h
1524 index 0025f2d..6a0e72f 100644
1525 --- a/src/number-opt-number.h
1526 +++ b/src/number-opt-number.h
1531 -#include <glib/gprintf.h>
1532 //todo: use glib instead of stdlib
1534 #include "svg/stringstream.h"
1535 diff --git a/src/object-hierarchy.h b/src/object-hierarchy.h
1536 index c127a48..fa23219 100644
1537 --- a/src/object-hierarchy.h
1538 +++ b/src/object-hierarchy.h
1541 #include <sigc++/connection.h>
1542 #include <sigc++/signal.h>
1543 -#include <glib/gmessages.h>
1548 diff --git a/src/path-chemistry.cpp b/src/path-chemistry.cpp
1549 index c44ab5b..c97b7c7 100644
1550 --- a/src/path-chemistry.cpp
1551 +++ b/src/path-chemistry.cpp
1553 #include "xml/repr.h"
1554 #include "svg/svg.h"
1555 #include "display/curve.h"
1556 -#include <glib/gmem.h>
1558 #include <glibmm/i18n.h>
1559 #include "sp-path.h"
1560 #include "sp-text.h"
1561 diff --git a/src/removeoverlap.h b/src/removeoverlap.h
1562 index 5b16e70..1ba4157 100644
1563 --- a/src/removeoverlap.h
1564 +++ b/src/removeoverlap.h
1566 #ifndef SEEN_REMOVEOVERLAP_H
1567 #define SEEN_REMOVEOVERLAP_H
1569 -#include <glib/gslist.h>
1572 void removeoverlap(GSList const *items, double xGap, double yGap);
1574 diff --git a/src/sp-conn-end-pair.h b/src/sp-conn-end-pair.h
1575 index bc5fa12..7ba42e9 100644
1576 --- a/src/sp-conn-end-pair.h
1577 +++ b/src/sp-conn-end-pair.h
1580 * Released under GNU GPL, read the file 'COPYING' for more information
1582 -#include <glib/gtypes.h>
1585 #include "forward.h"
1586 #include "libnr/nr-point.h"
1587 diff --git a/src/sp-conn-end.h b/src/sp-conn-end.h
1588 index 052e8dd..032f12e 100644
1589 --- a/src/sp-conn-end.h
1590 +++ b/src/sp-conn-end.h
1592 #ifndef SEEN_SP_CONN_END
1593 #define SEEN_SP_CONN_END
1595 -#include <glib/gtypes.h>
1598 #include <sigc++/connection.h>
1600 diff --git a/src/sp-filter-fns.h b/src/sp-filter-fns.h
1601 index 4e1b012..a1e2075 100644
1602 --- a/src/sp-filter-fns.h
1603 +++ b/src/sp-filter-fns.h
1605 * Macros and fn declarations related to filters.
1608 -#include <glib/gtypes.h>
1610 #include <glib-object.h>
1611 #include "libnr/nr-forward.h"
1612 #include "sp-filter-units.h"
1613 diff --git a/src/sp-gaussian-blur-fns.h b/src/sp-gaussian-blur-fns.h
1614 index 0307392..fe696dc 100644
1615 --- a/src/sp-gaussian-blur-fns.h
1616 +++ b/src/sp-gaussian-blur-fns.h
1620 #include <glib-object.h>
1621 -#include <glib/gtypes.h>
1624 namespace Inkscape {
1626 diff --git a/src/sp-gradient-fns.h b/src/sp-gradient-fns.h
1627 index aabc3ed..e09717b 100644
1628 --- a/src/sp-gradient-fns.h
1629 +++ b/src/sp-gradient-fns.h
1631 * Macros and fn declarations related to gradients.
1634 -#include <glib/gtypes.h>
1636 #include <glib-object.h>
1637 #include <2geom/forward.h>
1638 #include "sp-gradient-spread.h"
1639 diff --git a/src/sp-gradient-vector.h b/src/sp-gradient-vector.h
1640 index 7bdfb51..d341daa 100644
1641 --- a/src/sp-gradient-vector.h
1642 +++ b/src/sp-gradient-vector.h
1644 #ifndef SEEN_SP_GRADIENT_VECTOR_H
1645 #define SEEN_SP_GRADIENT_VECTOR_H
1647 -#include <glib/gtypes.h>
1652 diff --git a/src/sp-image.cpp b/src/sp-image.cpp
1653 index 322e2d1..0c7f9ba 100644
1654 --- a/src/sp-image.cpp
1655 +++ b/src/sp-image.cpp
1657 //#include <gdk-pixbuf/gdk-pixbuf-io.h>
1658 #include "display/nr-arena-image.h"
1659 #include <display/curve.h>
1661 #include <glib/gstdio.h>
1663 //Added for preserveAspectRatio support -- EAF
1664 diff --git a/src/sp-linear-gradient-fns.h b/src/sp-linear-gradient-fns.h
1665 index 0962bae..636cc1c 100644
1666 --- a/src/sp-linear-gradient-fns.h
1667 +++ b/src/sp-linear-gradient-fns.h
1671 #include <glib-object.h>
1672 -#include <glib/gtypes.h>
1675 namespace Inkscape {
1677 diff --git a/src/sp-metrics.h b/src/sp-metrics.h
1678 index 23c1b6c..c2f9687 100644
1679 --- a/src/sp-metrics.h
1680 +++ b/src/sp-metrics.h
1682 #ifndef SP_METRICS_H
1683 #define SP_METRICS_H
1685 -#include <glib/gstring.h>
1686 -#include <glib/gtypes.h>
1688 #include "sp-metric.h"
1690 gdouble sp_absolute_metric_to_metric (gdouble length_src, const SPMetric metric_src, const SPMetric metric_dst);
1691 diff --git a/src/sp-radial-gradient.h b/src/sp-radial-gradient.h
1692 index bec6cbe..528b527 100644
1693 --- a/src/sp-radial-gradient.h
1694 +++ b/src/sp-radial-gradient.h
1696 * SPRadialGradient: SVG <radialgradient> implementtion.
1699 -#include <glib/gtypes.h>
1701 #include "sp-gradient.h"
1702 #include "svg/svg-length.h"
1703 #include "sp-radial-gradient-fns.h"
1704 diff --git a/src/sp-stop.h b/src/sp-stop.h
1705 index 2cf8ad6..96922eb 100644
1712 -#include <glib/gtypes.h>
1714 #include <glibmm/ustring.h>
1715 #include "sp-object.h"
1717 diff --git a/src/sp-text.h b/src/sp-text.h
1718 index b90fe37..5db61ff 100644
1722 * Released under GNU GPL, read the file 'COPYING' for more information
1725 -#include <glib/gtypes.h>
1728 #include <sigc++/sigc++.h>
1729 #include "sp-item.h"
1730 diff --git a/src/sp-textpath.h b/src/sp-textpath.h
1731 index 1931966..18b42ec 100644
1732 --- a/src/sp-textpath.h
1733 +++ b/src/sp-textpath.h
1735 #ifndef INKSCAPE_SP_TEXTPATH_H
1736 #define INKSCAPE_SP_TEXTPATH_H
1738 -#include <glib/gtypes.h>
1740 #include "svg/svg-length.h"
1741 #include "sp-item.h"
1742 #include "sp-text.h"
1743 diff --git a/src/sp-tspan.h b/src/sp-tspan.h
1744 index def8051..6c40d86 100644
1745 --- a/src/sp-tspan.h
1746 +++ b/src/sp-tspan.h
1748 * tspan and textpath, based on the flowtext routines
1751 -#include <glib/gtypes.h>
1753 #include "sp-item.h"
1754 #include "text-tag-attributes.h"
1756 diff --git a/src/splivarot.cpp b/src/splivarot.cpp
1757 index 128fa23..89360d8 100644
1758 --- a/src/splivarot.cpp
1759 +++ b/src/splivarot.cpp
1764 -#include <glib/gmem.h>
1766 #include "xml/repr.h"
1767 #include "svg/svg.h"
1768 #include "sp-path.h"
1769 diff --git a/src/spray-context.cpp b/src/spray-context.cpp
1770 index 2bdac19..7d57168 100644
1771 --- a/src/spray-context.cpp
1772 +++ b/src/spray-context.cpp
1774 #include "svg/svg.h"
1775 #include "display/canvas-bpath.h"
1777 -#include <glib/gmem.h>
1780 #include "document.h"
1781 #include "selection.h"
1782 diff --git a/src/svg/css-ostringstream.cpp b/src/svg/css-ostringstream.cpp
1783 index a6eb278..865f6ae 100644
1784 --- a/src/svg/css-ostringstream.cpp
1785 +++ b/src/svg/css-ostringstream.cpp
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>
1794 Inkscape::CSSOStringStream::CSSOStringStream()
1796 diff --git a/src/svg/css-ostringstream.h b/src/svg/css-ostringstream.h
1797 index 48ecf29..93bf32d 100644
1798 --- a/src/svg/css-ostringstream.h
1799 +++ b/src/svg/css-ostringstream.h
1801 #ifndef SVG_CSS_OSTRINGSTREAM_H_INKSCAPE
1802 #define SVG_CSS_OSTRINGSTREAM_H_INKSCAPE
1804 -#include <glib/gtypes.h>
1808 namespace Inkscape {
1809 diff --git a/src/svg/stringstream.h b/src/svg/stringstream.h
1810 index 60ed74e..4623cbc 100644
1811 --- a/src/svg/stringstream.h
1812 +++ b/src/svg/stringstream.h
1814 #ifndef INKSCAPE_STRINGSTREAM_H
1815 #define INKSCAPE_STRINGSTREAM_H
1817 -#include <glib/gtypes.h>
1822 diff --git a/src/svg/strip-trailing-zeros.cpp b/src/svg/strip-trailing-zeros.cpp
1823 index 769834d..daad8b9 100644
1824 --- a/src/svg/strip-trailing-zeros.cpp
1825 +++ b/src/svg/strip-trailing-zeros.cpp
1830 -#include <glib/gmessages.h>
1833 #include "svg/strip-trailing-zeros.h"
1835 diff --git a/src/svg/svg-affine.cpp b/src/svg/svg-affine.cpp
1836 index 91a9fa7..658991a 100644
1837 --- a/src/svg/svg-affine.cpp
1838 +++ b/src/svg/svg-affine.cpp
1843 -#include <glib/gstrfuncs.h>
1845 #include <libnr/nr-matrix-fns.h>
1846 #include <libnr/nr-matrix-ops.h>
1847 #include <2geom/transforms.h>
1848 diff --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp
1849 index 04f3877..4d727c3 100644
1850 --- a/src/svg/svg-color.cpp
1851 +++ b/src/svg/svg-color.cpp
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>
1866 diff --git a/src/svg/svg-color.h b/src/svg/svg-color.h
1867 index a3868c1..d1c7bee 100644
1868 --- a/src/svg/svg-color.h
1869 +++ b/src/svg/svg-color.h
1871 #ifndef SVG_SVG_COLOR_H_SEEN
1872 #define SVG_SVG_COLOR_H_SEEN
1874 -#include <glib/gtypes.h>
1879 diff --git a/src/svg/svg-length.cpp b/src/svg/svg-length.cpp
1880 index 94f1cf3..ae5f758 100644
1881 --- a/src/svg/svg-length.cpp
1882 +++ b/src/svg/svg-length.cpp
1887 -#include <glib/gstrfuncs.h>
1891 #include "stringstream.h"
1892 diff --git a/src/svg/svg-length.h b/src/svg/svg-length.h
1893 index 1f4be81..f5631b1 100644
1894 --- a/src/svg/svg-length.h
1895 +++ b/src/svg/svg-length.h
1897 * Released under GNU GPL, read the file 'COPYING' for more information
1900 -#include <glib/gtypes.h>
1905 diff --git a/src/svg/svg-path-geom-test.h b/src/svg/svg-path-geom-test.h
1906 index 1a084d5..a1bd4d7 100644
1907 --- a/src/svg/svg-path-geom-test.h
1908 +++ b/src/svg/svg-path-geom-test.h
1913 -#include <glib/gmem.h>
1916 class SvgPathGeomTest : public CxxTest::TestSuite
1918 diff --git a/src/svg/svg-path.cpp b/src/svg/svg-path.cpp
1919 index bbf1589..b58ec40 100644
1920 --- a/src/svg/svg-path.cpp
1921 +++ b/src/svg/svg-path.cpp
1926 -#include <glib/gmem.h>
1927 -#include <glib/gmessages.h>
1928 -#include <glib/gstrfuncs.h>
1929 -#include <glib.h> // g_assert()
1932 #include "svg/svg.h"
1933 #include "svg/path-string.h"
1934 diff --git a/src/svg/svg.h b/src/svg/svg.h
1935 index 0b2c3ae..7ff8ecc 100644
1940 * Released under GNU GPL, read the file 'COPYING' for more information
1942 -#include <glib/gtypes.h>
1947 diff --git a/src/text-editing.h b/src/text-editing.h
1948 index 038458f..9777c67 100644
1949 --- a/src/text-editing.h
1950 +++ b/src/text-editing.h
1952 * Released under GNU GPL, read the file 'COPYING' for more information
1955 -#include <glib/gtypes.h>
1957 #include <utility> // std::pair
1958 #include "libnrtype/Layout-TNG.h"
1959 #include <libnr/nr-forward.h>
1960 diff --git a/src/text-tag-attributes.h b/src/text-tag-attributes.h
1961 index 197bfb7..1c73869 100644
1962 --- a/src/text-tag-attributes.h
1963 +++ b/src/text-tag-attributes.h
1965 #define INKSCAPE_TEXT_TAG_ATTRIBUTES_H
1968 -#include <glib/gtypes.h>
1970 #include "libnrtype/Layout-TNG.h"
1971 #include "svg/svg-length.h"
1973 diff --git a/src/trace/potrace/potracelib.cpp b/src/trace/potrace/potracelib.cpp
1974 index 136f7a9..9505aa0 100644
1975 --- a/src/trace/potrace/potracelib.cpp
1976 +++ b/src/trace/potrace/potracelib.cpp
1981 -#include <glib/gstrfuncs.h>
1984 #include "potracelib.h"
1985 #include "inkscape-version.h"
1986 diff --git a/src/tweak-context.cpp b/src/tweak-context.cpp
1987 index 904d0cb..ce6a515 100644
1988 --- a/src/tweak-context.cpp
1989 +++ b/src/tweak-context.cpp
1991 #include "svg/svg.h"
1992 #include "display/canvas-bpath.h"
1994 -#include <glib/gmem.h>
1997 #include "document.h"
1998 #include "selection.h"
1999 diff --git a/src/ui/cache/svg_preview_cache.cpp b/src/ui/cache/svg_preview_cache.cpp
2000 index 6e05f6c..c13d41f 100644
2001 --- a/src/ui/cache/svg_preview_cache.cpp
2002 +++ b/src/ui/cache/svg_preview_cache.cpp
2004 # include "config.h"
2007 -#include <glib/gmem.h>
2009 #include <gtk/gtk.h>
2010 #include "sp-namedview.h"
2011 #include "selection.h"
2012 diff --git a/src/ui/dialog/desktop-tracker.h b/src/ui/dialog/desktop-tracker.h
2013 index b5b83b5..dc492d2 100644
2014 --- a/src/ui/dialog/desktop-tracker.h
2015 +++ b/src/ui/dialog/desktop-tracker.h
2019 #include <sigc++/connection.h>
2020 -#include <glib/gtypes.h>
2023 typedef struct _GtkWidget GtkWidget;
2025 diff --git a/src/ui/dialog/dialog-manager.h b/src/ui/dialog/dialog-manager.h
2026 index a97b58c..f088b16 100644
2027 --- a/src/ui/dialog/dialog-manager.h
2028 +++ b/src/ui/dialog/dialog-manager.h
2030 #ifndef INKSCAPE_UI_DIALOG_MANAGER_H
2031 #define INKSCAPE_UI_DIALOG_MANAGER_H
2033 -#include <glib/gquark.h>
2038 diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
2039 index cbd2769..306e990 100644
2040 --- a/src/ui/dialog/icon-preview.cpp
2041 +++ b/src/ui/dialog/icon-preview.cpp
2045 #include <gtk/gtk.h>
2046 -#include <glib/gmem.h>
2048 #include <glibmm/i18n.h>
2049 #include <gtkmm/alignment.h>
2050 #include <gtkmm/buttonbox.h>
2051 diff --git a/src/ui/dialog/input.cpp b/src/ui/dialog/input.cpp
2052 index 8c98515..1cd8eac 100644
2053 --- a/src/ui/dialog/input.cpp
2054 +++ b/src/ui/dialog/input.cpp
2059 -#include <glib/gprintf.h>
2061 #include <glibmm/i18n.h>
2062 #include <gtkmm/alignment.h>
2063 #include <gtkmm/cellrenderercombo.h>
2064 diff --git a/src/ui/widget/icon-widget.cpp b/src/ui/widget/icon-widget.cpp
2065 index 64415f4..210b3dc 100644
2066 --- a/src/ui/widget/icon-widget.cpp
2067 +++ b/src/ui/widget/icon-widget.cpp
2069 # include <config.h>
2072 -#include <glib/gmem.h>
2074 #include "icon-widget.h"
2076 namespace Inkscape {
2077 diff --git a/src/ui/widget/spin-slider.cpp b/src/ui/widget/spin-slider.cpp
2078 index e3e73a5..69bfb6d 100644
2079 --- a/src/ui/widget/spin-slider.cpp
2080 +++ b/src/ui/widget/spin-slider.cpp
2082 * Released under GNU GPL. Read the file 'COPYING' for more information.
2085 -#include "glib/gstrfuncs.h"
2087 #include "glibmm/i18n.h"
2089 #include "spin-slider.h"
2090 diff --git a/src/unclump.h b/src/unclump.h
2091 index c5a8bf7..82dd272 100644
2095 #ifndef SEEN_DIALOGS_UNCLUMP_H
2096 #define SEEN_DIALOGS_UNCLUMP_H
2098 -#include <glib/gslist.h>
2101 void unclump(GSList *items);
2103 diff --git a/src/uri.h b/src/uri.h
2104 index 1c890a6..38a4707 100644
2108 #ifndef INKSCAPE_URI_H
2109 #define INKSCAPE_URI_H
2111 -#include <glib/gtypes.h>
2113 #include <exception>
2114 #include <libxml/uri.h>
2115 #include "bad-uri-exception.h"
2116 diff --git a/src/util/glib-list-iterators.h b/src/util/glib-list-iterators.h
2117 index 586bc31..9e73fa6 100644
2118 --- a/src/util/glib-list-iterators.h
2119 +++ b/src/util/glib-list-iterators.h
2124 -#include "glib/gslist.h"
2125 -#include "glib/glist.h"
2128 namespace Inkscape {
2130 diff --git a/src/util/share.cpp b/src/util/share.cpp
2131 index 2f693fa..f74de23 100644
2132 --- a/src/util/share.cpp
2133 +++ b/src/util/share.cpp
2137 #include "util/share.h"
2138 -#include <glib/gmessages.h>
2141 namespace Inkscape {
2143 diff --git a/src/version.cpp b/src/version.cpp
2144 index edaa600..ef7fbe2 100644
2145 --- a/src/version.cpp
2146 +++ b/src/version.cpp
2151 -#include <glib/gstrfuncs.h>
2153 #include "version.h"
2155 gboolean sp_version_from_string(const gchar *string, Inkscape::Version *version)
2156 diff --git a/src/version.h b/src/version.h
2157 index c620631..0a0381c 100644
2161 #ifndef SEEN_INKSCAPE_VERSION_H
2162 #define SEEN_INKSCAPE_VERSION_H
2164 -#include <glib/gtypes.h>
2167 #define SVG_VERSION "1.1"
2169 diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp
2170 index 851abe9..2a814fe 100644
2171 --- a/src/widgets/icon.cpp
2172 +++ b/src/widgets/icon.cpp
2177 -#include <glib/gmem.h>
2179 #include <gtk/gtk.h>
2182 diff --git a/src/widgets/sp-color-icc-selector.h b/src/widgets/sp-color-icc-selector.h
2183 index f76b258..f6e7cca 100644
2184 --- a/src/widgets/sp-color-icc-selector.h
2185 +++ b/src/widgets/sp-color-icc-selector.h
2187 #ifndef SEEN_SP_COLOR_ICC_SELECTOR_H
2188 #define SEEN_SP_COLOR_ICC_SELECTOR_H
2190 -#include <glib/gtypes.h>
2192 #include <gtk/gtk.h>
2194 #include "../color.h"
2195 diff --git a/src/widgets/sp-color-scales.h b/src/widgets/sp-color-scales.h
2196 index b50c386..38219b5 100644
2197 --- a/src/widgets/sp-color-scales.h
2198 +++ b/src/widgets/sp-color-scales.h
2200 #ifndef SEEN_SP_COLOR_SCALES_H
2201 #define SEEN_SP_COLOR_SCALES_H
2203 -#include <glib/gtypes.h>
2205 #include <gtk/gtk.h>
2208 diff --git a/src/widgets/sp-color-wheel-selector.h b/src/widgets/sp-color-wheel-selector.h
2209 index 56bc8af..4124b1f 100644
2210 --- a/src/widgets/sp-color-wheel-selector.h
2211 +++ b/src/widgets/sp-color-wheel-selector.h
2213 #ifndef SEEN_SP_COLOR_WHEEL_SELECTOR_H
2214 #define SEEN_SP_COLOR_WHEEL_SELECTOR_H
2216 -#include <glib/gtypes.h>
2218 #include <gtk/gtk.h>
2220 #include "../color.h"
2221 diff --git a/src/widgets/spinbutton-events.h b/src/widgets/spinbutton-events.h
2222 index a9ff741..5092861 100644
2223 --- a/src/widgets/spinbutton-events.h
2224 +++ b/src/widgets/spinbutton-events.h
2226 * Released under GNU GPL, read the file 'COPYING' for more information
2229 -#include <glib/gtypes.h>
2231 #include <gtk/gtk.h> /* GtkWidget */
2233 gboolean spinbutton_focus_in (GtkWidget *w, GdkEventKey *event, gpointer data);
2234 diff --git a/src/widgets/spw-utilities.h b/src/widgets/spw-utilities.h
2235 index 78f7937..f0ec2f4 100644
2236 --- a/src/widgets/spw-utilities.h
2237 +++ b/src/widgets/spw-utilities.h
2239 SPObject, that reacts to modification.
2242 -#include <glib/gtypes.h>
2245 typedef struct _GtkWidget GtkWidget;
2247 diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
2248 index f020b0c..907952f 100644
2249 --- a/src/widgets/stroke-style.cpp
2250 +++ b/src/widgets/stroke-style.cpp
2253 #define noSP_SS_VERBOSE
2255 -#include <glib/gmem.h>
2257 #include <gtk/gtk.h>
2258 #include <glibmm/i18n.h>
2260 diff --git a/src/xml/attribute-record.h b/src/xml/attribute-record.h
2261 index bab0b5a..a61329b 100644
2262 --- a/src/xml/attribute-record.h
2263 +++ b/src/xml/attribute-record.h
2265 #ifndef SEEN_XML_SP_REPR_ATTR_H
2266 #define SEEN_XML_SP_REPR_ATTR_H
2268 -#include <glib/gquark.h>
2269 -#include <glib/gtypes.h>
2271 #include "gc-managed.h"
2272 #include "util/share.h"
2274 diff --git a/src/xml/comment-node.h b/src/xml/comment-node.h
2275 index 698a30a..ec94691 100644
2276 --- a/src/xml/comment-node.h
2277 +++ b/src/xml/comment-node.h
2279 #ifndef SEEN_INKSCAPE_XML_COMMENT_NODE_H
2280 #define SEEN_INKSCAPE_XML_COMMENT_NODE_H
2282 -#include <glib/gquark.h>
2284 #include "xml/simple-node.h"
2286 namespace Inkscape {
2287 diff --git a/src/xml/croco-node-iface.cpp b/src/xml/croco-node-iface.cpp
2288 index db98e3d..e67eeac 100644
2289 --- a/src/xml/croco-node-iface.cpp
2290 +++ b/src/xml/croco-node-iface.cpp
2295 -#include <glib/gstrfuncs.h>
2298 #include "xml/croco-node-iface.h"
2299 #include "xml/node.h"
2300 diff --git a/src/xml/event.h b/src/xml/event.h
2301 index c622577..acd2bfc 100644
2302 --- a/src/xml/event.h
2303 +++ b/src/xml/event.h
2305 #ifndef SEEN_INKSCAPE_XML_SP_REPR_ACTION_H
2306 #define SEEN_INKSCAPE_XML_SP_REPR_ACTION_H
2308 -#include <glib/gtypes.h>
2309 -#include <glib/gquark.h>
2311 #include <glibmm/ustring.h>
2314 diff --git a/src/xml/node-event-vector.h b/src/xml/node-event-vector.h
2315 index 0c291c2..e639687 100644
2316 --- a/src/xml/node-event-vector.h
2317 +++ b/src/xml/node-event-vector.h
2319 #ifndef SEEN_INKSCAPE_XML_SP_REPR_EVENT_VECTOR
2320 #define SEEN_INKSCAPE_XML_SP_REPR_EVENT_VECTOR
2322 -#include <glib/gtypes.h>
2325 #include "xml/node.h"
2327 diff --git a/src/xml/node-observer.h b/src/xml/node-observer.h
2328 index ca787c2..44f11e5 100644
2329 --- a/src/xml/node-observer.h
2330 +++ b/src/xml/node-observer.h
2332 #ifndef SEEN_INKSCAPE_XML_NODE_OBSERVER_H
2333 #define SEEN_INKSCAPE_XML_NODE_OBSERVER_H
2335 -#include <glib/gquark.h>
2337 #include "util/share.h"
2338 #include "xml/xml-forward.h"
2340 diff --git a/src/xml/node.h b/src/xml/node.h
2341 index abcccdb..ad3f3de 100644
2342 --- a/src/xml/node.h
2343 +++ b/src/xml/node.h
2345 #ifndef SEEN_INKSCAPE_XML_NODE_H
2346 #define SEEN_INKSCAPE_XML_NODE_H
2348 -#include <glib/gtypes.h>
2350 #include "gc-anchored.h"
2351 #include "util/list.h"
2352 #include "xml/xml-forward.h"
2353 diff --git a/src/xml/pi-node.h b/src/xml/pi-node.h
2354 index 4aa1f84..548216a 100644
2355 --- a/src/xml/pi-node.h
2356 +++ b/src/xml/pi-node.h
2358 #ifndef SEEN_INKSCAPE_XML_PI_NODE_H
2359 #define SEEN_INKSCAPE_XML_PI_NODE_H
2361 -#include <glib/gquark.h>
2363 #include "xml/simple-node.h"
2365 namespace Inkscape {
2366 diff --git a/src/xml/quote.cpp b/src/xml/quote.cpp
2367 index 37f00ba..166cf26 100644
2368 --- a/src/xml/quote.cpp
2369 +++ b/src/xml/quote.cpp
2374 -#include <glib/gmem.h>
2378 /** \return strlen(xml_quote_strdup(\a val)) (without doing the malloc).
2379 diff --git a/src/xml/rebase-hrefs.cpp b/src/xml/rebase-hrefs.cpp
2380 index c387672..c27e9dd 100644
2381 --- a/src/xml/rebase-hrefs.cpp
2382 +++ b/src/xml/rebase-hrefs.cpp
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>
2391 using Inkscape::XML::AttributeRecord;
2394 diff --git a/src/xml/rebase-hrefs.h b/src/xml/rebase-hrefs.h
2395 index b4f288c..ae29a75 100644
2396 --- a/src/xml/rebase-hrefs.h
2397 +++ b/src/xml/rebase-hrefs.h
2399 #ifndef REBASE_HREFS_H_SEEN
2400 #define REBASE_HREFS_H_SEEN
2402 -#include <glib/gtypes.h>
2404 #include "util/list.h"
2405 #include "xml/attribute-record.h"
2407 diff --git a/src/xml/repr.h b/src/xml/repr.h
2408 index 549822e..b6482e6 100644
2409 --- a/src/xml/repr.h
2410 +++ b/src/xml/repr.h
2412 #define __SP_REPR_H__
2415 -#include <glib/gtypes.h>
2417 #include "gc-anchored.h"
2419 #include "xml/node.h"
2420 diff --git a/src/xml/simple-node.cpp b/src/xml/simple-node.cpp
2421 index 7ecdc1b..0c781e2 100644
2422 --- a/src/xml/simple-node.cpp
2423 +++ b/src/xml/simple-node.cpp
2428 -#include <glib/gstrfuncs.h>
2431 #include "xml/node.h"
2432 #include "xml/simple-node.h"
2433 diff --git a/src/xml/text-node.h b/src/xml/text-node.h
2434 index ef6e477..5948bc1 100644
2435 --- a/src/xml/text-node.h
2436 +++ b/src/xml/text-node.h
2438 #ifndef SEEN_INKSCAPE_XML_TEXT_NODE_H
2439 #define SEEN_INKSCAPE_XML_TEXT_NODE_H
2441 -#include <glib/gquark.h>
2443 #include "xml/simple-node.h"
2445 namespace Inkscape {