Reverted changes to r15024 after many building problems

(bzr r15027)

43 files changed, 162 insertions, 31 deletions

diff --git a/src/widgets/arc-toolbar.cpp b/src/widgets/arc-toolbar.cpp
index 35c8c0308..7b872e8b1 100644
--- a/src/widgets/arc-toolbar.cpp
+++ b/src/widgets/arc-toolbar.cpp
@@ -25,7 +25,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <glibmm/i18n.h>
@@ -39,6 +39,7 @@
 #include "widgets/ege-select-one-action.h"
 #include "widgets/ink-action.h"
 #include "mod360.h"
+#include "preferences.h"
 #include "selection.h"
 #include "sp-ellipse.h"
 #include "toolbox.h"
@@ -48,6 +49,7 @@
 #include "verbs.h"
 #include "widgets/spinbutton-events.h"
 #include "xml/node-event-vector.h"
+#include "xml/repr.h"
 
 using Inkscape::UI::UXManager;
 using Inkscape::DocumentUndo;
diff --git a/src/widgets/box3d-toolbar.cpp b/src/widgets/box3d-toolbar.cpp
index b8c67ee76..31b897ced 100644
--- a/src/widgets/box3d-toolbar.cpp
+++ b/src/widgets/box3d-toolbar.cpp
@@ -25,7 +25,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <glibmm/i18n.h>
@@ -40,6 +40,7 @@
 #include "widgets/ink-action.h"
 #include "inkscape.h"
 #include "persp3d.h"
+#include "selection.h"
 #include "toolbox.h"
 #include "ui/icon-names.h"
 #include "ui/tools/box3d-tool.h"
diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp
index bc59d1a39..6ea8c1360 100644
--- a/src/widgets/button.cpp
+++ b/src/widgets/button.cpp
@@ -20,6 +20,8 @@
 #include "shortcuts.h"
 #include "helper/action.h"
 
+#include <gdk/gdkkeysyms.h>
+
 static void sp_button_dispose(GObject *object);
 
 #if GTK_CHECK_VERSION(3, 0, 0)
diff --git a/src/widgets/calligraphy-toolbar.cpp b/src/widgets/calligraphy-toolbar.cpp
index ba51499aa..4ae6427ad 100644
--- a/src/widgets/calligraphy-toolbar.cpp
+++ b/src/widgets/calligraphy-toolbar.cpp
@@ -25,7 +25,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include "ui/dialog/calligraphic-profile-rename.h"
@@ -37,6 +37,7 @@
 #include "widgets/ege-adjustment-action.h"
 #include "widgets/ege-select-one-action.h"
 #include "widgets/ink-action.h"
+#include "preferences.h"
 #include "toolbox.h"
 #include "ui/icon-names.h"
 #include "ui/uxmanager.h"
diff --git a/src/widgets/connector-toolbar.cpp b/src/widgets/connector-toolbar.cpp
index f80f49db7..733fb34e8 100644
--- a/src/widgets/connector-toolbar.cpp
+++ b/src/widgets/connector-toolbar.cpp
@@ -25,7 +25,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <glibmm/i18n.h>
@@ -40,7 +40,10 @@
 #include "graphlayout.h"
 #include "widgets/ink-action.h"
 #include "inkscape.h"
+#include "preferences.h"
+#include "selection.h"
 #include "sp-namedview.h"
+#include "sp-path.h"
 #include "toolbox.h"
 #include "ui/icon-names.h"
 #include "ui/tools/connector-tool.h"
@@ -48,6 +51,7 @@
 #include "verbs.h"
 #include "widgets/spinbutton-events.h"
 #include "xml/node-event-vector.h"
+#include "xml/repr.h"
 
 using Inkscape::UI::UXManager;
 using Inkscape::DocumentUndo;
diff --git a/src/widgets/dash-selector.cpp b/src/widgets/dash-selector.cpp
index e1cb563a7..9d591d33d 100644
--- a/src/widgets/dash-selector.cpp
+++ b/src/widgets/dash-selector.cpp
@@ -13,13 +13,15 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include "dash-selector.h"
 
 #include <cstring>
