Code

Bug 1478136 fix - "foo2" was shown instead of guideline id in Guideline dialog
[inkscape.git] / src / make.dep
index f9cea88605fa73889dc42aa1f10cea283f800ba0..ad3f0495623c6f76aec1bd2c6642d963790a2f02 100644 (file)
@@ -1,7 +1,7 @@
 ########################################################
 ## File: make.dep
 ## Purpose: Dependency listing for use by Makefiles
-## Generated by mkdep.pl at :Sun Jan 15 07:06:29 2006
+## Generated by mkdep.pl at :Sun Apr  9 06:06:47 2006
 ## Do not edit this file! Changes will be lost.
 ########################################################
 
@@ -33,6 +33,7 @@ application/editor.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        grid-snapper.h \
        guide-snapper.h \
        helper/action.h \
@@ -126,6 +127,7 @@ arc-context.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        grid-snapper.h \
        guide-snapper.h \
        helper/helper-forward.h \
@@ -172,6 +174,7 @@ arc-context.o: \
        message.h \
        object-edit.h \
        object-snapper.h \
+       pixmaps/cursor-ellipse.xpm \
        prefs-utils.h \
        round.h \
        selection.h \
@@ -199,15 +202,47 @@ arc-context.o: \
        xml/repr.h \
        xml/sp-css-attr.h
 
-attributes-test.o: \
-       attributes-test.cpp \
-       attributes.h \
-       streq.h
-
 attributes.o: \
        attributes.cpp \
        attributes.h
 
+color-profile.o: \
+       color-profile.cpp \
+       attributes.h \
+       color-profile-fns.h \
+       color-profile.h \
+       document.h \
+       forward.h \
+       gc-anchored.h \
+       gc-core.h \
+       gc-finalized.h \
+       gc-managed.h \
+       libcroco/cr-additional-sel.h \
+       libcroco/cr-attr-sel.h \
+       libcroco/cr-cascade.h \
+       libcroco/cr-declaration.h \
+       libcroco/cr-num.h \
+       libcroco/cr-parsing-location.h \
+       libcroco/cr-pseudo.h \
+       libcroco/cr-rgb.h \
+       libcroco/cr-selector.h \
+       libcroco/cr-simple-sel.h \
+       libcroco/cr-statement.h \
+       libcroco/cr-string.h \
+       libcroco/cr-stylesheet.h \
+       libcroco/cr-term.h \
+       libcroco/cr-utils.h \
+       libnr/nr-forward.h \
+       prefs-utils.h \
+       sp-object.h \
+       traits/reference.h \
+       util/forward-pointer-iterator.h \
+       util/list.h \
+       version.h \
+       xml/node.h \
+       xml/repr.h \
+       xml/sp-css-attr.h
+
 color.o: \
        color.cpp \
        color.h
@@ -216,8 +251,9 @@ composite-undo-stack-observer.o: \
        composite-undo-stack-observer.cpp \
        composite-undo-stack-observer.h \
        debug/event.h \
+       gc-core.h \
        undo-stack-observer.h \
-       util/shared-c-string-ptr.h
+       util/share.h
 
 conn-avoid-ref.o: \
        conn-avoid-ref.cpp \
@@ -226,18 +262,30 @@ conn-avoid-ref.o: \
        debug/event.h \
        debug/logger.h \
        decimal-round.h \
+       desktop-handles.h \
+       desktop.h \
+       display/display-forward.h \
        display/nr-arena-forward.h \
        document.h \
+       extension/extension-forward.h \
+       extension/timer.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       grid-snapper.h \
+       guide-snapper.h \
+       helper/helper-forward.h \
+       inkscape.h \
+       libavoid/connector.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
-       libavoid/incremental.h \
+       libavoid/graph.h \
        libavoid/polyutil.h \
+       libavoid/router.h \
        libavoid/shape.h \
+       libavoid/vertices.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -258,6 +306,7 @@ conn-avoid-ref.o: \
        libnr/nr-forward.h \
        libnr/nr-i-coord.h \
        libnr/nr-macros.h \
+       libnr/nr-matrix-fns.h \
        libnr/nr-matrix.h \
        libnr/nr-maybe.h \
        libnr/nr-point-fns.h \
@@ -270,14 +319,25 @@ conn-avoid-ref.o: \
        libnr/nr-scale.h \
        libnr/nr-translate.h \
        libnr/nr-values.h \
+       line-snapper.h \
+       message.h \
+       object-snapper.h \
+       prefs-utils.h \
        round.h \
+       snapped-point.h \
+       snapper.h \
        sp-item.h \
+       sp-metric.h \
+       sp-namedview.h \
+       sp-object-group.h \
        sp-object.h \
        traits/reference.h \
+       ui/view/edit-widget-interface.h \
+       ui/view/view.h \
        util/forward-pointer-iterator.h \
        util/list-container.h \
        util/list.h \
-       util/shared-c-string-ptr.h \
+       util/share.h \
        version.h \
        xml/attribute-record.h \
        xml/composite-node-observer.h \
@@ -319,17 +379,22 @@ connector-context.o: \
        dom/svgtypes.h \
        dom/views.h \
        event-context.h \
+       extension/extension-forward.h \
+       extension/timer.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        inkscape.h \
        knot-enums.h \
        knot.h \
        libavoid/connector.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
+       libavoid/graph.h \
+       libavoid/router.h \
        libavoid/shape.h \
        libavoid/vertices.h \
        libcroco/cr-additional-sel.h \
@@ -370,6 +435,7 @@ connector-context.o: \
        message-context.h \
        message-stack.h \
        message.h \
+       pixmaps/cursor-connector.xpm \
        prefs-utils.h \
        round.h \
        selection.h \
@@ -448,7 +514,7 @@ debug/heap.o: \
        debug/sysv-heap.h \
        gc-alloc.h \
        gc-core.h \
-       util/shared-c-string-ptr.h
+       util/share.h
 
 debug/logger.o: \
        debug/logger.cpp \
@@ -457,13 +523,14 @@ debug/logger.o: \
        debug/simple-event.h \
        gc-alloc.h \
        gc-core.h \
-       util/shared-c-string-ptr.h
+       util/share.h
 
 debug/sysv-heap.o: \
        debug/sysv-heap.cpp \
        debug/heap.h \
        debug/sysv-heap.h \
-       util/shared-c-string-ptr.h
+       gc-core.h \
+       util/share.h
 
 desktop-affine.o: \
        desktop-affine.cpp \
@@ -647,20 +714,12 @@ desktop-style.o: \
        desktop.h \
        display/nr-arena-forward.h \
        document.h \
-       dom/css.h \
-       dom/dom.h \
-       dom/domstring.h \
-       dom/events.h \
-       dom/smil.h \
-       dom/stylesheets.h \
-       dom/svg.h \
-       dom/svgtypes.h \
-       dom/views.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        inkscape.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
@@ -732,6 +791,7 @@ desktop-style.o: \
        sp-use.h \
        style.h \
        svg/css-ostringstream.h \
+       svg/svg-color.h \
        svg/svg-length.h \
        text-tag-attributes.h \
        traits/reference.h \
@@ -768,6 +828,7 @@ desktop.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        grid-snapper.h \
        guide-snapper.h \
        helper/helper-forward.h \
@@ -853,6 +914,7 @@ dialogs/clonetiler.o: \
        color.h \
        decimal-round.h \
        desktop-handles.h \
+       desktop.h \
        dialogs/dialog-events.h \
        dialogs/unclump.h \
        display/display-forward.h \
@@ -874,12 +936,14 @@ dialogs/clonetiler.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        grid-snapper.h \
        guide-snapper.h \
        helper/helper-forward.h \
        helper/unit-menu.h \
        helper/units.h \
        helper/window.h \
+       icon-size.h \
        inkscape.h \
        interface.h \
        libcroco/cr-additional-sel.h \
@@ -944,8 +1008,12 @@ dialogs/clonetiler.o: \
        sp-paint-server.h \
        sp-use.h \
        style.h \
+       svg/svg-color.h \
        svg/svg-length.h \
        traits/reference.h \
+       ui/dialog/dialog.h \
+       ui/view/edit-widget-interface.h \
+       ui/view/view.h \
        ui/widget/button.h \
        ui/widget/color-picker.h \
        ui/widget/color-preview.h \
@@ -954,6 +1022,7 @@ dialogs/clonetiler.o: \
        verbs.h \
        version.h \
        widgets/icon.h \
+       widgets/sp-color-selector.h \
        xml/node.h \
        xml/repr.h \
        xml/sp-css-attr.h
@@ -1001,80 +1070,9 @@ dialogs/dialog-events.o: \
        ui/view/edit-widget-interface.h \
        ui/view/view.h
 
-dialogs/display-settings.o: \
-       dialogs/display-settings.cpp \
-       color.h \
-       decimal-round.h \
-       desktop-handles.h \
-       desktop.h \
-       dialogs/dialog-events.h \
-       display/display-forward.h \
-       document.h \
-       enums.h \
-       forward.h \
-       gc-anchored.h \
-       gc-core.h \
-       gc-finalized.h \
-       gc-managed.h \
-       helper/helper-forward.h \
-       helper/window.h \
-       inkscape.h \
-       interface.h \
-       libcroco/cr-additional-sel.h \
-       libcroco/cr-attr-sel.h \
-       libcroco/cr-cascade.h \
-       libcroco/cr-declaration.h \
-       libcroco/cr-num.h \
-       libcroco/cr-parsing-location.h \
-       libcroco/cr-pseudo.h \
-       libcroco/cr-rgb.h \
-       libcroco/cr-selector.h \
-       libcroco/cr-simple-sel.h \
-       libcroco/cr-statement.h \
-       libcroco/cr-string.h \
-       libcroco/cr-stylesheet.h \
-       libcroco/cr-term.h \
-       libcroco/cr-utils.h \
-       libnr/nr-convex-hull.h \
-       libnr/nr-coord.h \
-       libnr/nr-dim2.h \
-       libnr/nr-forward.h \
-       libnr/nr-i-coord.h \
-       libnr/nr-macros.h \
-       libnr/nr-matrix-fns.h \
-       libnr/nr-matrix.h \
-       libnr/nr-maybe.h \
-       libnr/nr-point-fns.h \
-       libnr/nr-point-matrix-ops.h \
-       libnr/nr-point-ops.h \
-       libnr/nr-point.h \
-       libnr/nr-rect.h \
-       libnr/nr-rotate.h \
-       libnr/nr-scale.h \
-       libnr/nr-translate.h \
-       libnr/nr-values.h \
-       macros.h \
-       message-stack.h \
-       message.h \
-       prefs-utils.h \
-       require-config.h \
-       round.h \
-       selcue.h \
-       selection-chemistry.h \
-       selection.h \
-       sp-marker-loc.h \
-       style.h \
-       traits/reference.h \
-       ui/view/edit-widget-interface.h \
-       ui/view/view.h \
-       ui/widget/button.h \
-       ui/widget/style-swatch.h \
-       unit-constants.h \
-       util/list.h \
-       verbs.h \
-       xml/node.h \
-       xml/repr.h \
-       xml/sp-css-attr.h
+dialogs/eek-color-def.o: \
+       dialogs/eek-color-def.cpp \
+       dialogs/eek-color-def.h
 
 dialogs/eek-preview.o: \
        dialogs/eek-preview.cpp \
