Reverted changes to r15024 after many building problems

(bzr r15027)

25 files changed, 186 insertions, 12 deletions

diff --git a/src/ui/tools/arc-tool.cpp b/src/ui/tools/arc-tool.cpp
index 6652f7ab5..c6a9bb23a 100644
--- a/src/ui/tools/arc-tool.cpp
+++ b/src/ui/tools/arc-tool.cpp
@@ -17,7 +17,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 #include <gdk/gdkkeysyms.h>
 
@@ -30,6 +30,7 @@
 #include "sp-namedview.h"
 #include "selection.h"
 
+#include "snap.h"
 #include "pixmaps/cursor-ellipse.xpm"
 #include "xml/repr.h"
 #include "xml/node-event-vector.h"
diff --git a/src/ui/tools/box3d-tool.cpp b/src/ui/tools/box3d-tool.cpp
index 9b5b264bc..27e755add 100644
--- a/src/ui/tools/box3d-tool.cpp
+++ b/src/ui/tools/box3d-tool.cpp
@@ -15,6 +15,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "config.h"
+
 #include <gdk/gdkkeysyms.h>
 
 #include "macros.h"
@@ -25,6 +27,8 @@
 #include "selection.h"
 #include "selection-chemistry.h"
 
+#include "snap.h"
+#include "display/curve.h"
 #include "display/sp-canvas-item.h"
 #include "desktop.h"
 #include "message-context.h"
@@ -32,12 +36,17 @@
 #include "box3d.h"
 #include "ui/tools/box3d-tool.h"
 #include <glibmm/i18n.h>
+#include "xml/repr.h"
 #include "xml/node-event-vector.h"
+#include "preferences.h"
 #include "context-fns.h"
 #include "desktop-style.h"
+#include "transf_mat_3x4.h"
 #include "perspective-line.h"
+#include "persp3d.h"
 #include "box3d-side.h"
 #include "document-private.h"
+#include "line-geometry.h"
 #include "ui/shape-editor.h"
 #include "verbs.h"
 
diff --git a/src/ui/tools/calligraphic-tool.cpp b/src/ui/tools/calligraphic-tool.cpp
index 84c4adc89..28195eb75 100644
--- a/src/ui/tools/calligraphic-tool.cpp
+++ b/src/ui/tools/calligraphic-tool.cpp
@@ -23,6 +23,8 @@
 
 #define noDYNA_DRAW_VERBOSE
 
+#include "config.h"
+
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
@@ -33,10 +35,12 @@
 #include "svg/svg.h"
 #include "display/canvas-bpath.h"
 #include "display/cairo-utils.h"
+#include <2geom/math-utils.h>
 #include <2geom/pathvector.h>
 #include <2geom/bezier-utils.h>
 #include <2geom/circle.h>
 #include "display/curve.h"
+#include <glib.h>
 #include "macros.h"
 #include "document.h"
 #include "document-undo.h"
@@ -46,15 +50,20 @@
 
 #include "desktop-style.h"
 #include "message-context.h"
+#include "preferences.h"
 #include "pixmaps/cursor-calligraphy.xpm"
+#include "xml/repr.h"
 #include "context-fns.h"
+#include "sp-item.h"
 #include "inkscape.h"
+#include "color.h"
 #include "splivarot.h"
 #include "sp-item-group.h"
 #include "sp-shape.h"
 #include "sp-path.h"
 #include "sp-text.h"
 #include "display/sp-canvas.h"
+#include "display/canvas-bpath.h"
 #include "display/canvas-arena.h"
 #include "livarot/Shape.h"
 #include "verbs.h"
diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp
index 605b573d7..74f2664fe 100644
--- a/src/ui/tools/connector-tool.cpp
+++ b/src/ui/tools/connector-tool.cpp
@@ -75,6 +75,7 @@
 #include "ui/tools/connector-tool.h"
 #include "pixmaps/cursor-connector.xpm"
 #include "xml/node-event-vector.h"