+#include <string>
 #include <glibmm/i18n.h>
+#include <gtkmm/adjustment.h>
 #include <2geom/coord.h>
 
 #include "style.h"
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index ec155ce4c..164a06910 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -36,15 +36,21 @@
 #include "desktop-widget.h"
 #include "display/sp-canvas.h"
 #include "display/canvas-arena.h"
+#include "document.h"
 #include "ege-color-prof-tracker.h"
 #include "widgets/ege-select-one-action.h"
 #include <extension/db.h>
 #include "file.h"
 #include "helper/action.h"
+#include "helper/action-context.h"
 #include "util/units.h"
 #include "ui/widget/unit-tracker.h"
+#include "inkscape.h"
 #include "ui/interface.h"
+#include "macros.h"
+#include "preferences.h"
 #include "sp-image.h"
+#include "sp-item.h"
 #include "sp-namedview.h"
 #include "ui/dialog/swatches.h"
 #include "ui/icon-names.h"
@@ -70,6 +76,8 @@
 #include <gtkmm/paned.h>
 #include <gtkmm/messagedialog.h>
 
+#include <gtk/gtk.h>
+
 #if defined (SOLARIS) && (SOLARIS == 8)
 #include "round.h"
 using Inkscape::round;
diff --git a/src/widgets/dropper-toolbar.cpp b/src/widgets/dropper-toolbar.cpp
index f60955da5..45ed9ead4 100644
--- a/src/widgets/dropper-toolbar.cpp
+++ b/src/widgets/dropper-toolbar.cpp
@@ -25,7 +25,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <glibmm/i18n.h>
diff --git a/src/widgets/eraser-toolbar.cpp b/src/widgets/eraser-toolbar.cpp
index b30d542a6..bb553f4e6 100644
--- a/src/widgets/eraser-toolbar.cpp
+++ b/src/widgets/eraser-toolbar.cpp
@@ -25,7 +25,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <glibmm/i18n.h>
@@ -38,6 +38,7 @@
 #include "widgets/ege-adjustment-action.h"
 #include "widgets/ege-select-one-action.h"
 #include "widgets/ink-action.h"
+#include "preferences.h"
 #include "toolbox.h"
 #include "ui/icon-names.h"
 
diff --git a/src/widgets/fill-style.cpp b/src/widgets/fill-style.cpp
index aff88aca5..a96776894 100644
--- a/src/widgets/fill-style.cpp
+++ b/src/widgets/fill-style.cpp
@@ -19,7 +19,7 @@
 #define noSP_FS_VERBOSE
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <gtkmm/box.h>
@@ -27,6 +27,8 @@
 
 #include "verbs.h"
 
+#include <gtk/gtk.h>
+
 #include "desktop.h"
 #include "selection.h"
 
@@ -36,11 +38,13 @@
 #include "document-undo.h"
 #include "gradient-chemistry.h"
 #include "inkscape.h"
+#include "selection.h"
 #include "sp-linear-gradient.h"
 #include "sp-pattern.h"
 #include "sp-radial-gradient.h"
 #include "style.h"
 #include "widgets/paint-selector.h"
+#include "xml/repr.h"
 
 #include "fill-style.h"
 #include "fill-n-stroke-factory.h"
diff --git a/src/widgets/font-selector.cpp b/src/widgets/font-selector.cpp
index 2ed6705d7..aefcb2e81 100644
--- a/src/widgets/font-selector.cpp
+++ b/src/widgets/font-selector.cpp
@@ -16,16 +16,21 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <libnrtype/font-lister.h>
 #include <libnrtype/font-instance.h>
 
+#include <2geom/transforms.h>
+
+#include <gtk/gtk.h>
+
 #include <glibmm/i18n.h>
 
 #include "desktop.h"
 #include "widgets/font-selector.h"
+#include "preferences.h"
 
 /* SPFontSelector */
 