@@ -1098,6 +1096,7 @@ dialogs/export.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        grid-snapper.h \
        guide-snapper.h \
        helper/helper-forward.h \
@@ -1175,6 +1174,7 @@ dialogs/extensions.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       icon-size.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -1262,6 +1262,7 @@ dialogs/fill-style.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        gradient-chemistry.h \
        inkscape.h \
        libcroco/cr-additional-sel.h \
@@ -1342,19 +1343,26 @@ dialogs/find.o: \
        display/display-forward.h \
        display/nr-arena-forward.h \
        document.h \
+       extension/extension-forward.h \
+       extension/timer.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        helper/helper-forward.h \
        helper/window.h \
+       icon-size.h \
        inkscape.h \
        interface.h \
        libavoid/connector.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
+       libavoid/graph.h \
+       libavoid/router.h \
        libavoid/shape.h \
+       libavoid/vertices.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -1452,6 +1460,8 @@ dialogs/iconpreview.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
+       icon-size.h \
        inkscape.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
@@ -1598,6 +1608,7 @@ dialogs/item-properties.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        helper/helper-forward.h \
        helper/window.h \
        inkscape.h \
@@ -1655,12 +1666,14 @@ dialogs/layer-properties.o: \
        desktop.h \
        dialogs/layer-properties.h \
        display/display-forward.h \
+       display/nr-arena-forward.h \
        document.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        inkscape.h \
        layer-fns.h \
        libcroco/cr-additional-sel.h \
@@ -1700,6 +1713,7 @@ dialogs/layer-properties.o: \
        message.h \
        round.h \
        selection.h \
+       sp-item.h \
        sp-object.h \
        traits/reference.h \
        ui/dialog/dialog.h \
@@ -1763,6 +1777,7 @@ dialogs/object-properties.o: \
        gc-managed.h \
        helper/helper-forward.h \
        helper/window.h \
+       icon-size.h \
        inkscape-stock.h \
        inkscape.h \
        interface.h \
@@ -1928,6 +1943,7 @@ dialogs/stroke-style.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        gradient-chemistry.h \
        grid-snapper.h \
        guide-snapper.h \
@@ -1935,6 +1951,7 @@ dialogs/stroke-style.o: \
        helper/stock-items.h \
        helper/unit-menu.h \
        helper/units.h \
+       icon-size.h \
        inkscape-stock.h \
        inkscape.h \
        io/sys.h \
@@ -2033,21 +2050,16 @@ dialogs/stroke-style.o: \
 
 dialogs/swatches.o: \
        dialogs/swatches.cpp \
+       color.h \
+       decimal-round.h \
        desktop-handles.h \
        desktop-style.h \
+       dialogs/eek-color-def.h \
        dialogs/eek-preview.h \
        dialogs/swatches.h \
        display/display-forward.h \
+       display/nr-arena-forward.h \
        document.h \
-       dom/css.h \
-       dom/dom.h \
-       dom/domstring.h \
-       dom/events.h \
-       dom/smil.h \
-       dom/stylesheets.h \
-       dom/svg.h \
-       dom/svgtypes.h \
-       dom/views.h \
        extension/db.h \
        extension/extension-forward.h \
        extension/extension.h \
@@ -2056,6 +2068,7 @@ dialogs/swatches.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       icon-size.h \
        inkscape.h \
        io/sys.h \
        libcroco/cr-additional-sel.h \
@@ -2073,17 +2086,38 @@ dialogs/swatches.o: \
        libcroco/cr-stylesheet.h \
        libcroco/cr-term.h \
        libcroco/cr-utils.h \
+       libnr/nr-coord.h \
+       libnr/nr-dim2.h \
        libnr/nr-forward.h \
+       libnr/nr-i-coord.h \
+       libnr/nr-macros.h \
+       libnr/nr-matrix.h \
+       libnr/nr-maybe.h \
+       libnr/nr-point-fns.h \
+       libnr/nr-point-matrix-ops.h \
+       libnr/nr-point-ops.h \
+       libnr/nr-point.h \
+       libnr/nr-rect.h \
+       libnr/nr-rotate.h \
+       libnr/nr-scale.h \
+       libnr/nr-translate.h \
+       libnr/nr-values.h \
        path-prefix.h \
        prefix.h \
        require-config.h \
+       round.h \
+       sp-item.h \
+       sp-object.h \
+       svg/svg-color.h \
        traits/reference.h \
        ui/previewable.h \
        ui/previewfillable.h \
        ui/previewholder.h \
        ui/widget/button.h \
        ui/widget/panel.h \
+       util/forward-pointer-iterator.h \
        util/list.h \
+       version.h \
        xml/node.h \
        xml/repr.h \
        xml/sp-css-attr.h
@@ -2103,8 +2137,10 @@ dialogs/text-edit.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        helper/helper-forward.h \
        helper/window.h \
+       icon-size.h \
        inkscape-stock.h \
        inkscape.h \
        interface.h \
@@ -2192,7 +2228,9 @@ dialogs/tiledialog.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        helper/helper-forward.h \
+       icon-size.h \
        inkscape.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
@@ -2289,8 +2327,10 @@ dialogs/xml-tree.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        helper/helper-forward.h \
        helper/window.h \
+       icon-size.h \
        inkscape-stock.h \
        inkscape.h \
        interface.h \
@@ -2400,6 +2440,7 @@ display/canvas-arena.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        helper/sp-marshal.h \
        libnr/nr-blit.h \
        libnr/nr-coord.h \
@@ -2587,6 +2628,7 @@ display/nr-arena-glyphs.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        libnr/nr-blit.h \
        libnr/nr-coord.h \
        libnr/nr-dim2.h \
@@ -2639,6 +2681,7 @@ display/nr-arena-group.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        libnr/nr-coord.h \
        libnr/nr-dim2.h \
        libnr/nr-forward.h \
@@ -2671,6 +2714,7 @@ display/nr-arena-image.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        libnr/nr-compose-transform.h \
        libnr/nr-coord.h \
        libnr/nr-dim2.h \
@@ -2706,6 +2750,7 @@ display/nr-arena-item.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        libnr/nr-blit.h \
        libnr/nr-coord.h \
        libnr/nr-dim2.h \
@@ -2751,6 +2796,7 @@ display/nr-arena-shape.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
        libavoid/shape.h \
@@ -2805,6 +2851,7 @@ display/nr-arena.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        libnr/nr-blit.h \
        libnr/nr-coord.h \
        libnr/nr-dim2.h \
@@ -3078,6 +3125,40 @@ display/sp-ctrlquadr.o: \
        livarot/livarot-forward.h \
        round.h
 
+document-subset.o: \
+       document-subset.cpp \
+       document-subset.h \
+       document.h \
+       forward.h \
+       gc-anchored.h \
+       gc-core.h \
+       gc-finalized.h \
+       gc-managed.h \
+       libcroco/cr-additional-sel.h \
+       libcroco/cr-attr-sel.h \
+       libcroco/cr-cascade.h \
+       libcroco/cr-declaration.h \
+       libcroco/cr-num.h \
+       libcroco/cr-parsing-location.h \
+       libcroco/cr-pseudo.h \
+       libcroco/cr-rgb.h \
+       libcroco/cr-selector.h \
+       libcroco/cr-simple-sel.h \
+       libcroco/cr-statement.h \
+       libcroco/cr-string.h \
+       libcroco/cr-stylesheet.h \
+       libcroco/cr-term.h \
+       libcroco/cr-utils.h \
+       libnr/nr-forward.h \
+       sp-object.h \
+       traits/copy.h \
+       traits/list-copy.h \
+       traits/reference.h \
+       util/forward-pointer-iterator.h \
+       util/list.h \
+       util/reverse-list.h \
+       version.h
+
 document-undo.o: \
        document-undo.cpp \
        composite-undo-stack-observer.h \
@@ -3138,7 +3219,7 @@ document-undo.o: \
        undo-stack-observer.h \
        util/forward-pointer-iterator.h \
        util/list.h \
-       util/shared-c-string-ptr.h \
+       util/share.h \
        version.h \
        xml/event-fns.h \
        xml/node.h \
@@ -3159,15 +3240,24 @@ document.o: \
        document-private.h \
        document.h \
        enums.h \
+       extension/extension-forward.h \
+       extension/timer.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        helper/units.h \
        inkscape-private.h \
        inkscape.h \
        inkscape_version.h \
+       libavoid/geometry.h \
+       libavoid/geomtypes.h \
+       libavoid/graph.h \
+       libavoid/router.h \
+       libavoid/shape.h \
+       libavoid/vertices.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -3247,6 +3337,7 @@ dom/domimpl.o: \
 
 dom/domstream.o: \
        dom/domstream.cpp \
+       dom/charclass.h \
        dom/dom.h \
        dom/domstream.h \
        dom/domstring.h
@@ -4745,6 +4836,7 @@ dom/uritest.o: \
 
 dom/xmlreader.o: \
        dom/xmlreader.cpp \
+       dom/charclass.h \
        dom/css.h \
        dom/dom.h \
        dom/domimpl.h \
@@ -4774,6 +4866,9 @@ dom/xpathparser.o: \
        dom/domstring.h \
        dom/xpathparser.h
 
+doxygen-main.o: \
+       doxygen-main.cpp
+
 draw-anchor.o: \
        draw-anchor.cpp \
        decimal-round.h \
@@ -4838,15 +4933,21 @@ draw-context.o: \
        draw-anchor.h \
        draw-context.h \
        event-context.h \
+       extension/extension-forward.h \
+       extension/timer.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        libavoid/connector.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
+       libavoid/graph.h \
+       libavoid/router.h \
        libavoid/shape.h \
+       libavoid/vertices.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -4927,15 +5028,6 @@ dropper-context.o: \
        display/nr-arena-item.h \
        display/sp-canvas.h \
        document.h \
-       dom/css.h \
-       dom/dom.h \
-       dom/domstring.h \
-       dom/events.h \
-       dom/smil.h \
-       dom/stylesheets.h \
-       dom/svg.h \
-       dom/svgtypes.h \
-       dom/views.h \
        dropper-context.h \
        event-context.h \
        forward.h \
@@ -4943,6 +5035,7 @@ dropper-context.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        grid-snapper.h \
        guide-snapper.h \
        helper/helper-forward.h \