+#include "xml/repr.h"
 #include "svg/svg.h"
 #include "desktop.h"
 #include "desktop-style.h"
@@ -85,13 +86,19 @@
 #include "message-stack.h"
 #include "selection.h"
 #include "inkscape.h"
+#include "preferences.h"
 #include "sp-path.h"
 #include "display/sp-canvas.h"
 #include "display/canvas-bpath.h"
+#include "display/sodipodi-ctrl.h"
 #include <glibmm/i18n.h>
 #include <glibmm/stringutils.h>
 #include "snap.h"
+#include "knot.h"
 #include "sp-conn-end.h"
+#include "sp-conn-end-pair.h"
+#include "conn-avoid-ref.h"
+#include "libavoid/vertices.h"
 #include "libavoid/router.h"
 #include "context-fns.h"
 #include "sp-namedview.h"
diff --git a/src/ui/tools/dropper-tool.cpp b/src/ui/tools/dropper-tool.cpp
index 4db720686..c838c27d5 100644
--- a/src/ui/tools/dropper-tool.cpp
+++ b/src/ui/tools/dropper-tool.cpp
@@ -12,7 +12,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <glibmm/i18n.h>
@@ -27,6 +27,7 @@
 #include "display/curve.h"
 #include "display/cairo-utils.h"
 #include "svg/svg-color.h"
+#include "color.h"
 #include "color-rgba.h"
 #include "desktop-style.h"
 #include "preferences.h"
@@ -35,6 +36,7 @@
 #include "desktop.h"
 
 #include "selection.h"
+#include "document.h"
 #include "document-undo.h"
 
 #include "pixmaps/cursor-dropper-f.xpm"
@@ -43,6 +45,7 @@
 #include "ui/tools/dropper-tool.h"
 #include "message-context.h"
 #include "verbs.h"
+#include "ui/tools/tool-base.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/ui/tools/dynamic-base.cpp b/src/ui/tools/dynamic-base.cpp
index 6627a470e..eb789d850 100644
--- a/src/ui/tools/dynamic-base.cpp
+++ b/src/ui/tools/dynamic-base.cpp
@@ -1,7 +1,13 @@
 
 #include "ui/tools/dynamic-base.h"
 
+#include <gtk/gtk.h>
+
+#include "config.h"
+
 #include "message-context.h"
+#include "streq.h"
+#include "preferences.h"
 #include "display/sp-canvas-item.h"
 #include "desktop.h"
 #include "display/curve.h"
diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp
index 838522b34..6b32b5901 100644
--- a/src/ui/tools/eraser-tool.cpp
+++ b/src/ui/tools/eraser-tool.cpp
@@ -24,6 +24,8 @@
 
 #define noERASER_VERBOSE
 
+#include "config.h"
+
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
@@ -36,6 +38,7 @@
 #include "display/canvas-bpath.h"
 #include <2geom/bezier-utils.h>
 
+#include <glib.h>
 #include "macros.h"
 #include "document.h"
 #include "selection.h"
@@ -44,18 +47,26 @@
 
 #include "desktop-style.h"
 #include "message-context.h"
+#include "preferences.h"
 #include "pixmaps/cursor-eraser.xpm"
+#include "xml/repr.h"
 #include "context-fns.h"
+#include "sp-item.h"
+#include "color.h"
 #include "rubberband.h"
 #include "splivarot.h"
 #include "sp-item-group.h"
 #include "sp-shape.h"
 #include "sp-path.h"
 #include "sp-text.h"
+#include "display/canvas-bpath.h"
 #include "display/canvas-arena.h"
+#include "livarot/Shape.h"
 #include "document-undo.h"
 #include "verbs.h"
 #include "style.h"
+#include "style-enums.h"
+#include <2geom/math-utils.h>
 #include <2geom/pathvector.h>
 #include "path-chemistry.h"
 #include "display/curve.h"