diff --git a/src/widgets/gradient-selector.cpp b/src/widgets/gradient-selector.cpp
index 425eb9cbc..604ecd108 100644
--- a/src/widgets/gradient-selector.cpp
+++ b/src/widgets/gradient-selector.cpp
@@ -14,7 +14,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <gtkmm/treeview.h>
@@ -28,11 +28,14 @@
 #include "inkscape.h"
 #include "verbs.h"
 #include "helper/action.h"
+#include "helper/action-context.h"
 #include "preferences.h"
 #include "widgets/icon.h"
 
 #include <glibmm/i18n.h>
+#include <xml/repr.h>
 
+#include "gradient-selector.h"
 #include "paint-selector.h"
 #include "style.h"
 #include "id-clash.h"
diff --git a/src/widgets/gradient-toolbar.cpp b/src/widgets/gradient-toolbar.cpp
index 7e9223770..a44e9962e 100644
--- a/src/widgets/gradient-toolbar.cpp
+++ b/src/widgets/gradient-toolbar.cpp
@@ -13,7 +13,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include "ui/widget/color-preview.h"
@@ -29,6 +29,7 @@
 #include "gradient-toolbar.h"
 #include "widgets/ink-action.h"
 #include "macros.h"
+#include "preferences.h"
 #include "selection.h"
 #include "sp-defs.h"
 #include "sp-linear-gradient.h"
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index 6e7c8cdf8..97e65141f 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -20,13 +20,14 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <glibmm.h>
 #include "gradient-vector.h"
 #include "ui/widget/color-preview.h"
 #include "verbs.h"
+#include <gtk/gtk.h>
 #include "macros.h"
 #include <glibmm/i18n.h>
 #include <set>
@@ -49,6 +50,8 @@
 #include "desktop.h"
 #include "layer-manager.h"
 
+#include <sigc++/functors/ptr_fun.h>
+#include <sigc++/adaptors/bind.h>
 #include "document-undo.h"
 
 #include "ui/dialog-events.h"
@@ -473,6 +476,7 @@ void SPGradientVectorSelector::setSwatched()
 #include "widgets/widget-sizes.h"
 #include "xml/node-event-vector.h"
 #include "svg/svg-color.h"
+#include "ui/widget/color-notebook.h"
 
 #define PAD 4
 
diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp
index d12ee981d..f2031fe51 100644
--- a/src/widgets/icon.cpp
+++ b/src/widgets/icon.cpp
@@ -18,15 +18,20 @@
 
 #include <gtkmm/icontheme.h>
 #include <cstring>
+#include <glib.h>
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
 #include <gtkmm/image.h>
+#include <gdkmm/pixbuf.h>
+#include <glibmm/fileutils.h>
+#include <glibmm/miscutils.h>
 #include <2geom/transforms.h>
 
 #include "path-prefix.h"
 #include "preferences.h"
 #include "inkscape.h"
 #include "document.h"
+#include "sp-item.h"
 #include "display/cairo-utils.h"
 #include "display/drawing-context.h"
 #include "display/drawing-item.h"
diff --git a/src/widgets/ink-action.cpp b/src/widgets/ink-action.cpp
index c0797b236..ace99d9aa 100644
--- a/src/widgets/ink-action.cpp
+++ b/src/widgets/ink-action.cpp
@@ -1,9 +1,14 @@
 #include "widgets/icon.h"
+#include "icon-size.h"
+#include <glib/gi18n.h>
+
 
 #include "widgets/ink-action.h"
 
 #include "widgets/button.h"
 
+#include <gtk/gtk.h>
+
 #if GTK_CHECK_VERSION(3,0,0)
     // Fork of gtk-imagemenuitem to continue support
     #include "widgets/image-menu-item.h"
diff --git a/src/widgets/lpe-toolbar.cpp b/src/widgets/lpe-toolbar.cpp
index d44983a15..387bf6dee 100644
--- a/src/widgets/lpe-toolbar.cpp
+++ b/src/widgets/lpe-toolbar.cpp
@@ -25,19 +25,27 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include "live_effects/lpe-line_segment.h"
 #include "lpe-toolbar.h"
 