@@ -4992,6 +5085,7 @@ dropper-context.o: \
        message-context.h \
        message.h \
        object-snapper.h \
+       pixmaps/cursor-dropper.xpm \
        prefs-utils.h \
        round.h \
        selection.h \
@@ -5001,6 +5095,7 @@ dropper-context.o: \
        sp-namedview.h \
        sp-object-group.h \
        sp-object.h \
+       svg/svg-color.h \
        traits/reference.h \
        ui/view/edit-widget-interface.h \
        ui/view/view.h \
@@ -5040,6 +5135,7 @@ dyna-draw-context.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -5081,6 +5177,7 @@ dyna-draw-context.o: \
        macros.h \
        message-context.h \
        message.h \
+       pixmaps/cursor-calligraphy.xpm \
        round.h \
        selection.h \
        sp-item.h \
@@ -5111,6 +5208,7 @@ event-context.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        gradient-drag.h \
        interface.h \
        knot-enums.h \
@@ -5286,11 +5384,11 @@ extension/error-file.o: \
        extension/error-file.h \
        extension/extension-forward.h \
        extension/extension.h \
-       forward.h \
        gc-anchored.h \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       icon-size.h \
        inkscape.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
@@ -5467,6 +5565,7 @@ extension/implementation/script.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        grid-snapper.h \
        guide-snapper.h \
        helper/helper-forward.h \
@@ -5554,6 +5653,7 @@ extension/init.o: \
        extension/internal/grid.h \
        extension/internal/latex-pstricks-out.h \
        extension/internal/latex-pstricks.h \
+       extension/internal/odf.h \
        extension/internal/pov-out.h \
        extension/internal/ps-out.h \
        extension/internal/ps.h \
@@ -5647,12 +5747,14 @@ extension/internal/bluredge.o: \
        extension/extension.h \
        extension/implementation/implementation.h \
        extension/internal/bluredge.h \
+       extension/internal/clear-n_.h \
        extension/system.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        helper/action.h \
        helper/helper-forward.h \
        libcroco/cr-additional-sel.h \
@@ -5718,6 +5820,7 @@ extension/internal/eps-out.o: \
        extension/extension-forward.h \
        extension/extension.h \
        extension/implementation/implementation.h \
+       extension/internal/clear-n_.h \
        extension/internal/eps-out.h \
        extension/output.h \
        extension/print.h \
@@ -5766,6 +5869,7 @@ extension/internal/gdkpixbuf-input.o: \
        extension/extension-forward.h \
        extension/extension.h \
        extension/implementation/implementation.h \
+       extension/internal/clear-n_.h \
        extension/internal/gdkpixbuf-input.h \
        extension/system.h \
        forward.h \
@@ -5830,6 +5934,7 @@ extension/internal/gimpgrad.o: \
        extension/extension-forward.h \
        extension/extension.h \
        extension/implementation/implementation.h \
+       extension/internal/clear-n_.h \
        extension/internal/gimpgrad.h \
        extension/system.h \
        forward.h \
@@ -5859,6 +5964,10 @@ extension/internal/gimpgrad.o: \
        libnr/nr-pixops.h \
        libnr/nr-point.h \
        round.h \
+       streq.h \
+       strneq.h \
+       svg/css-ostringstream.h \
+       svg/svg-color.h \
        traits/reference.h \
        util/list.h \
        xml/node.h \
@@ -5874,6 +5983,7 @@ extension/internal/grid.o: \
        extension/extension-forward.h \
        extension/extension.h \
        extension/implementation/implementation.h \
+       extension/internal/clear-n_.h \
        extension/internal/grid.h \
        extension/system.h \
        forward.h \
@@ -5881,6 +5991,7 @@ extension/internal/grid.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        helper/helper-forward.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
@@ -5943,18 +6054,24 @@ extension/internal/latex-pstricks-out.o: \
        extension/extension-forward.h \
        extension/extension.h \
        extension/implementation/implementation.h \
+       extension/internal/clear-n_.h \
        extension/internal/latex-pstricks-out.h \
        extension/print.h \
        extension/system.h \
+       extension/timer.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        libavoid/connector.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
+       libavoid/graph.h \
+       libavoid/router.h \
        libavoid/shape.h \
+       libavoid/vertices.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -6020,6 +6137,7 @@ extension/internal/latex-pstricks.o: \
        extension/extension-forward.h \
        extension/extension.h \
        extension/implementation/implementation.h \
+       extension/internal/clear-n_.h \
        extension/internal/latex-pstricks.h \
        extension/print.h \
        extension/system.h \
@@ -6077,6 +6195,84 @@ extension/internal/latex-pstricks.o: \
        xml/repr.h \
        xml/sp-css-attr.h
 
+extension/internal/odf.o: \
+       extension/internal/odf.cpp \
+       color.h \
+       decimal-round.h \
+       display/curve.h \
+       display/display-forward.h \
+       display/nr-arena-forward.h \
+       document.h \
+       extension/extension-forward.h \
+       extension/extension.h \
+       extension/implementation/implementation.h \
+       extension/internal/clear-n_.h \
+       extension/internal/odf.h \
+       extension/system.h \
+       extension/timer.h \
+       forward.h \
+       gc-anchored.h \
+       gc-core.h \
+       gc-finalized.h \
+       gc-managed.h \
+       inkscape.h \
+       io/sys.h \
+       libavoid/connector.h \
+       libavoid/geometry.h \
+       libavoid/geomtypes.h \
+       libavoid/graph.h \
+       libavoid/router.h \
+       libavoid/shape.h \
+       libavoid/vertices.h \
+       libcroco/cr-additional-sel.h \
+       libcroco/cr-attr-sel.h \
+       libcroco/cr-cascade.h \
+       libcroco/cr-declaration.h \
+       libcroco/cr-num.h \
+       libcroco/cr-parsing-location.h \
+       libcroco/cr-pseudo.h \
+       libcroco/cr-rgb.h \
+       libcroco/cr-selector.h \
+       libcroco/cr-simple-sel.h \
+       libcroco/cr-statement.h \
+       libcroco/cr-string.h \
+       libcroco/cr-stylesheet.h \
+       libcroco/cr-term.h \
+       libcroco/cr-utils.h \
+       libnr/n-art-bpath.h \
+       libnr/nr-coord.h \
+       libnr/nr-dim2.h \
+       libnr/nr-forward.h \
+       libnr/nr-i-coord.h \
+       libnr/nr-macros.h \
+       libnr/nr-matrix.h \
+       libnr/nr-maybe.h \
+       libnr/nr-path-code.h \
+       libnr/nr-point-fns.h \
+       libnr/nr-point-matrix-ops.h \
+       libnr/nr-point-ops.h \
+       libnr/nr-point.h \
+       libnr/nr-rect.h \
+       libnr/nr-rotate.h \
+       libnr/nr-scale.h \
+       libnr/nr-translate.h \
+       libnr/nr-values.h \
+       round.h \
+       sp-conn-end-pair.h \
+       sp-item.h \
+       sp-marker-loc.h \
+       sp-object.h \
+       sp-path.h \
+       sp-shape.h \
+       style.h \
+       traits/reference.h \
+       util/forward-pointer-iterator.h \
+       util/list.h \
+       version.h \
+       xml/node.h \
+       xml/repr.h \
+       xml/sp-css-attr.h
+
 extension/internal/pov-out.o: \
        extension/internal/pov-out.cpp \
        color.h \
@@ -6088,8 +6284,10 @@ extension/internal/pov-out.o: \
        extension/extension-forward.h \
        extension/extension.h \
        extension/implementation/implementation.h \
+       extension/internal/clear-n_.h \
        extension/internal/pov-out.h \
        extension/system.h \
+       extension/timer.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
@@ -6100,7 +6298,10 @@ extension/internal/pov-out.o: \
        libavoid/connector.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
+       libavoid/graph.h \
+       libavoid/router.h \
        libavoid/shape.h \
+       libavoid/vertices.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -6159,6 +6360,7 @@ extension/internal/ps-out.o: \
        extension/extension-forward.h \
        extension/extension.h \
        extension/implementation/implementation.h \
+       extension/internal/clear-n_.h \
        extension/internal/ps-out.h \
        extension/output.h \
        extension/print.h \
@@ -6211,6 +6413,7 @@ extension/internal/ps.o: \
        extension/extension-forward.h \
        extension/extension.h \
        extension/implementation/implementation.h \
+       extension/internal/clear-n_.h \
        extension/internal/ps.h \
        extension/print.h \
        extension/system.h \
@@ -6219,6 +6422,7 @@ extension/internal/ps.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        io/sys.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
@@ -6307,6 +6511,7 @@ extension/internal/svg.o: \
        dom/views.h \
        extension/extension-forward.h \
        extension/extension.h \
+       extension/internal/clear-n_.h \
        extension/output.h \
        extension/system.h \
        file.h \
@@ -6354,6 +6559,7 @@ extension/internal/svgz.o: \
        dom/views.h \
        extension/extension-forward.h \
        extension/extension.h \
+       extension/internal/clear-n_.h \
        extension/internal/svgz.h \
        extension/system.h \
        gc-anchored.h \
@@ -6392,6 +6598,7 @@ extension/internal/win32.o: \
        extension/extension-forward.h \
        extension/extension.h \
        extension/implementation/implementation.h \
+       extension/internal/clear-n_.h \
        extension/internal/win32.h \
        extension/print.h \
        extension/system.h \
@@ -6400,6 +6607,7 @@ extension/internal/win32.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -6727,6 +6935,7 @@ file.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        grid-snapper.h \
        guide-snapper.h \
        helper/helper-forward.h \
@@ -6942,6 +7151,7 @@ gradient-chemistry.o: \
        sp-text.h \
        sp-tspan.h \
        style.h \
+       svg/svg-color.h \
        svg/svg-length.h \
        text-tag-attributes.h \
        traits/reference.h \
@@ -6971,6 +7181,7 @@ gradient-context.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        gradient-chemistry.h \
        gradient-context.h \
        gradient-drag.h \
@@ -7015,6 +7226,7 @@ gradient-context.o: \
        message-context.h \
        message-stack.h \
        message.h \
+       pixmaps/cursor-gradient.xpm \
        prefs-utils.h \
        round.h \
        selection.h \
@@ -7053,6 +7265,7 @@ gradient-drag.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        gradient-chemistry.h \
        gradient-drag.h \
        knot-enums.h \
@@ -7122,6 +7335,52 @@ gradient-drag.o: \
        xml/repr.h \
        xml/sp-css-attr.h
 