diff --git a/src/ui/tools/flood-tool.cpp b/src/ui/tools/flood-tool.cpp
index 2f125e6ed..748c82717 100644
--- a/src/ui/tools/flood-tool.cpp
+++ b/src/ui/tools/flood-tool.cpp
@@ -18,13 +18,14 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include "trace/potrace/inkscape-potrace.h"
 #include <2geom/pathvector.h>
 #include <gdk/gdkkeysyms.h>
 #include <queue>
+#include <deque>
 #include <glibmm/i18n.h>
 
 #include "color.h"
@@ -35,6 +36,7 @@
 #include "display/cairo-utils.h"
 #include "display/drawing-context.h"
 #include "display/drawing-image.h"
+#include "display/drawing-item.h"
 #include "display/drawing.h"
 #include "display/sp-canvas.h"
 #include "document.h"
@@ -45,15 +47,23 @@
 #include "macros.h"
 #include "message-context.h"
 #include "message-stack.h"
+#include "preferences.h"
 #include "rubberband.h"
 #include "selection.h"
 #include "ui/shape-editor.h"
+#include "sp-defs.h"
+#include "sp-item.h"
 #include "splivarot.h"
 #include "sp-namedview.h"
+#include "sp-object.h"
+#include "sp-path.h"
+#include "sp-rect.h"
 #include "sp-root.h"
 #include "svg/svg.h"
 #include "trace/imagemap.h"
+#include "trace/trace.h"
 #include "xml/node-event-vector.h"
+#include "xml/repr.h"
 #include "verbs.h"
 
 #include "pixmaps/cursor-paintbucket.xpm"
diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index eb29ed88d..7697cd59c 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -17,29 +17,43 @@
 #define DRAW_VERBOSE
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include "live_effects/lpe-bendpath.h"
 #include "live_effects/lpe-patternalongpath.h"
 #include "live_effects/lpe-simplify.h"
 #include "display/canvas-bpath.h"
+#include "xml/repr.h"
 #include "svg/svg.h"
+#include <glibmm/i18n.h>
 #include "display/curve.h"
+#include "desktop.h"
 
 #include "desktop-style.h"
+#include "document.h"
 #include "ui/draw-anchor.h"
 #include "macros.h"
 #include "message-stack.h"
 #include "ui/tools/pen-tool.h"
 #include "ui/tools/lpe-tool.h"
+#include "preferences.h"
+#include "selection.h"
 #include "selection-chemistry.h"
+#include "snap.h"
+#include "sp-path.h"
+#include "sp-use.h"
 #include "sp-item-group.h"
+#include "sp-namedview.h"
 #include "live_effects/lpe-powerstroke.h"
 #include "style.h"
 #include "ui/control-manager.h"
+#include "util/units.h"
 // clipboard support
 #include "ui/clipboard.h"
+#include "ui/tools/freehand-base.h"
+
+#include <gdk/gdkkeysyms.h>
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/ui/tools/gradient-tool.cpp b/src/ui/tools/gradient-tool.cpp
index e4814c3de..9d8101cc4 100644
--- a/src/ui/tools/gradient-tool.cpp
+++ b/src/ui/tools/gradient-tool.cpp
@@ -13,7 +13,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 
@@ -31,10 +31,17 @@
 #include "ui/tools/gradient-tool.h"
 #include "gradient-chemistry.h"
 #include <glibmm/i18n.h>
+#include "preferences.h"
 #include "gradient-drag.h"
+#include "gradient-chemistry.h"
+#include "xml/repr.h"
+#include "sp-item.h"
 #include "display/sp-ctrlline.h"
+#include "sp-linear-gradient.h"
+#include "sp-radial-gradient.h"
 #include "sp-stop.h"
 #include "svg/css-ostringstream.h"
+#include "svg/svg-color.h"
 #include "snap.h"
 #include "sp-namedview.h"
 #include "rubberband.h"