+#include "desktop.h"
+#include "document-undo.h"
 #include "widgets/ege-select-one-action.h"
 #include "helper/action-context.h"
 #include "helper/action.h"
 #include "widgets/ink-action.h"
+#include "live_effects/effect.h"
+#include "preferences.h"
+#include "selection.h"
+#include "sp-namedview.h"
 #include "ui/tools-switch.h"
 #include "ui/tools/lpe-tool.h"
 #include "ui/widget/unit-tracker.h"
+#include "util/units.h"
+#include "verbs.h"
 
 using Inkscape::UI::Widget::UnitTracker;
 using Inkscape::Util::Unit;
diff --git a/src/widgets/measure-toolbar.cpp b/src/widgets/measure-toolbar.cpp
index 53790cfac..990989f4a 100644
--- a/src/widgets/measure-toolbar.cpp
+++ b/src/widgets/measure-toolbar.cpp
@@ -25,7 +25,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <glibmm/i18n.h>
@@ -38,6 +38,7 @@
 #include "document-undo.h"
 #include "widgets/ege-adjustment-action.h"
 #include "widgets/ege-output-action.h"
+#include "preferences.h"
 #include "toolbox.h"
 #include "widgets/ink-action.h"
 #include "ui/icon-names.h"
diff --git a/src/widgets/mesh-toolbar.cpp b/src/widgets/mesh-toolbar.cpp
index 1e5c12d41..3643ce00c 100644
--- a/src/widgets/mesh-toolbar.cpp
+++ b/src/widgets/mesh-toolbar.cpp
@@ -15,7 +15,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 // REVIEW THESE AT END OF REWRITE
@@ -25,13 +25,17 @@
 
 #include "verbs.h"
 
+#include "macros.h"
 #include "widgets/button.h"
+#include "widgets/widget-sizes.h"
+#include "widgets/spw-utilities.h"
 #include "widgets/spinbutton-events.h"
 #include "widgets/gradient-vector.h"
 #include "widgets/gradient-image.h"
 #include "style.h"
 
 #include "inkscape.h"
+#include "preferences.h"
 #include "document-private.h"
 #include "document-undo.h"
 #include "desktop.h"
@@ -43,16 +47,23 @@
 #include "gradient-drag.h"
 #include "sp-mesh.h"
 #include "gradient-chemistry.h"
+#include "gradient-selector.h"
+#include "selection.h"
 #include "ui/icon-names.h"
 
 #include "widgets/ege-adjustment-action.h"
+#include "widgets/ege-output-action.h"
 #include "widgets/ege-select-one-action.h"
 #include "widgets/ink-action.h"
+#include "widgets/ink-comboboxentry-action.h"
 
 #include "sp-stop.h"
 #include "svg/css-ostringstream.h"
+#include "svg/svg-color.h"
 #include "desktop-style.h"
 
+#include "toolbox.h"
+
 using Inkscape::DocumentUndo;
 using Inkscape::UI::ToolboxFactory;
 using Inkscape::UI::PrefPusher;
diff --git a/src/widgets/node-toolbar.cpp b/src/widgets/node-toolbar.cpp
index ed3e33acc..113061519 100644
--- a/src/widgets/node-toolbar.cpp
+++ b/src/widgets/node-toolbar.cpp
@@ -25,7 +25,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include "ui/tool/multi-path-manipulator.h"
@@ -37,13 +37,16 @@
 #include "widgets/ege-adjustment-action.h"
 #include "widgets/ink-action.h"
 #include "inkscape.h"
+#include "preferences.h"
 #include "selection-chemistry.h"
+#include "selection.h"
 #include "sp-namedview.h"
 #include "toolbox.h"
 #include "ui/icon-names.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tools/node-tool.h"
 #include "ui/widget/unit-tracker.h"
+#include "util/units.h"
 #include "verbs.h"
 #include "widgets/widget-sizes.h"
 
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index a421ea7d3..58a178aec 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -41,6 +41,7 @@
 #include <document-private.h>
 #include <desktop-style.h>
 #include <style.h>
+#include "svg/svg-color.h"
 #include "svg/css-ostringstream.h"
 #include "path-prefix.h"
 #include "io/sys.h"