+graphlayout/graphlayout.o: \
+       graphlayout/graphlayout.cpp \
+       conn-avoid-ref.h \
+       decimal-round.h \
+       display/display-forward.h \
+       display/nr-arena-forward.h \
+       extension/extension-forward.h \
+       extension/timer.h \
+       forward.h \
+       graphlayout/graphlayout.h \
+       libavoid/connector.h \
+       libavoid/geometry.h \
+       libavoid/geomtypes.h \
+       libavoid/graph.h \
+       libavoid/router.h \
+       libavoid/shape.h \
+       libavoid/vertices.h \
+       libnr/nr-coord.h \
+       libnr/nr-dim2.h \
+       libnr/nr-forward.h \
+       libnr/nr-i-coord.h \
+       libnr/nr-macros.h \
+       libnr/nr-matrix.h \
+       libnr/nr-maybe.h \
+       libnr/nr-point-fns.h \
+       libnr/nr-point-matrix-ops.h \
+       libnr/nr-point-ops.h \
+       libnr/nr-point.h \
+       libnr/nr-rect.h \
+       libnr/nr-rotate.h \
+       libnr/nr-scale.h \
+       libnr/nr-translate.h \
+       libnr/nr-values.h \
+       round.h \
+       sp-conn-end-pair.h \
+       sp-item-transform.h \
+       sp-item.h \
+       sp-marker-loc.h \
+       sp-object.h \
+       sp-path.h \
+       sp-shape.h \
+       traits/reference.h \
+       util/forward-pointer-iterator.h \
+       util/glib-list-iterators.h \
+       version.h
+
 grid-snapper.o: \
        grid-snapper.cpp \
        decimal-round.h \
@@ -7197,7 +7456,6 @@ help.o: \
        help.cpp \
        extension/extension-forward.h \
        file.h \
-       forward.h \
        help.h \
        path-prefix.h \
        prefix.h \
@@ -7329,7 +7587,6 @@ helper/window.o: \
        decimal-round.h \
        desktop.h \
        event-context.h \
-       forward.h \
        gc-anchored.h \
        gc-core.h \
        gc-finalized.h \
@@ -7391,6 +7648,7 @@ inkscape.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        helper/sp-marshal.h \
        inkscape-private.h \
        inkscape.h \
@@ -7439,19 +7697,22 @@ inkscape.o: \
        ui/view/edit-widget-interface.h \
        ui/view/view.h \
        util/list.h \
-       util/shared-c-string-ptr.h \
+       util/share.h \
        xml/node.h \
        xml/repr.h \
        xml/sp-css-attr.h
 
 interface.o: \
        interface.cpp \
+       color.h \
        decimal-round.h \
        desktop-handles.h \
+       desktop-style.h \
        desktop.h \
        dialogs/dialog-events.h \
        display/display-forward.h \
        display/nr-arena-forward.h \
+       display/sp-canvas.h \
        document.h \
        dom/dom.h \
        dom/domstream.h \
@@ -7466,12 +7727,14 @@ interface.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        grid-snapper.h \
        guide-snapper.h \
        helper/action.h \
        helper/gnome-utils.h \
        helper/helper-forward.h \
        helper/window.h \
+       icon-size.h \
        inkscape-private.h \
        inkscape.h \
        interface.h \
@@ -7504,9 +7767,11 @@ interface.o: \
        libnr/nr-maybe.h \
        libnr/nr-object.h \
        libnr/nr-point-fns.h \
+       libnr/nr-point-l.h \
        libnr/nr-point-matrix-ops.h \
        libnr/nr-point-ops.h \
        libnr/nr-point.h \
+       libnr/nr-rect-l.h \
        libnr/nr-rect.h \
        libnr/nr-rotate.h \
        libnr/nr-scale.h \
@@ -7529,11 +7794,14 @@ interface.o: \
        snapper.h \
        sp-item-group.h \
        sp-item.h \
+       sp-marker-loc.h \
        sp-metric.h \
        sp-namedview.h \
        sp-object-group.h \
        sp-object.h \
+       style.h \
        svg-view-widget.h \
+       svg/svg-color.h \
        traits/reference.h \
        ui/view/edit-widget-interface.h \
        ui/view/view-widget.h \
@@ -7566,6 +7834,14 @@ io/inkscapestream.o: \
        io/inkscapestream.cpp \
        io/inkscapestream.h
 
+io/resource.o: \
+       io/resource.cpp \
+       dom/js/resource.h \
+       inkscape.h \
+       path-prefix.h \
+       prefix.h \
+       require-config.h
+
 io/simple-sax.o: \
        io/simple-sax.cpp \
        io/simple-sax.h
@@ -7762,6 +8038,7 @@ layer-fns.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       layer-fns.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -7805,14 +8082,71 @@ layer-fns.o: \
        xml/repr.h \
        xml/sp-css-attr.h
 
+layer-manager.o: \
+       layer-manager.cpp \
+       decimal-round.h \
+       desktop.h \
+       document-subset.h \
+       document.h \
+       forward.h \
+       gc-anchored.h \
+       gc-core.h \
+       gc-finalized.h \
+       gc-managed.h \
+       gc-soft-ptr.h \
+       layer-manager.h \
+       libcroco/cr-additional-sel.h \
+       libcroco/cr-attr-sel.h \
+       libcroco/cr-cascade.h \
+       libcroco/cr-declaration.h \
+       libcroco/cr-num.h \
+       libcroco/cr-parsing-location.h \
+       libcroco/cr-pseudo.h \
+       libcroco/cr-rgb.h \
+       libcroco/cr-selector.h \
+       libcroco/cr-simple-sel.h \
+       libcroco/cr-statement.h \
+       libcroco/cr-string.h \
+       libcroco/cr-stylesheet.h \
+       libcroco/cr-term.h \
+       libcroco/cr-utils.h \
+       libnr/nr-coord.h \
+       libnr/nr-dim2.h \
+       libnr/nr-forward.h \
+       libnr/nr-i-coord.h \
+       libnr/nr-macros.h \
+       libnr/nr-matrix-fns.h \
+       libnr/nr-matrix.h \
+       libnr/nr-maybe.h \
+       libnr/nr-point-fns.h \
+       libnr/nr-point-matrix-ops.h \
+       libnr/nr-point-ops.h \
+       libnr/nr-point.h \
+       libnr/nr-rect.h \
+       libnr/nr-rotate.h \
+       libnr/nr-scale.h \
+       libnr/nr-translate.h \
+       libnr/nr-values.h \
+       message.h \
+       round.h \
+       sp-object.h \
+       traits/reference.h \
+       ui/view/edit-widget-interface.h \
+       ui/view/view.h \
+       util/forward-pointer-iterator.h \
+       version.h
+
 libavoid/connector.o: \
        libavoid/connector.cpp \
+       extension/extension-forward.h \
+       extension/timer.h \
        libavoid/connector.h \
        libavoid/debug.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
        libavoid/graph.h \
        libavoid/makepath.h \
+       libavoid/router.h \
        libavoid/shape.h \
        libavoid/vertices.h \
        libavoid/visibility.h
@@ -7836,25 +8170,20 @@ libavoid/graph.o: \
        libavoid/geomtypes.h \
        libavoid/graph.h \
        libavoid/polyutil.h \
+       libavoid/router.h \
        libavoid/shape.h \
        libavoid/vertices.h
 
-libavoid/incremental.o: \
-       libavoid/incremental.cpp \
-       libavoid/connector.h \
-       libavoid/geometry.h \
-       libavoid/geomtypes.h \
-       libavoid/graph.h \
-       libavoid/shape.h \
-       libavoid/vertices.h \
-       libavoid/visibility.h
-
 libavoid/makepath.o: \
        libavoid/makepath.cpp \
+       extension/extension-forward.h \
+       extension/timer.h \
        libavoid/connector.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
        libavoid/graph.h \
+       libavoid/makepath.h \
+       libavoid/router.h \
        libavoid/shape.h \
        libavoid/vertices.h
 
@@ -7862,23 +8191,49 @@ libavoid/polyutil.o: \
        libavoid/polyutil.cpp \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
-       libavoid/shape.h
+       libavoid/polyutil.h \
+       libavoid/shape.h \
+       libavoid/vertices.h
+
+libavoid/router.o: \
+       libavoid/router.cpp \
+       extension/extension-forward.h \
+       extension/timer.h \
+       libavoid/connector.h \
+       libavoid/debug.h \
+       libavoid/geometry.h \
+       libavoid/geomtypes.h \
+       libavoid/graph.h \
+       libavoid/polyutil.h \
+       libavoid/router.h \
+       libavoid/shape.h \
+       libavoid/vertices.h \
+       libavoid/visibility.h
 
 libavoid/shape.o: \
        libavoid/shape.cpp \
+       extension/extension-forward.h \
+       extension/timer.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
        libavoid/graph.h \
        libavoid/polyutil.h \
+       libavoid/router.h \
        libavoid/shape.h \
        libavoid/vertices.h
 
 libavoid/static.o: \
        libavoid/static.cpp \
+       extension/extension-forward.h \
+       extension/timer.h \
        libavoid/connector.h \
+       libavoid/debug.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
+       libavoid/graph.h \
+       libavoid/router.h \
        libavoid/shape.h \
+       libavoid/static.h \
        libavoid/vertices.h \
        libavoid/visibility.h
 
@@ -7916,18 +8271,25 @@ libavoid/timer.o: \
 
 libavoid/vertices.o: \
        libavoid/vertices.cpp \
+       extension/extension-forward.h \
+       extension/timer.h \
        libavoid/debug.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
        libavoid/graph.h \
+       libavoid/router.h \
+       libavoid/shape.h \
        libavoid/vertices.h
 
 libavoid/visibility.o: \
        libavoid/visibility.cpp \
+       extension/extension-forward.h \
+       extension/timer.h \
        libavoid/debug.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
        libavoid/graph.h \
+       libavoid/router.h \
        libavoid/shape.h \
        libavoid/vertices.h \
        libavoid/visibility.h
@@ -9131,6 +9493,7 @@ libnrtype/Layout-TNG-Output.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -9544,10 +9907,13 @@ livarot/PathStroke.o: \
 
 livarot/Shape.o: \
        livarot/Shape.cpp \
+       extension/extension-forward.h \
+       extension/timer.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
        libavoid/graph.h \
        libavoid/polyutil.h \
+       libavoid/router.h \
        libavoid/shape.h \
        libavoid/vertices.h
 
@@ -9755,17 +10121,23 @@ node-context.o: \
        display/sp-canvas-util.h \
        display/sp-canvas.h \
        event-context.h \
+       extension/extension-forward.h \
+       extension/timer.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        knot-enums.h \
        knotholder.h \
        libavoid/connector.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
+       libavoid/graph.h \
+       libavoid/router.h \
        libavoid/shape.h \
+       libavoid/vertices.h \
        libnr/nr-convex-hull.h \
        libnr/nr-coord.h \
        libnr/nr-dim2.h \