diff --git a/src/ui/tools/lpe-tool.cpp b/src/ui/tools/lpe-tool.cpp
index ee85dd28c..9bbc1ac20 100644
--- a/src/ui/tools/lpe-tool.cpp
+++ b/src/ui/tools/lpe-tool.cpp
@@ -15,16 +15,19 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include <2geom/sbasis-geometric.h>
+#include <gdk/gdkkeysyms.h>
 
 #include <glibmm/i18n.h>
+#include "macros.h"
 #include "pixmaps/cursor-crosshairs.xpm"
 #include <gtk/gtk.h>
 #include "desktop.h"
 #include "message-context.h"
+#include "preferences.h"
 #include "ui/shape-editor.h"
 #include "selection.h"
 
diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index c941b9bee..63e2460ec 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -11,10 +11,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <gtkmm.h>
+#include <gdk/gdkkeysyms.h>
 #include <boost/none_t.hpp>
 #include "util/units.h"
 #include "display/curve.h"
@@ -22,6 +23,7 @@
 #include "display/sp-ctrlline.h"
 #include "display/sp-ctrlcurve.h"
 #include "display/sp-canvas.h"
+#include "display/sp-canvas-item.h"
 #include "display/sp-canvas-util.h"
 #include "svg/svg.h"
 #include "svg/svg-color.h"
@@ -29,20 +31,34 @@
 #include "ui/tools/freehand-base.h"
 #include <2geom/line.h>
 #include <2geom/path-intersection.h>
+#include <2geom/pathvector.h>
+#include <2geom/crossing.h>
+#include <2geom/angle.h>
+#include <2geom/transforms.h>
 #include "ui/dialog/knot-properties.h"
 #include "sp-namedview.h"
+#include "sp-shape.h"
 #include "sp-text.h"
 #include "sp-flowtext.h"
 #include "sp-defs.h"
+#include "sp-item.h"
 #include "sp-root.h"
+#include "macros.h"
 #include "svg/stringstream.h"
 #include "rubberband.h"
 #include "path-chemistry.h"
 #include "desktop.h"
+#include "document.h"
 #include "document-undo.h"
+#include "viewbox.h"
+#include "snap.h"
+#include "knot.h"
 #include "text-editing.h"
 #include "pixmaps/cursor-measure.xpm"
+#include "preferences.h"
 #include "inkscape.h"
+#include "enums.h"
+#include "knot-enums.h"
 #include "desktop-style.h"
 #include "verbs.h"
 #include <glibmm/i18n.h>
diff --git a/src/ui/tools/mesh-tool.cpp b/src/ui/tools/mesh-tool.cpp
index 32e70bc19..47927667c 100644
--- a/src/ui/tools/mesh-tool.cpp
+++ b/src/ui/tools/mesh-tool.cpp
@@ -15,7 +15,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 //#define DEBUG_MESH
@@ -33,6 +33,7 @@
 #include "macros.h"
 #include "message-context.h"
 #include "message-stack.h"
+#include "preferences.h"
 #include "rubberband.h"
 #include "selection.h"
 #include "snap.h"
diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp
index bf18d4a2e..23aaf6bb1 100644
--- a/src/ui/tools/node-tool.cpp
+++ b/src/ui/tools/node-tool.cpp
@@ -24,19 +24,25 @@
 #include "message-context.h"
 #include "selection.h"
 #include "ui/shape-editor.h" // temporary!
+#include "live_effects/effect.h"
+#include "display/curve.h"
 #include "snap.h"
 #include "sp-namedview.h"
 #include "sp-clippath.h"
 #include "sp-item-group.h"
 #include "sp-mask.h"
+#include "sp-object-group.h"
+#include "sp-path.h"
 #include "sp-text.h"
 #include "ui/control-manager.h"
 #include "ui/tools/node-tool.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/event-utils.h"
+#include "ui/tool/manipulator.h"
 #include "ui/tool/multi-path-manipulator.h"
 #include "ui/tool/path-manipulator.h"
 #include "ui/tool/selector.h"
+#include "ui/tool/shape-record.h"
 
 #include "pixmaps/cursor-node.xpm"
 #include "pixmaps/cursor-node-d.xpm"
diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 49f28ad2c..18af8e105 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -32,6 +32,8 @@
 #include "ui/draw-anchor.h"
 #include "message-stack.h"
 #include "message-context.h"
+#include "preferences.h"
+#include "sp-path.h"
 #include "display/sp-canvas.h"
 #include "display/curve.h"
 #include "pixmaps/cursor-pen.xpm"
@@ -44,6 +46,7 @@
 #include "ui/tools-switch.h"
 #include "ui/control-manager.h"
 // we include the necessary files for BSpline & Spiro
+#include "live_effects/effect.h"
 #include "live_effects/lpeobject.h"
 #include "live_effects/lpeobject-reference.h"
 #include "live_effects/parameter/path.h"
@@ -51,16 +54,25 @@
 #include "live_effects/lpe-spiro.h"
 
 
+#include <typeinfo>
+#include <2geom/pathvector.h>
+#include <2geom/affine.h>
 #include <2geom/curves.h>
 #include "helper/geom-nodetype.h"
+#include "helper/geom-curves.h"
 
 // For handling un-continuous paths:
+#include "message-stack.h"
 #include "inkscape.h"
+#include "desktop.h"
 
 #include "live_effects/spiro.h"
 
 #define INKSCAPE_LPE_BSPLINE_C
 #include "live_effects/lpe-bspline.h"
+#include <2geom/nearest-time.h>
+
+#include "live_effects/effect.h"
 
 
 using Inkscape::ControlManager;
diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp
index 7cc695040..b029ca613 100644
--- a/src/ui/tools/pencil-tool.cpp
+++ b/src/ui/tools/pencil-tool.cpp
@@ -27,6 +27,7 @@
 #include "message-stack.h"
 #include "message-context.h"
 #include "sp-path.h"
+#include "preferences.h"
 #include "snap.h"
 #include "pixmaps/cursor-pencil.xpm"
 #include <2geom/sbasis-to-bezier.h>
@@ -35,9 +36,13 @@
 #include <glibmm/i18n.h>
 #include "context-fns.h"
 #include "sp-namedview.h"
+#include "xml/repr.h"
+#include "document.h"
 #include "desktop-style.h"
+#include "macros.h"
 #include "display/sp-canvas.h"
 #include "display/curve.h"