@@ -54,6 +55,8 @@
 #include "svg/svg-icc-color.h"
 #endif // SP_PS_VERBOSE
 
+#include <gtk/gtk.h>
+
 using Inkscape::Widgets::SwatchSelector;
 using Inkscape::UI::SelectedColor;
 
diff --git a/src/widgets/paintbucket-toolbar.cpp b/src/widgets/paintbucket-toolbar.cpp
index 3d1565924..b717d74fa 100644
--- a/src/widgets/paintbucket-toolbar.cpp
+++ b/src/widgets/paintbucket-toolbar.cpp
@@ -25,7 +25,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <glibmm/i18n.h>
@@ -35,11 +35,13 @@
 #include "document-undo.h"
 #include "widgets/ege-adjustment-action.h"
 #include "widgets/ege-select-one-action.h"
+#include "preferences.h"
 #include "toolbox.h"
 #include "ui/icon-names.h"
 #include "ui/tools/flood-tool.h"
 #include "ui/uxmanager.h"
 #include "ui/widget/unit-tracker.h"
+#include "util/units.h"
 #include "widgets/ink-action.h"
 
 using Inkscape::UI::Widget::UnitTracker;
diff --git a/src/widgets/pencil-toolbar.cpp b/src/widgets/pencil-toolbar.cpp
index d402cc714..55127206c 100644
--- a/src/widgets/pencil-toolbar.cpp
+++ b/src/widgets/pencil-toolbar.cpp
@@ -25,17 +25,19 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <gtkmm.h>
 #include <glibmm/i18n.h>
+#include <list>
 
 #include "pencil-toolbar.h"
 #include "desktop.h"
 #include "widgets/ege-adjustment-action.h"
 #include "widgets/ege-select-one-action.h"
 #include "widgets/ink-action.h"
+#include "preferences.h"
 #include "toolbox.h"
 #include "ui/tools-switch.h"
 #include "ui/icon-names.h"
@@ -44,10 +46,13 @@
 #include "widgets/spinbutton-events.h"
 #include <selection.h>
 #include "display/curve.h"
+#include "live_effects/effect.h"
 #include "live_effects/lpe-simplify.h"
 #include "live_effects/lpe-powerstroke.h"
+#include "live_effects/effect-enum.h"
 #include "live_effects/lpeobject.h"
 #include "live_effects/lpeobject-reference.h"
+#include "sp-lpe-item.h"
 
 using Inkscape::UI::UXManager;
 using Inkscape::UI::ToolboxFactory;
diff --git a/src/widgets/rect-toolbar.cpp b/src/widgets/rect-toolbar.cpp
index c9b75294b..bc27d003c 100644
--- a/src/widgets/rect-toolbar.cpp
+++ b/src/widgets/rect-toolbar.cpp
@@ -25,7 +25,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <glibmm/i18n.h>
@@ -38,6 +38,8 @@
 #include "widgets/ege-output-action.h"
 #include "widgets/ink-action.h"
 #include "inkscape.h"
+#include "preferences.h"
+#include "selection.h"
 #include "sp-namedview.h"
 #include "sp-rect.h"
 #include "toolbox.h"
@@ -45,9 +47,11 @@
 #include "ui/tools/rect-tool.h"
 #include "ui/uxmanager.h"
 #include "ui/widget/unit-tracker.h"
+#include "util/units.h"
 #include "verbs.h"
 #include "widgets/widget-sizes.h"
 #include "xml/node-event-vector.h"
+#include "xml/repr.h"
 
 using Inkscape::UI::Widget::UnitTracker;
 using Inkscape::UI::UXManager;
diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp
index 1f6e4396c..deffd384a 100644
--- a/src/widgets/ruler.cpp
+++ b/src/widgets/ruler.cpp
@@ -31,6 +31,7 @@
 #include <cmath>
 #include <cstdio>
 
+#include "widget-sizes.h"
 #include "ruler.h"
 #include "round.h"
 #include <glibmm/i18n.h>