@@ -9797,6 +10169,8 @@ node-context.o: \
        nodepath.h \
        object-edit.h \
        path-chemistry.h \
+       pixmaps/cursor-node-d.xpm \
+       pixmaps/cursor-node.xpm \
        prefs-utils.h \
        round.h \
        rubberband.h \
@@ -9840,11 +10214,14 @@ nodepath.o: \
        dom/svgtypes.h \
        dom/views.h \
        event-context.h \
+       extension/extension-forward.h \
+       extension/timer.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        grid-snapper.h \
        guide-snapper.h \
        helper/helper-forward.h \
@@ -9856,7 +10233,10 @@ nodepath.o: \
        libavoid/connector.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
+       libavoid/graph.h \
+       libavoid/router.h \
        libavoid/shape.h \
+       libavoid/vertices.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -9943,6 +10323,8 @@ object-edit.o: \
        display/display-forward.h \
        display/nr-arena-forward.h \
        document.h \
+       extension/extension-forward.h \
+       extension/timer.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
@@ -9955,7 +10337,10 @@ object-edit.o: \
        libavoid/connector.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
+       libavoid/graph.h \
+       libavoid/router.h \
        libavoid/shape.h \
+       libavoid/vertices.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -10047,6 +10432,8 @@ object-snapper.o: \
        display/display-forward.h \
        display/nr-arena-forward.h \
        document.h \
+       extension/extension-forward.h \
+       extension/timer.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
@@ -10059,7 +10446,10 @@ object-snapper.o: \
        libavoid/connector.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
+       libavoid/graph.h \
+       libavoid/router.h \
        libavoid/shape.h \
+       libavoid/vertices.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -10130,15 +10520,21 @@ object-ui.o: \
        display/display-forward.h \
        display/nr-arena-forward.h \
        document.h \
+       extension/extension-forward.h \
+       extension/timer.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        libavoid/connector.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
+       libavoid/graph.h \
+       libavoid/router.h \
        libavoid/shape.h \
+       libavoid/vertices.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -10210,16 +10606,22 @@ path-chemistry.o: \
        dom/svg.h \
        dom/svgtypes.h \
        dom/views.h \
+       extension/extension-forward.h \
+       extension/timer.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        inkscape.h \
        libavoid/connector.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
+       libavoid/graph.h \
+       libavoid/router.h \
        libavoid/shape.h \
+       libavoid/vertices.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -10297,11 +10699,14 @@ pen-context.o: \
        draw-anchor.h \
        draw-context.h \
        event-context.h \
+       extension/extension-forward.h \
+       extension/timer.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        grid-snapper.h \
        guide-snapper.h \
        helper/helper-forward.h \
@@ -10309,7 +10714,10 @@ pen-context.o: \
        libavoid/connector.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
+       libavoid/graph.h \
+       libavoid/router.h \
        libavoid/shape.h \
+       libavoid/vertices.h \
        libnr/n-art-bpath.h \
        libnr/nr-convex-hull.h \
        libnr/nr-coord.h \
@@ -10339,6 +10747,7 @@ pen-context.o: \
        message.h \
        object-snapper.h \
        pen-context.h \
+       pixmaps/cursor-pen.xpm \
        prefs-utils.h \
        round.h \
        selection.h \
@@ -10376,15 +10785,21 @@ pencil-context.o: \
        draw-anchor.h \
        draw-context.h \
        event-context.h \
+       extension/extension-forward.h \
+       extension/timer.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        libavoid/connector.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
+       libavoid/graph.h \
+       libavoid/router.h \
        libavoid/shape.h \
+       libavoid/vertices.h \
        libnr/in-svg-plane.h \
        libnr/n-art-bpath.h \
        libnr/nr-convex-hull.h \
@@ -10413,6 +10828,7 @@ pencil-context.o: \
        message.h \
        modifier-fns.h \
        pencil-context.h \
+       pixmaps/cursor-pencil.xpm \
        prefs-utils.h \
        round.h \
        selection.h \
@@ -10436,7 +10852,6 @@ preferences.o: \
        preferences.cpp \
        dialogs/input.h \
        document.h \
-       forward.h \
        gc-anchored.h \
        gc-core.h \
        gc-finalized.h \
@@ -10474,7 +10889,6 @@ prefix.o: \
 prefs-utils.o: \
        prefs-utils.cpp \
        document.h \
-       forward.h \
        gc-anchored.h \
        gc-core.h \
        gc-finalized.h \
@@ -10560,6 +10974,7 @@ rect-context.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        grid-snapper.h \
        guide-snapper.h \
        helper/helper-forward.h \
@@ -10606,6 +11021,7 @@ rect-context.o: \
        message.h \
        object-edit.h \
        object-snapper.h \
+       pixmaps/cursor-rect.xpm \
        prefs-utils.h \
        rect-context.h \
        round.h \
@@ -10657,12 +11073,14 @@ removeoverlap/blocks.o: \
 
 removeoverlap/constraint.o: \
        removeoverlap/constraint.cpp \
+       removeoverlap/block.h \
        removeoverlap/constraint.h \
        removeoverlap/variable.h
 
 removeoverlap/generate-constraints.o: \
        removeoverlap/generate-constraints.cpp \
        isnan.h \
+       removeoverlap/block.h \
        removeoverlap/constraint.h \
        removeoverlap/generate-constraints.h \
        removeoverlap/variable.h
@@ -10675,6 +11093,8 @@ removeoverlap/pairingheap/PairingHeap.o: \
 
 removeoverlap/remove_rectangle_overlap.o: \
        removeoverlap/remove_rectangle_overlap.cpp \
+       removeoverlap/block.h \
+       removeoverlap/blocks.h \
        removeoverlap/constraint.h \
        removeoverlap/generate-constraints.h \
        removeoverlap/solve_VPSC.h \
@@ -10811,6 +11231,7 @@ selcue.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        libnr/nr-convex-hull.h \
        libnr/nr-coord.h \
        libnr/nr-dim2.h \
@@ -10867,6 +11288,7 @@ select-context.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -10906,6 +11328,9 @@ select-context.o: \
        message-context.h \
        message-stack.h \
        message.h \
+       pixmaps/cursor-select-d.xpm \
+       pixmaps/cursor-select-m.xpm \
+       pixmaps/handles.xpm \
        prefs-utils.h \
        round.h \
        rubberband.h \
@@ -10963,6 +11388,7 @@ selection-chemistry.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        grid-snapper.h \
        guide-snapper.h \
        helper/helper-forward.h \
@@ -11024,6 +11450,7 @@ selection-chemistry.o: \
        selection.h \
        snapped-point.h \
        snapper.h \
+       sp-clippath.h \
        sp-defs.h \
        sp-flowregion.h \
        sp-flowtext.h \
@@ -11039,6 +11466,7 @@ selection-chemistry.o: \
        sp-linear-gradient-fns.h \
        sp-marker-loc.h \
        sp-marker.h \
+       sp-mask.h \
        sp-metric.h \
        sp-namedview.h \
        sp-object-group.h \
@@ -11079,11 +11507,21 @@ selection-describer.o: \
        desktop.h \
        display/display-forward.h \
        display/nr-arena-forward.h \
+       extension/extension-forward.h \
+       extension/timer.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
+       libavoid/connector.h \
+       libavoid/geometry.h \
+       libavoid/geomtypes.h \
+       libavoid/graph.h \
+       libavoid/router.h \
+       libavoid/shape.h \
+       libavoid/vertices.h \
        libnr/nr-convex-hull.h \
        libnr/nr-coord.h \
        libnr/nr-dim2.h \
@@ -11110,12 +11548,24 @@ selection-describer.o: \
        round.h \
        selection-describer.h \
        selection.h \
+       sp-anchor.h \
+       sp-conn-end-pair.h \
+       sp-ellipse.h \
        sp-flowtext.h \
+       sp-image.h \
+       sp-item-group.h \
        sp-item.h \
+       sp-line.h \
        sp-marker-loc.h \
        sp-object.h \
        sp-offset.h \
+       sp-path.h \
+       sp-polygon.h \
+       sp-polyline.h \
+       sp-rect.h \
        sp-shape.h \
+       sp-spiral.h \
+       sp-star.h \
        sp-string.h \
        sp-text.h \
        sp-textpath.h \
@@ -11143,6 +11593,7 @@ selection.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        inkscape-private.h \
        inkscape.h \
        libcroco/cr-additional-sel.h \
@@ -11240,6 +11691,7 @@ seltrans.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        grid-snapper.h \
        guide-snapper.h \
        helper/helper-forward.h \
@@ -11319,12 +11771,10 @@ seltrans.o: \
        xml/repr.h \
        xml/sp-css-attr.h
 
-shortcuts-default-xml.o: \
-       shortcuts-default-xml.cpp
-
 shortcuts.o: \
        shortcuts.cpp \
        document.h \
+       dom/js/resource.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
@@ -11332,6 +11782,7 @@ shortcuts.o: \
        gc-managed.h \
        helper/action.h \
        helper/helper-forward.h \
+       io/sys.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -11526,11 +11977,13 @@ sp-clippath.o: \
        sp-clippath.cpp \
        attributes.h \
        bad-uri-exception.h \
+       composite-undo-stack-observer.h \
        decimal-round.h \
        display/nr-arena-forward.h \
        display/nr-arena-group.h \
        display/nr-arena-item.h \
        display/nr-arena.h \
+       document-private.h \
        document.h \
        enums.h \
        forward.h \
@@ -11538,6 +11991,7 @@ sp-clippath.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -11558,6 +12012,7 @@ sp-clippath.o: \
        libnr/nr-forward.h \
        libnr/nr-i-coord.h \
        libnr/nr-macros.h \
+       libnr/nr-matrix-ops.h \
        libnr/nr-matrix.h \
        libnr/nr-maybe.h \
        libnr/nr-object.h \
@@ -11575,15 +12030,21 @@ sp-clippath.o: \
        libnr/nr-values.h \
        round.h \
        sp-clippath.h \
+       sp-defs.h \
+       sp-item-group.h \
        sp-item.h \
        sp-object-group.h \
        sp-object.h \
        sp-paint-server.h \
+       sp-root.h \
+       svg/svg-length.h \
        traits/reference.h \
+       undo-stack-observer.h \
        uri-references.h \
        util/forward-pointer-iterator.h \
        util/list.h \
        version.h \
+       xml/event-fns.h \
        xml/node.h \
        xml/repr.h \
        xml/sp-css-attr.h
@@ -11600,6 +12061,8 @@ sp-conn-end-pair.o: \
        dom/dom.h \
        dom/domstring.h \
        dom/uri.h \
+       extension/extension-forward.h \
+       extension/timer.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
@@ -11608,6 +12071,8 @@ sp-conn-end-pair.o: \
        libavoid/connector.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