+#include "livarot/Path.h"
 #include "ui/tool/event-utils.h"
 
 namespace Inkscape {
diff --git a/src/ui/tools/rect-tool.cpp b/src/ui/tools/rect-tool.cpp
index 00330ef57..844965c4d 100644
--- a/src/ui/tools/rect-tool.cpp
+++ b/src/ui/tools/rect-tool.cpp
@@ -14,6 +14,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "config.h"
+
 #include <gdk/gdkkeysyms.h>
 #include <cstring>
 #include <string>
@@ -27,13 +29,16 @@
 #include "selection.h"
 #include "selection-chemistry.h"
 
+#include "snap.h"
 #include "desktop.h"
 #include "desktop-style.h"
 #include "message-context.h"
 #include "pixmaps/cursor-rect.xpm"
 #include "ui/tools/rect-tool.h"
 #include <glibmm/i18n.h>
+#include "xml/repr.h"
 #include "xml/node-event-vector.h"
+#include "preferences.h"
 #include "context-fns.h"
 #include "ui/shape-editor.h"
 #include "verbs.h"
diff --git a/src/ui/tools/select-tool.cpp b/src/ui/tools/select-tool.cpp
index 5d802d4da..b5ec3d88e 100644
--- a/src/ui/tools/select-tool.cpp
+++ b/src/ui/tools/select-tool.cpp
@@ -15,7 +15,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 #include <cstring>
 #include <string>
@@ -40,12 +40,14 @@
 #include "desktop.h"
 
 #include "sp-root.h"
+#include "preferences.h"
 #include "ui/tools-switch.h"
 #include "message-stack.h"
 #include "selection-describer.h"
 #include "seltrans.h"
 #include "box3d.h"
 #include "display/sp-canvas.h"
+#include "display/sp-canvas-item.h"
 #include "display/drawing-item.h"
 
 using Inkscape::DocumentUndo;
diff --git a/src/ui/tools/spiral-tool.cpp b/src/ui/tools/spiral-tool.cpp
index 0ba08853e..833fef18d 100644
--- a/src/ui/tools/spiral-tool.cpp
+++ b/src/ui/tools/spiral-tool.cpp
@@ -14,6 +14,8 @@
  * Released under GNU GPL
  */
 
+#include "config.h"
+
 #include <gdk/gdkkeysyms.h>
 #include <cstring>
 #include <string>
@@ -26,13 +28,16 @@
 #include "sp-namedview.h"
 #include "selection.h"
 
+#include "snap.h"
 #include "desktop.h"
 #include "desktop-style.h"
 #include "message-context.h"
 #include "pixmaps/cursor-spiral.xpm"
 #include "ui/tools/spiral-tool.h"
 #include <glibmm/i18n.h>
+#include "xml/repr.h"
 #include "xml/node-event-vector.h"
+#include "preferences.h"
 #include "context-fns.h"
 #include "ui/shape-editor.h"
 #include "verbs.h"
diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 3fafac2a7..9adaf3879 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -19,12 +19,15 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "config.h"
+
 #include <numeric>
 
 #include "ui/dialog/dialog-manager.h"
 
 #include "svg/svg.h"
 
+#include <glib.h>
 #include "macros.h"
 #include "document.h"
 #include "document-undo.h"
@@ -34,7 +37,10 @@
 
 #include "message-context.h"
 #include "pixmaps/cursor-spray.xpm"
+#include <boost/optional.hpp>
+#include "xml/repr.h"
 #include "context-fns.h"
+#include "sp-item.h"
 #include "inkscape.h"
 
 #include "splivarot.h"
@@ -51,12 +57,17 @@
 #include "svg/svg-color.h"
 
 #include "sp-text.h"
+#include "sp-root.h"
 #include "sp-flowtext.h"
 #include "display/sp-canvas.h"
+#include "display/canvas-bpath.h"
 #include "display/canvas-arena.h"
 #include "display/curve.h"
 #include "livarot/Shape.h"
 #include <2geom/circle.h>
+#include <2geom/transforms.h>
+#include "preferences.h"
+#include "style.h"
 #include "box3d.h"
 #include "sp-item-transform.h"
 #include "filter-chemistry.h"
@@ -65,6 +76,9 @@
 #include "helper/action.h"
 #include "verbs.h"
 
+#include <iostream>
+
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
 
diff --git a/src/ui/tools/star-tool.cpp b/src/ui/tools/star-tool.cpp
index ddee08189..9190ae57b 100644
--- a/src/ui/tools/star-tool.cpp
+++ b/src/ui/tools/star-tool.cpp
@@ -15,7 +15,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <cstring>
@@ -31,11 +31,14 @@
 #include "sp-namedview.h"
 #include "selection.h"
 
+#include "snap.h"
 #include "desktop.h"
 #include "desktop-style.h"
 #include "message-context.h"
 #include "pixmaps/cursor-star.xpm"
 #include <glibmm/i18n.h>
+#include "preferences.h"
+#include "xml/repr.h"
 #include "xml/node-event-vector.h"
 #include "context-fns.h"
 #include "ui/shape-editor.h"
diff --git a/src/ui/tools/text-tool.cpp b/src/ui/tools/text-tool.cpp
index 559187764..1888551cf 100644
--- a/src/ui/tools/text-tool.cpp
+++ b/src/ui/tools/text-tool.cpp
@@ -14,7 +14,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <gtkmm/clipboard.h>
@@ -23,6 +23,7 @@
 #include <display/sp-ctrlquadr.h>
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
+#include <sstream>
 
 #include "context-fns.h"
 
@@ -35,6 +36,7 @@
 #include "message-stack.h"
 #include "pixmaps/cursor-text-insert.xpm"
 #include "pixmaps/cursor-text.xpm"
+#include "preferences.h"
 #include "rubberband.h"
 #include "selection-chemistry.h"
 #include "selection.h"
@@ -48,6 +50,8 @@
 #include "ui/control-manager.h"
 #include "verbs.h"
 #include "xml/node-event-vector.h"
+#include "xml/repr.h"
+#include <gtk/gtk.h>
 
 using Inkscape::ControlManager;
 using Inkscape::DocumentUndo;
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index 735f5bd42..72ba499de 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -15,7 +15,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include "widgets/desktop-widget.h"
@@ -24,8 +24,12 @@
 #include "file.h"
 #include "ui/tools/tool-base.h"
 
+#include <string.h>
 #include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
 #include <glibmm/i18n.h>
+#include <cstring>
+#include <string>
 
 #include "display/sp-canvas.h"
 #include "xml/node-event-vector.h"
@@ -39,14 +43,18 @@
 #include "ui/interface.h"
 #include "macros.h"
 #include "ui/tools-switch.h"
+#include "preferences.h"
 #include "message-context.h"
 #include "gradient-drag.h"
+#include "attributes.h"
 #include "rubberband.h"
 #include "selcue.h"
 #include "ui/tools/lpe-tool.h"
 #include "ui/tool/control-point.h"
 #include "ui/shape-editor.h"
 #include "sp-guide.h"
+#include "color.h"
+#include "knot.h"
 #include "knot-ptr.h"
 
 // globals for temporary switching to selector by space
diff --git a/src/ui/tools/tweak-tool.cpp b/src/ui/tools/tweak-tool.cpp
index fbf1b2a0b..39a7a3f0b 100644
--- a/src/ui/tools/tweak-tool.cpp
+++ b/src/ui/tools/tweak-tool.cpp
@@ -11,6 +11,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "config.h"
+
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
@@ -19,6 +21,7 @@
 
 #include "svg/svg.h"
 
+#include <glib.h>
 #include "macros.h"
 #include "document.h"
 #include "document-undo.h"
@@ -45,13 +48,19 @@
 #include "pixmaps/cursor-push.xpm"
 #include "pixmaps/cursor-roughen.xpm"
 #include "pixmaps/cursor-color.xpm"
+#include <boost/optional.hpp>
+#include "xml/repr.h"
 #include "context-fns.h"
+#include "sp-item.h"
 #include "inkscape.h"
+#include "color.h"
+#include "svg/svg-color.h"
 #include "splivarot.h"
 #include "sp-item-group.h"
 #include "sp-shape.h"
 #include "sp-path.h"
 #include "path-chemistry.h"
+#include "sp-gradient.h"
 #include "sp-stop.h"
 #include "sp-gradient-reference.h"
 #include "sp-linear-gradient.h"
@@ -60,10 +69,13 @@
 #include "sp-text.h"
 #include "sp-flowtext.h"
 #include "display/sp-canvas.h"
+#include "display/canvas-bpath.h"
 #include "display/canvas-arena.h"
 #include "display/curve.h"
 #include "livarot/Shape.h"
+#include <2geom/transforms.h>
 #include <2geom/circle.h>
+#include "preferences.h"
 #include "style.h"
 #include "box3d.h"
 #include "sp-item-transform.h"
diff --git a/src/ui/tools/zoom-tool.cpp b/src/ui/tools/zoom-tool.cpp
index ca42d2d6f..13e097c18 100644
--- a/src/ui/tools/zoom-tool.cpp
+++ b/src/ui/tools/zoom-tool.cpp
@@ -21,6 +21,7 @@
 #include "desktop.h"
 #include "pixmaps/cursor-zoom.xpm"
 #include "pixmaps/cursor-zoom-out.xpm"
+#include "preferences.h"
 #include "selection-chemistry.h"
 
 #include "ui/tools/zoom-tool.h"