diff --git a/src/widgets/ruler.h b/src/widgets/ruler.h
index 7f0346e11..ed529d082 100644
--- a/src/widgets/ruler.h
+++ b/src/widgets/ruler.h
@@ -14,6 +14,7 @@
  */
 
 #include <gtk/gtk.h>
+#include <iostream>
 #include <glib.h>
 
 namespace Inkscape {
diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp
index 9a48b9a07..9851b0606 100644
--- a/src/widgets/select-toolbar.cpp
+++ b/src/widgets/select-toolbar.cpp
@@ -13,7 +13,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <2geom/rect.h>
@@ -32,15 +32,19 @@
 #include "widgets/ink-action.h"
 #include "inkscape.h"
 #include "message-stack.h"
+#include "preferences.h"
 #include "selection-chemistry.h"
+#include "selection.h"
 #include "sp-item-transform.h"
 #include "sp-namedview.h"
 #include "toolbox.h"
 #include "ui/icon-names.h"
 #include "ui/widget/unit-tracker.h"
+#include "util/units.h"
 #include "verbs.h"
 #include "widgets/icon.h"
 #include "widgets/sp-widget.h"
+#include "widgets/spw-utilities.h"
 #include "widgets/widget-sizes.h"
 
 using Inkscape::UI::Widget::UnitTracker;
diff --git a/src/widgets/sp-attribute-widget.cpp b/src/widgets/sp-attribute-widget.cpp
index de44cdbb4..fb7eb1420 100644
--- a/src/widgets/sp-attribute-widget.cpp
+++ b/src/widgets/sp-attribute-widget.cpp
@@ -16,6 +16,7 @@
 
 #include <glibmm/i18n.h>
 #include <gtkmm/entry.h>
+#include <gtkmm/label.h>
 
 #if WITH_GTKMM_3_0
 # include <gtkmm/grid.h>
@@ -23,6 +24,9 @@
 # include <gtkmm/table.h>
 #endif
 
+#include <sigc++/functors/ptr_fun.h>
+#include <sigc++/adaptors/bind.h>
+
 #include "sp-object.h"
 #include "xml/repr.h"
 #include "macros.h"
diff --git a/src/widgets/sp-color-selector.cpp b/src/widgets/sp-color-selector.cpp
index 932f074d2..93eaaee8b 100644
--- a/src/widgets/sp-color-selector.cpp
+++ b/src/widgets/sp-color-selector.cpp
@@ -4,7 +4,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <math.h>
@@ -180,6 +180,8 @@ gfloat ColorSelector::getAlpha() const
     return _alpha;
 }
 
+#include "svg/svg-icc-color.h"
+
 /**
 Called from the outside to set the color; optionally emits signal (only when called from
 downstream, e.g. the RGBA value field, but not from the rest of the program)
diff --git a/src/widgets/sp-widget.cpp b/src/widgets/sp-widget.cpp
index 180704f59..5ab6b1bb5 100644
--- a/src/widgets/sp-widget.cpp
+++ b/src/widgets/sp-widget.cpp
@@ -13,6 +13,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "macros.h"
 #include "document.h"
 #include "inkscape.h"
 #include "sp-widget.h"
diff --git a/src/widgets/sp-xmlview-attr-list.cpp b/src/widgets/sp-xmlview-attr-list.cpp
index 45dbae52a..a4c00db7c 100644
--- a/src/widgets/sp-xmlview-attr-list.cpp
+++ b/src/widgets/sp-xmlview-attr-list.cpp
@@ -10,7 +10,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <cstring>
diff --git a/src/widgets/sp-xmlview-tree.cpp b/src/widgets/sp-xmlview-tree.cpp
index 5af7c243d..5dff9adf3 100644
--- a/src/widgets/sp-xmlview-tree.cpp
+++ b/src/widgets/sp-xmlview-tree.cpp
@@ -10,6 +10,7 @@
  */
 
 #include <cstring>
+#include <string>
 
 #include "xml/node-event-vector.h"
 #include "sp-xmlview-tree.h"