+       libavoid/graph.h \
+       libavoid/router.h \
        libavoid/shape.h \
        libavoid/vertices.h \
        libcroco/cr-additional-sel.h \
@@ -11670,6 +12135,8 @@ sp-conn-end.o: \
        dom/dom.h \
        dom/domstring.h \
        dom/uri.h \
+       extension/extension-forward.h \
+       extension/timer.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
@@ -11678,7 +12145,10 @@ sp-conn-end.o: \
        libavoid/connector.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
+       libavoid/graph.h \
+       libavoid/router.h \
        libavoid/shape.h \
+       libavoid/vertices.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -11997,6 +12467,7 @@ sp-flowtext.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        inkscape.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
@@ -12172,6 +12643,7 @@ sp-gradient.o: \
        sp-stop.h \
        streq.h \
        svg/css-ostringstream.h \
+       svg/svg-color.h \
        svg/svg-length.h \
        traits/reference.h \
        undo-stack-observer.h \
@@ -12259,6 +12731,9 @@ sp-guide.o: \
 sp-image.o: \
        sp-image.cpp \
        attributes.h \
+       brokenimage.xpm \
+       color-profile-fns.h \
+       color-profile.h \
        decimal-round.h \
        display/nr-arena-forward.h \
        display/nr-arena-image.h \
@@ -12273,6 +12748,7 @@ sp-image.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        io/sys.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
@@ -12311,6 +12787,7 @@ sp-image.o: \
        libnr/nr-scale.h \
        libnr/nr-translate.h \
        libnr/nr-values.h \
+       prefs-utils.h \
        round.h \
        sp-image.h \
        sp-item.h \
@@ -12349,6 +12826,7 @@ sp-item-group.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -12568,6 +13046,7 @@ sp-item.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        gradient-chemistry.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
@@ -12738,6 +13217,7 @@ sp-marker.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -12797,11 +13277,13 @@ sp-mask.o: \
        sp-mask.cpp \
        attributes.h \
        bad-uri-exception.h \
+       composite-undo-stack-observer.h \
        decimal-round.h \
        display/nr-arena-forward.h \
        display/nr-arena-group.h \
        display/nr-arena-item.h \
        display/nr-arena.h \
+       document-private.h \
        document.h \
        enums.h \
        forward.h \
@@ -12809,6 +13291,7 @@ sp-mask.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -12845,16 +13328,22 @@ sp-mask.o: \
        libnr/nr-translate.h \
        libnr/nr-values.h \
        round.h \
+       sp-defs.h \
+       sp-item-group.h \
        sp-item.h \
        sp-mask.h \
        sp-object-group.h \
        sp-object.h \
        sp-paint-server.h \
+       sp-root.h \
+       svg/svg-length.h \
        traits/reference.h \
+       undo-stack-observer.h \
        uri-references.h \
        util/forward-pointer-iterator.h \
        util/list.h \
        version.h \
+       xml/event-fns.h \
        xml/node.h \
        xml/repr.h \
        xml/sp-css-attr.h
@@ -12921,6 +13410,7 @@ sp-metrics.o: \
 sp-namedview.o: \
        sp-namedview.cpp \
        attributes.h \
+       conn-avoid-ref.h \
        decimal-round.h \
        desktop-events.h \
        desktop-handles.h \
@@ -12930,15 +13420,6 @@ sp-namedview.o: \
        display/nr-arena-forward.h \
        display/sp-canvas.h \
        document.h \
-       dom/css.h \
-       dom/dom.h \
-       dom/domstring.h \
-       dom/events.h \
-       dom/smil.h \
-       dom/stylesheets.h \
-       dom/svg.h \
-       dom/svgtypes.h \
-       dom/views.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
@@ -12998,6 +13479,7 @@ sp-namedview.o: \
        sp-namedview.h \
        sp-object-group.h \
        sp-object.h \
+       svg/svg-color.h \
        traits/reference.h \
        ui/view/edit-widget-interface.h \
        ui/view/view.h \
@@ -13045,11 +13527,14 @@ sp-object-group.o: \
 sp-object-repr.o: \
        sp-object-repr.cpp \
        bad-uri-exception.h \
+       color-profile-fns.h \
        decimal-round.h \
        display/display-forward.h \
        display/nr-arena-forward.h \
        document.h \
        enums.h \
+       extension/extension-forward.h \
+       extension/timer.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
@@ -13058,7 +13543,10 @@ sp-object-repr.o: \
        libavoid/connector.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
+       libavoid/graph.h \
+       libavoid/router.h \
        libavoid/shape.h \
+       libavoid/vertices.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -13211,7 +13699,7 @@ sp-object.o: \
        traits/reference.h \
        util/forward-pointer-iterator.h \
        util/list.h \
-       util/shared-c-string-ptr.h \
+       util/share.h \
        version.h \
        xml/node-event-vector.h \
        xml/node-fns.h \
@@ -13356,6 +13844,8 @@ sp-path.o: \
        dom/svg.h \
        dom/svgtypes.h \
        dom/views.h \
+       extension/extension-forward.h \
+       extension/timer.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
@@ -13364,7 +13854,10 @@ sp-path.o: \
        libavoid/connector.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
+       libavoid/graph.h \
+       libavoid/router.h \
        libavoid/shape.h \
+       libavoid/vertices.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -13443,6 +13936,7 @@ sp-pattern.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -13715,6 +14209,7 @@ sp-root.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        inkscape_version.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
@@ -13789,16 +14284,21 @@ sp-shape.o: \
        extension/extension-forward.h \
        extension/extension.h \
        extension/print.h \
+       extension/timer.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        gnuc-attribute.h \
        libavoid/connector.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
+       libavoid/graph.h \
+       libavoid/router.h \
        libavoid/shape.h \
+       libavoid/vertices.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -14168,6 +14668,7 @@ sp-symbol.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -14249,6 +14750,7 @@ sp-text.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        grid-snapper.h \
        guide-snapper.h \
        helper/helper-forward.h \
@@ -14337,6 +14839,7 @@ sp-tspan.o: \
        sp-tspan.cpp \
        attributes.h \
        bad-uri-exception.h \
+       color.h \
        decimal-round.h \
        display/nr-arena-forward.h \
        document.h \
@@ -14369,6 +14872,7 @@ sp-tspan.o: \
        libnr/nr-forward.h \
        libnr/nr-i-coord.h \
        libnr/nr-macros.h \
+       libnr/nr-matrix-fns.h \
        libnr/nr-matrix-ops.h \
        libnr/nr-matrix.h \
        libnr/nr-maybe.h \
@@ -14388,13 +14892,16 @@ sp-tspan.o: \
        livarot/livarot-forward.h \
        round.h \
        sp-item.h \
+       sp-marker-loc.h \
        sp-object.h \
        sp-string.h \
        sp-text.h \
        sp-textpath.h \
        sp-tspan.h \
        sp-use-reference.h \
+       style.h \
        svg/svg-length.h \
+       text-editing.h \
        text-tag-attributes.h \
        traits/reference.h \
        uri-references.h \
@@ -14474,6 +14981,7 @@ sp-use.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -14552,6 +15060,7 @@ spiral-context.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        grid-snapper.h \
        guide-snapper.h \
        helper/helper-forward.h \
@@ -14598,6 +15107,7 @@ spiral-context.o: \
        message.h \
        object-edit.h \
        object-snapper.h \
+       pixmaps/cursor-spiral.xpm \
        prefs-utils.h \
        round.h \
        selection.h \
@@ -14646,16 +15156,22 @@ splivarot.o: \
        dom/svg.h \
        dom/svgtypes.h \
        dom/views.h \
+       extension/extension-forward.h \
+       extension/timer.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        inkscape.h \
        libavoid/connector.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
+       libavoid/graph.h \
+       libavoid/router.h \
        libavoid/shape.h \
+       libavoid/vertices.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -14714,6 +15230,7 @@ splivarot.o: \
        sp-shape.h \
        sp-string.h \
        sp-text.h \
+       splivarot.h \
        style.h \
        svg/svg-length.h \
        text-tag-attributes.h \
@@ -14746,6 +15263,7 @@ star-context.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        grid-snapper.h \
        guide-snapper.h \
        helper/helper-forward.h \
@@ -14792,6 +15310,7 @@ star-context.o: \
        message.h \
        object-edit.h \
        object-snapper.h \
+       pixmaps/cursor-star.xpm \
        prefs-utils.h \
        round.h \
        selection.h \
@@ -14931,6 +15450,8 @@ style.o: \
        strneq.h \
        style.h \
        svg/css-ostringstream.h \
+       svg/svg-color.h \
+       svg/svg-icc-color.h \
        traits/reference.h \
        unit-constants.h \
        uri-references.h \
@@ -14955,6 +15476,7 @@ svg-view-widget.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -15011,6 +15533,7 @@ svg-view.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -15125,15 +15648,9 @@ svg/svg-affine.o: \
 
 svg/svg-color.o: \
        svg/svg-color.cpp \
-       dom/css.h \
-       dom/dom.h \
-       dom/domstring.h \
-       dom/events.h \
-       dom/smil.h \
-       dom/stylesheets.h \
-       dom/svg.h \
-       dom/svgtypes.h \
-       dom/views.h
+       strneq.h \
+       svg/svg-color.h \
+       svg/svg-icc-color.h
 
 svg/svg-length.o: \
        svg/svg-length.cpp \
@@ -15177,6 +15694,7 @@ text-chemistry.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        inkscape.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
@@ -15262,6 +15780,7 @@ text-context.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        grid-snapper.h \
        guide-snapper.h \
        helper/helper-forward.h \
@@ -15312,6 +15831,8 @@ text-context.o: \
        message.h \
        object-edit.h \
        object-snapper.h \
+       pixmaps/cursor-text-insert.xpm \
+       pixmaps/cursor-text.xpm \
        prefs-utils.h \
        round.h \
        rubberband.h \
@@ -15413,7 +15934,7 @@ text-editing.o: \
        unit-constants.h \
        util/forward-pointer-iterator.h \
        util/list.h \
-       util/shared-c-string-ptr.h \
+       util/share.h \
        version.h \
        xml/attribute-record.h \
        xml/node.h \
@@ -15435,6 +15956,8 @@ tools-switch.o: \
        dropper-context.h \
        dyna-draw-context.h \
        event-context.h \
+       extension/extension-forward.h \
+       extension/timer.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
@@ -15446,7 +15969,10 @@ tools-switch.o: \
        libavoid/connector.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
+       libavoid/graph.h \
+       libavoid/router.h \
        libavoid/shape.h \
+       libavoid/vertices.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -15483,6 +16009,9 @@ tools-switch.o: \
        libnr/nr-translate.h \
        libnr/nr-values.h \
        libnrtype/Layout-TNG.h \
+       livarot/LivarotDefs.h \
+       livarot/Path.h \
+       livarot/livarot-forward.h \
        message-context.h \
        message.h \
        node-context.h \
@@ -15591,6 +16120,8 @@ trace/potrace/inkscape-potrace.o: \
        dom/domstream.h \
        dom/domstring.h \
        dom/stringstream.h \
+       extension/extension-forward.h \
+       extension/timer.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
@@ -15600,7 +16131,10 @@ trace/potrace/inkscape-potrace.o: \
        libavoid/connector.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
+       libavoid/graph.h \
+       libavoid/router.h \
        libavoid/shape.h \
+       libavoid/vertices.h \
        libnr/nr-coord.h \
        libnr/nr-dim2.h \
        libnr/nr-forward.h \
@@ -15671,6 +16205,10 @@ trace/potrace/trace.o: \
        trace/potrace/lists.h \
        trace/potrace/progress.h
 
+trace/siox.o: \
+       trace/siox.cpp \
+       trace/siox.h
+
 trace/trace.o: \
        trace/trace.cpp \
        decimal-round.h \
@@ -15764,7 +16302,10 @@ ui/dialog/align-and-distribute.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
+       graphlayout/graphlayout.h \
        helper/helper-forward.h \
+       icon-size.h \
        inkscape.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
@@ -15802,6 +16343,9 @@ ui/dialog/align-and-distribute.o: \
        libnr/nr-translate.h \
        libnr/nr-values.h \
        libnrtype/Layout-TNG.h \
+       livarot/LivarotDefs.h \
+       livarot/Path.h \
+       livarot/livarot-forward.h \
        macros.h \
        node-context.h \
        nodepath.h \
@@ -15838,9 +16382,31 @@ ui/dialog/dialog-manager.o: \
        dialogs/export.h \
        dialogs/find.h \
        dialogs/tiledialog.h \
+       document.h \
+       extension/extension-forward.h \
+       extension/extension.h \
        forward.h \
+       gc-anchored.h \
+       gc-core.h \
+       gc-finalized.h \
+       gc-managed.h \
        helper/helper-forward.h \
        helper/unit-menu.h \
+       libcroco/cr-additional-sel.h \
+       libcroco/cr-attr-sel.h \
+       libcroco/cr-cascade.h \
+       libcroco/cr-declaration.h \
+       libcroco/cr-num.h \
+       libcroco/cr-parsing-location.h \
+       libcroco/cr-pseudo.h \
+       libcroco/cr-rgb.h \
+       libcroco/cr-selector.h \
+       libcroco/cr-simple-sel.h \
+       libcroco/cr-statement.h \
+       libcroco/cr-string.h \
+       libcroco/cr-stylesheet.h \
+       libcroco/cr-term.h \
+       libcroco/cr-utils.h \
        libnr/nr-coord.h \
        libnr/nr-dim2.h \
        libnr/nr-forward.h \
@@ -15859,6 +16425,7 @@ ui/dialog/dialog-manager.o: \
        libnr/nr-values.h \
        require-config.h \
        round.h \
+       traits/reference.h \
        ui/dialog/align-and-distribute.h \
        ui/dialog/dialog-manager.h \
        ui/dialog/dialog.h \
@@ -15892,7 +16459,11 @@ ui/dialog/dialog-manager.o: \
        ui/widget/scalar-unit.h \
        ui/widget/scalar.h \
        ui/widget/tolerance-slider.h \
-       verbs.h
+       util/list.h \
+       verbs.h \
+       xml/node.h \
+       xml/repr.h \
+       xml/sp-css-attr.h
 
 ui/dialog/dialog.o: \
        ui/dialog/dialog.cpp \
@@ -16020,6 +16591,7 @@ ui/dialog/document-metadata.o: \
 
 ui/dialog/document-properties.o: \
        ui/dialog/document-properties.cpp \
+       color.h \
        decimal-round.h \
        desktop-handles.h \
        desktop.h \
@@ -16099,6 +16671,7 @@ ui/dialog/document-properties.o: \
        util/list.h \
        verbs.h \
        version.h \
+       widgets/sp-color-selector.h \
        xml/node-event-vector.h \
        xml/node.h
 
@@ -16120,6 +16693,7 @@ ui/dialog/export.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        grid-snapper.h \
        guide-snapper.h \
        helper/helper-forward.h \
@@ -16188,12 +16762,43 @@ ui/dialog/export.o: \
 
 ui/dialog/extension-editor.o: \
        ui/dialog/extension-editor.cpp \
+       document.h \
+       extension/db.h \
+       extension/extension-forward.h \
+       extension/extension.h \
        forward.h \
+       gc-anchored.h \
+       gc-core.h \
+       gc-finalized.h \
+       gc-managed.h \
        helper/helper-forward.h \
+       interface.h \
+       libcroco/cr-additional-sel.h \
+       libcroco/cr-attr-sel.h \
+       libcroco/cr-cascade.h \
+       libcroco/cr-declaration.h \
+       libcroco/cr-num.h \
+       libcroco/cr-parsing-location.h \
+       libcroco/cr-pseudo.h \
+       libcroco/cr-rgb.h \
+       libcroco/cr-selector.h \
+       libcroco/cr-simple-sel.h \
+       libcroco/cr-statement.h \
+       libcroco/cr-string.h \
+       libcroco/cr-stylesheet.h \
+       libcroco/cr-term.h \
+       libcroco/cr-utils.h \
+       libnr/nr-forward.h \
+       prefs-utils.h \
        require-config.h \
+       traits/reference.h \
        ui/dialog/dialog.h \
        ui/dialog/extension-editor.h \
-       verbs.h
+       util/list.h \
+       verbs.h \
+       xml/node.h \
+       xml/repr.h \
+       xml/sp-css-attr.h
 
 ui/dialog/fill-and-stroke.o: \
        ui/dialog/fill-and-stroke.cpp \
@@ -16214,19 +16819,26 @@ ui/dialog/find.o: \
        display/display-forward.h \
        display/nr-arena-forward.h \
        document.h \
+       extension/extension-forward.h \
+       extension/timer.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        helper/helper-forward.h \
        helper/window.h \
+       icon-size.h \
        inkscape.h \
        interface.h \
        libavoid/connector.h \
        libavoid/geometry.h \
        libavoid/geomtypes.h \
+       libavoid/graph.h \
+       libavoid/router.h \
        libavoid/shape.h \
+       libavoid/vertices.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -16313,6 +16925,7 @@ ui/dialog/inkscape-preferences.o: \
        color.h \
        decimal-round.h \
        desktop-handles.h \
+       desktop.h \
        display/display-forward.h \
        document.h \
        enums.h \
@@ -16321,6 +16934,7 @@ ui/dialog/inkscape-preferences.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        helper/helper-forward.h \
        inkscape.h \
        libcroco/cr-additional-sel.h \
@@ -16344,6 +16958,7 @@ ui/dialog/inkscape-preferences.o: \
        libnr/nr-forward.h \
        libnr/nr-i-coord.h \
        libnr/nr-macros.h \
+       libnr/nr-matrix-fns.h \
        libnr/nr-matrix.h \
        libnr/nr-maybe.h \
        libnr/nr-point-fns.h \
@@ -16368,7 +16983,11 @@ ui/dialog/inkscape-preferences.o: \
        traits/reference.h \
        ui/dialog/dialog.h \
        ui/dialog/inkscape-preferences.h \
+       ui/view/edit-widget-interface.h \
+       ui/view/view.h \
+       ui/widget/button.h \
        ui/widget/preferences-widget.h \
+       ui/widget/style-swatch.h \
        util/list.h \
        verbs.h \
        xml/node.h \
@@ -16393,7 +17012,7 @@ ui/dialog/memory.o: \
        require-config.h \
        ui/dialog/dialog.h \
        ui/dialog/memory.h \
-       util/shared-c-string-ptr.h \
+       util/share.h \
        verbs.h
 
 ui/dialog/messages.o: \
@@ -16454,6 +17073,7 @@ ui/dialog/transformation.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        helper/helper-forward.h \
        helper/unit-menu.h \
        inkscape.h \
@@ -16541,6 +17161,7 @@ ui/icons.o: \
 
 ui/previewholder.o: \
        ui/previewholder.cpp \
+       icon-size.h \
        ui/previewable.h \
        ui/previewfillable.h \
        ui/previewholder.h
@@ -16811,20 +17432,12 @@ ui/view/desktop-style.o: \
        desktop.h \
        display/nr-arena-forward.h \
        document.h \
-       dom/css.h \
-       dom/dom.h \
-       dom/domstring.h \
-       dom/events.h \
-       dom/smil.h \
-       dom/stylesheets.h \
-       dom/svg.h \
-       dom/svgtypes.h \
-       dom/views.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        inkscape.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
@@ -16896,6 +17509,7 @@ ui/view/desktop-style.o: \
        sp-use.h \
        style.h \
        svg/css-ostringstream.h \
+       svg/svg-color.h \
        svg/svg-length.h \
        text-tag-attributes.h \
        traits/reference.h \
@@ -16932,6 +17546,7 @@ ui/view/desktop.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        grid-snapper.h \
        guide-snapper.h \
        helper/helper-forward.h \
@@ -17219,7 +17834,6 @@ ui/widget/entity-entry.o: \
        ui/widget/entity-entry.cpp \
        dialogs/rdf.h \
        document.h \
-       forward.h \
        gc-anchored.h \
        gc-core.h \
        gc-finalized.h \
@@ -17256,7 +17870,6 @@ ui/widget/imageicon.o: \
        ui/widget/imageicon.cpp \
        display/display-forward.h \
        document.h \
-       forward.h \
        gc-anchored.h \
        gc-core.h \
        gc-finalized.h \
@@ -17284,6 +17897,7 @@ ui/widget/imageicon.o: \
 
 ui/widget/labelled.o: \
        ui/widget/labelled.cpp \
+       icon-size.h \
        ui/widget/labelled.h \
        widgets/icon.h
 
@@ -17291,7 +17905,6 @@ ui/widget/licensor.o: \
        ui/widget/licensor.cpp \
        dialogs/rdf.h \
        document.h \
-       forward.h \
        gc-anchored.h \
        gc-core.h \
        gc-finalized.h \
@@ -17361,6 +17974,7 @@ ui/widget/page-sizer.o: \
 
 ui/widget/panel.o: \
        ui/widget/panel.cpp \
+       icon-size.h \
        prefs-utils.h \
        ui/previewable.h \
        ui/previewfillable.h \
@@ -17380,6 +17994,7 @@ ui/widget/preferences-widget.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        helper/helper-forward.h \
        inkscape.h \
        libcroco/cr-additional-sel.h \
@@ -17434,21 +18049,15 @@ ui/widget/preferences-widget.o: \
 
 ui/widget/registered-widget.o: \
        ui/widget/registered-widget.cpp \