diff --git a/src/widgets/spinbutton-events.cpp b/src/widgets/spinbutton-events.cpp
index fdf88ec85..0280694f6 100644
--- a/src/widgets/spinbutton-events.cpp
+++ b/src/widgets/spinbutton-events.cpp
@@ -12,7 +12,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <gtk/gtk.h>
@@ -21,6 +21,7 @@
 #include "ui/tools/tool-base.h"
 
 #include "sp-widget.h"
+#include "widget-sizes.h"
 #include "spinbutton-events.h"
 
 gboolean spinbutton_focus_in(GtkWidget *w, GdkEventKey * /*event*/, gpointer /*data*/)
diff --git a/src/widgets/spiral-toolbar.cpp b/src/widgets/spiral-toolbar.cpp
index 7406be255..7e7398091 100644
--- a/src/widgets/spiral-toolbar.cpp
+++ b/src/widgets/spiral-toolbar.cpp
@@ -25,7 +25,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <glibmm/i18n.h>
@@ -37,6 +37,7 @@
 #include "widgets/ege-adjustment-action.h"
 #include "widgets/ege-output-action.h"
 #include "widgets/ink-action.h"
+#include "preferences.h"
 #include "selection.h"
 #include "sp-spiral.h"
 #include "toolbox.h"
@@ -45,6 +46,8 @@
 #include "verbs.h"
 #include "widgets/spinbutton-events.h"
 #include "xml/node-event-vector.h"
+#include "xml/node.h"
+#include "xml/repr.h"
 
 using Inkscape::UI::UXManager;
 using Inkscape::DocumentUndo;
diff --git a/src/widgets/spray-toolbar.cpp b/src/widgets/spray-toolbar.cpp
index 43d00c53e..9e142a8db 100644
--- a/src/widgets/spray-toolbar.cpp
+++ b/src/widgets/spray-toolbar.cpp
@@ -26,7 +26,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <gtkmm.h>
@@ -37,6 +37,7 @@
 #include "widgets/ege-adjustment-action.h"
 #include "widgets/ege-select-one-action.h"
 #include "widgets/ink-action.h"
+#include "preferences.h"
 #include "toolbox.h"
 #include "ui/dialog/clonetiler.h"
 #include "ui/dialog/dialog-manager.h"
diff --git a/src/widgets/spw-utilities.cpp b/src/widgets/spw-utilities.cpp
index 8bc472601..5500e1068 100644
--- a/src/widgets/spw-utilities.cpp
+++ b/src/widgets/spw-utilities.cpp
@@ -11,7 +11,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <cstring>
@@ -30,6 +30,8 @@
 
 #include "spw-utilities.h"
 
+#include <gtk/gtk.h>
+
 /**
  * Creates a label widget with the given text, at the given col, row
  * position in the table.
diff --git a/src/widgets/star-toolbar.cpp b/src/widgets/star-toolbar.cpp
index 7f4293b62..982a3c854 100644
--- a/src/widgets/star-toolbar.cpp
+++ b/src/widgets/star-toolbar.cpp
@@ -25,7 +25,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <glibmm/i18n.h>
@@ -45,7 +45,10 @@
 #include "ui/tools/star-tool.h"
 #include "ui/uxmanager.h"
 #include "verbs.h"
+#include "widgets/../preferences.h"
 #include "xml/node-event-vector.h"
+#include "xml/node.h"
+#include "xml/repr.h"
 
 using Inkscape::UI::UXManager;
 using Inkscape::DocumentUndo;
diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp
index 2a0a10efa..e273faad7 100644
--- a/src/widgets/stroke-marker-selector.cpp
+++ b/src/widgets/stroke-marker-selector.cpp
@@ -18,13 +18,17 @@
 
 #include "stroke-marker-selector.h"
 
+#include <cstring>
+#include <string>
 #include <glibmm/i18n.h>
+#include <2geom/coord.h>
 
 
 #include "style.h"
 #include "ui/dialog-events.h"
 
 #include "desktop-style.h"
+#include "preferences.h"
 #include "path-prefix.h"
 #include "io/sys.h"
 #include "sp-marker.h"
@@ -35,8 +39,10 @@
 #include "gradient-vector.h"
 
 #include <gtkmm/icontheme.h>
+#include <gtkmm/adjustment.h>
 #include "ui/widget/spinbutton.h"
 #include "stroke-style.h"
+#include "gradient-chemistry.h"
 
 static Inkscape::UI::Cache::SvgPreview svg_preview_cache;
 
diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
index b66d97c1d..84a6e77ad 100644
--- a/src/widgets/stroke-style.cpp
+++ b/src/widgets/stroke-style.cpp
@@ -18,8 +18,11 @@
 #define noSP_SS_VERBOSE
 
 #include "stroke-style.h"
+#include "gradient-chemistry.h"
+#include "sp-gradient.h"
 #include "sp-stop.h"
 #include "svg/svg-color.h"
+#include "util/units.h"
 #include "ui/widget/unit-menu.h"
 #include "desktop-widget.h"
 
diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp
index 3fa240a05..23acb74af 100644
--- a/src/widgets/text-toolbar.cpp
+++ b/src/widgets/text-toolbar.cpp
@@ -25,7 +25,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include "libnrtype/font-lister.h"
@@ -41,7 +41,9 @@
 #include "widgets/ink-action.h"
 #include "widgets/ink-comboboxentry-action.h"
 #include "inkscape.h"
+#include "preferences.h"
 #include "selection-chemistry.h"
+#include "selection.h"
 #include "sp-flowtext.h"
 #include "sp-root.h"
 #include "sp-text.h"
@@ -51,8 +53,11 @@
 #include "toolbox.h"
 #include "ui/icon-names.h"
 #include "ui/tools/text-tool.h"
+#include "ui/tools/tool-base.h"
 #include "ui/widget/unit-tracker.h"
+#include "util/units.h"
 #include "verbs.h"
+#include "xml/repr.h"
 
 using Inkscape::DocumentUndo;
 using Inkscape::UI::ToolboxFactory;
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 1e67cca8f..8113c9619 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -27,7 +27,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <gtkmm/box.h>
@@ -40,9 +40,14 @@
 #include "../desktop-style.h"
 #include "document-undo.h"
 #include "widgets/ege-adjustment-action.h"
+#include "widgets/ege-output-action.h"
+#include "widgets/ege-select-one-action.h"
+#include "../graphlayout.h"
 #include "../helper/action.h"
+#include "../helper/action-context.h"
 #include "icon.h"
 #include "ink-action.h"
+#include "ink-comboboxentry-action.h"
 #include "../inkscape.h"
 #include "ui/interface.h"
 #include "../shortcuts.h"
@@ -59,6 +64,7 @@
 #include "../widgets/widget-sizes.h"
 #include "../xml/attribute-record.h"
 #include "../xml/node-event-vector.h"
+#include "../xml/repr.h"
 #include "ui/uxmanager.h"
 
 
@@ -89,6 +95,7 @@
 #include "zoom-toolbar.h"
 
 #include "toolbox.h"
+#include <gtk/gtk.h>
 
 #include "ui/tools/tool-base.h"
 
diff --git a/src/widgets/tweak-toolbar.cpp b/src/widgets/tweak-toolbar.cpp
index 9a021082c..a185ea956 100644
--- a/src/widgets/tweak-toolbar.cpp
+++ b/src/widgets/tweak-toolbar.cpp
@@ -25,7 +25,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "ui/widget/spinbutton.h"
@@ -37,6 +37,7 @@
 #include "widgets/ege-output-action.h"
 #include "widgets/ege-select-one-action.h"
 #include "widgets/ink-action.h"
+#include "preferences.h"
 #include "toolbox.h"
 #include "ui/icon-names.h"
 #include "ui/tools/tweak-tool.h"
diff --git a/src/widgets/zoom-toolbar.cpp b/src/widgets/zoom-toolbar.cpp
index a961c0061..79feef86d 100644
--- a/src/widgets/zoom-toolbar.cpp
+++ b/src/widgets/zoom-toolbar.cpp
@@ -25,7 +25,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "zoom-toolbar.h"