+       color.h \
        decimal-round.h \
        desktop-handles.h \
        display/display-forward.h \
        document.h \
-       dom/css.h \
        dom/dom.h \
        dom/domstream.h \
        dom/domstring.h \
-       dom/events.h \
-       dom/smil.h \
        dom/stringstream.h \
-       dom/stylesheets.h \
-       dom/svg.h \
-       dom/svgtypes.h \
-       dom/views.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
@@ -17488,7 +18097,9 @@ ui/widget/registered-widget.o: \
        sp-namedview.h \
        sp-object-group.h \
        sp-object.h \
+       svg/svg-color.h \
        traits/reference.h \
+       ui/dialog/dialog.h \
        ui/widget/button.h \
        ui/widget/color-picker.h \
        ui/widget/color-preview.h \
@@ -17500,6 +18111,7 @@ ui/widget/registered-widget.o: \
        util/forward-pointer-iterator.h \
        util/list.h \
        version.h \
+       widgets/sp-color-selector.h \
        xml/node.h \
        xml/repr.h \
        xml/sp-css-attr.h
@@ -17605,21 +18217,13 @@ ui/widget/selected-style.o: \
        dialogs/object-properties.h \
        display/display-forward.h \
        document.h \
-       dom/css.h \
-       dom/dom.h \
-       dom/domstring.h \
-       dom/events.h \
-       dom/smil.h \
-       dom/stylesheets.h \
-       dom/svg.h \
-       dom/svgtypes.h \
-       dom/views.h \
        enums.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        helper/units.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
@@ -17669,6 +18273,7 @@ ui/widget/selected-style.o: \
        sp-radial-gradient-fns.h \
        style.h \
        svg/css-ostringstream.h \
+       svg/svg-color.h \
        svg/svg-length.h \
        traits/reference.h \
        ui/view/edit-widget-interface.h \
@@ -17777,6 +18382,7 @@ ui/widget/svg-canvas.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        libnr/nr-coord.h \
        libnr/nr-dim2.h \
        libnr/nr-forward.h \
@@ -17969,10 +18575,10 @@ util/list-container-test.o: \
        util/list-container.h \
        util/list.h
 
-util/shared-c-string-ptr.o: \
-       util/shared-c-string-ptr.cpp \
+util/share.o: \
+       util/share.cpp \
        gc-core.h \
-       util/shared-c-string-ptr.h
+       util/share.h
 
 util/units.o: \
        util/units.cpp \
@@ -17987,7 +18593,7 @@ verbs.o: \
        desktop-handles.h \
        desktop.h \
        dialogs/clonetiler.h \
-       dialogs/display-settings.h \
+       dialogs/eek-color-def.h \
        dialogs/extensions.h \
        dialogs/find.h \
        dialogs/iconpreview.h \
@@ -18011,11 +18617,13 @@ verbs.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        grid-snapper.h \
        guide-snapper.h \
        help.h \
        helper/action.h \
        helper/helper-forward.h \
+       icon-size.h \
        inkscape-private.h \
        inkscape.h \
        interface.h \
@@ -18087,6 +18695,7 @@ verbs.o: \
        traits/reference.h \
        ui/dialog/dialog-manager.h \
        ui/dialog/dialog.h \
+       ui/dialog/inkscape-preferences.h \
        ui/dialog/whiteboard-connect.h \
        ui/dialog/whiteboard-sharewithchat.h \
        ui/dialog/whiteboard-sharewithuser.h \
@@ -18098,6 +18707,7 @@ verbs.o: \
        ui/view/view.h \
        ui/widget/button.h \
        ui/widget/panel.h \
+       ui/widget/preferences-widget.h \
        util/forward-pointer-iterator.h \
        util/list.h \
        verbs.h \
@@ -18152,10 +18762,12 @@ widgets/dash-selector.o: \
 
 widgets/desktop-widget.o: \
        widgets/desktop-widget.cpp \
+       conn-avoid-ref.h \
        decimal-round.h \
        desktop-events.h \
        desktop-handles.h \
        desktop.h \
+       dialogs/eek-color-def.h \
        dialogs/swatches.h \
        display/canvas-arena.h \
        display/display-forward.h \
@@ -18173,11 +18785,13 @@ widgets/desktop-widget.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        grid-snapper.h \
        guide-snapper.h \
        helper/action.h \
        helper/helper-forward.h \
        helper/units.h \
+       icon-size.h \
        inkscape-private.h \
        inkscape.h \
        interface.h \
@@ -18420,6 +19034,7 @@ widgets/gradient-toolbar.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        gradient-chemistry.h \
        gradient-context.h \
        gradient-drag.h \
@@ -18512,15 +19127,6 @@ widgets/gradient-vector.o: \
        display/nr-arena-forward.h \
        document-private.h \
        document.h \
-       dom/css.h \
-       dom/dom.h \
-       dom/domstring.h \
-       dom/events.h \
-       dom/smil.h \
-       dom/stylesheets.h \
-       dom/svg.h \
-       dom/svgtypes.h \
-       dom/views.h \
        enums.h \
        forward.h \
        gc-anchored.h \
@@ -18581,6 +19187,7 @@ widgets/gradient-vector.o: \
        sp-stop-fns.h \
        sp-stop.h \
        svg/css-ostringstream.h \
+       svg/svg-color.h \
        svg/svg-length.h \
        traits/reference.h \
        undo-stack-observer.h \
@@ -18611,6 +19218,8 @@ widgets/icon.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
+       icon-size.h \
        inkscape.h \
        io/sys.h \
        libcroco/cr-additional-sel.h \
@@ -18675,6 +19284,9 @@ widgets/layer-selector.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
+       icon-size.h \
+       layer-fns.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
        libcroco/cr-cascade.h \
@@ -18740,21 +19352,13 @@ widgets/paint-selector.o: \
        display/nr-arena-forward.h \
        document-private.h \
        document.h \
-       dom/css.h \
-       dom/dom.h \
-       dom/domstring.h \
-       dom/events.h \
-       dom/smil.h \
-       dom/stylesheets.h \
-       dom/svg.h \
-       dom/svgtypes.h \
-       dom/views.h \
        enums.h \
        forward.h \
        gc-anchored.h \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       icon-size.h \
        inkscape-stock.h \
        inkscape.h \
        libcroco/cr-additional-sel.h \
@@ -18809,6 +19413,7 @@ widgets/paint-selector.o: \
        sp-root.h \
        style.h \
        svg/css-ostringstream.h \
+       svg/svg-color.h \
        svg/svg-length.h \
        traits/reference.h \
        undo-stack-observer.h \
@@ -18913,12 +19518,14 @@ widgets/select-toolbar.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        grid-snapper.h \
        guide-snapper.h \
        helper/action.h \
        helper/helper-forward.h \
        helper/unit-menu.h \
        helper/units.h \
+       icon-size.h \
        inkscape.h \
        libcroco/cr-additional-sel.h \
        libcroco/cr-attr-sel.h \
@@ -18980,6 +19587,7 @@ widgets/select-toolbar.o: \
        util/list.h \
        verbs.h \
        version.h \
+       widgets/icon.h \
        widgets/sp-widget.h \
        widgets/spinbutton-events.h \
        widgets/spw-utilities.h \
@@ -19219,7 +19827,6 @@ widgets/sp-xmlview-tree.o: \
 widgets/spinbutton-events.o: \
        widgets/spinbutton-events.cpp \
        event-context.h \
-       forward.h \
        widgets/sp-widget.h \
        widgets/widget-sizes.h
 
@@ -19231,6 +19838,7 @@ widgets/spw-utilities.o: \
        gc-core.h \
        gc-finalized.h \
        gc-managed.h \
+       gc-soft-ptr.h \
        helper/helper-forward.h \
        helper/unit-menu.h \
        libnr/nr-convex-hull.h \
@@ -19284,7 +19892,7 @@ xml/composite-node-observer.o: \
        traits/reference.h \
        util/list-container.h \
        util/list.h \
-       util/shared-c-string-ptr.h \
+       util/share.h \
        xml/composite-node-observer.h \
        xml/node-event-vector.h \
        xml/node-observer.h \
@@ -19333,7 +19941,7 @@ xml/event.o: \
        traits/reference.h \
        util/list.h \
        util/reverse-list.h \
-       util/shared-c-string-ptr.h \
+       util/share.h \
        xml/event-fns.h \
        xml/node-observer.h
 
@@ -19342,7 +19950,7 @@ xml/log-builder.o: \
        debug/event.h \
        gc-core.h \
        gc-managed.h \
-       util/shared-c-string-ptr.h \
+       util/share.h \
        xml/event-fns.h \
        xml/log-builder.h \
        xml/node-observer.h
@@ -19388,7 +19996,7 @@ xml/repr-css.o: \
        traits/reference.h \
        util/list-container.h \
        util/list.h \
-       util/shared-c-string-ptr.h \
+       util/share.h \
        xml/attribute-record.h \
        xml/composite-node-observer.h \
        xml/node-observer.h \
@@ -19431,7 +20039,7 @@ xml/repr-io.o: \
        libnr/nr-forward.h \
        traits/reference.h \
        util/list.h \
-       util/shared-c-string-ptr.h \
+       util/share.h \
        xml/attribute-record.h \
        xml/node.h \
        xml/repr.h \
@@ -19530,7 +20138,7 @@ xml/repr.o: \
        traits/reference.h \
        util/list-container.h \
        util/list.h \
-       util/shared-c-string-ptr.h \
+       util/share.h \
        xml/attribute-record.h \
        xml/comment-node.h \
        xml/composite-node-observer.h \
@@ -19570,7 +20178,7 @@ xml/simple-document.o: \
        traits/reference.h \
        util/list-container.h \
        util/list.h \
-       util/shared-c-string-ptr.h \
+       util/share.h \
        xml/attribute-record.h \
        xml/composite-node-observer.h \
        xml/log-builder.h \
@@ -19611,7 +20219,7 @@ xml/simple-node.o: \
        traits/reference.h \
        util/list-container.h \
        util/list.h \
-       util/shared-c-string-ptr.h \
+       util/share.h \
        xml/attribute-record.h \
        xml/composite-node-observer.h \
        xml/node-event-vector.h \
@@ -19631,7 +20239,7 @@ xml/simple-session.o: \
        traits/reference.h \
        util/list-container.h \
        util/list.h \
-       util/shared-c-string-ptr.h \
+       util/share.h \
        xml/attribute-record.h \
        xml/comment-node.h \
        xml/composite-node-observer.h \
@@ -19675,6 +20283,8 @@ zoom-context.o: \
        libnr/nr-values.h \
        macros.h \
        message.h \
+       pixmaps/cursor-zoom-out.xpm \
+       pixmaps/cursor-zoom.xpm \
        prefs-utils.h \
        round.h \
        rubberband.h \