Reverted changes to r15024 after many building problems

(bzr r15027)

420 files changed, 1829 insertions, 183 deletions

diff --git a/src/2geom/polynomial.h b/src/2geom/polynomial.h
index 601f504c1..5ab2aa4c8 100644
--- a/src/2geom/polynomial.h
+++ b/src/2geom/polynomial.h
@@ -36,6 +36,7 @@
 #define LIB2GEOM_SEEN_POLY_H
 #include <assert.h>
 #include <vector>
+#include <iostream>
 #include <algorithm>
 #include <complex>
 #include <2geom/coord.h>
diff --git a/src/attribute-rel-css.cpp b/src/attribute-rel-css.cpp
index f8483d538..b904cd5f4 100644
--- a/src/attribute-rel-css.cpp
+++ b/src/attribute-rel-css.cpp
@@ -18,6 +18,7 @@
 
 #include <fstream>
 #include <sstream>
+#include <string>
 #include <iostream>
 
 #include "attribute-rel-css.h"
diff --git a/src/attribute-rel-svg.cpp b/src/attribute-rel-svg.cpp
index afa578061..0064f4c62 100644
--- a/src/attribute-rel-svg.cpp
+++ b/src/attribute-rel-svg.cpp
@@ -18,6 +18,7 @@
 
 #include <fstream>
 #include <sstream>
+#include <string>
 
 #include "attribute-rel-svg.h"
 
diff --git a/src/attribute-rel-util.cpp b/src/attribute-rel-util.cpp
index cf1140219..15c71daa7 100644
--- a/src/attribute-rel-util.cpp
+++ b/src/attribute-rel-util.cpp
@@ -11,6 +11,7 @@
 
 #include <fstream>
 #include <sstream>
+#include <string>
 #include <iostream>
 
 #include "preferences.h"
diff --git a/src/attribute-sort-util.cpp b/src/attribute-sort-util.cpp
index 7aa8d8357..5c01f7914 100644
--- a/src/attribute-sort-util.cpp
+++ b/src/attribute-sort-util.cpp
@@ -11,6 +11,7 @@
 
 #include <fstream>
 #include <sstream>
+#include <string>
 #include <iostream>
 #include <vector>
 #include <utility>      // std::pair
@@ -20,6 +21,7 @@
 
 #include "xml/repr.h"
 #include "xml/attribute-record.h"
+#include "xml/sp-css-attr.h"
 
 #include "attributes.h"
 
diff --git a/src/attributes.cpp b/src/attributes.cpp
index b06ff6048..e281dad65 100644
--- a/src/attributes.cpp
+++ b/src/attributes.cpp
@@ -14,6 +14,7 @@
 
 #include <glib.h> // g_assert()
 #include "attributes.h"
+#include <iostream>
 
 typedef struct {
     gint code;
diff --git a/src/box3d-side.cpp b/src/box3d-side.cpp
index 14b457ea6..93d55232e 100644
--- a/src/box3d-side.cpp
+++ b/src/box3d-side.cpp
@@ -22,7 +22,9 @@
 #include "persp3d.h"
 #include "persp3d-reference.h"
 #include "ui/tools/box3d-tool.h"
+#include "preferences.h"
 #include "desktop-style.h"
+#include "box3d.h"
 
 static void box3d_side_compute_corner_ids(Box3DSide *side, unsigned int corners[4]);
 
diff --git a/src/box3d.cpp b/src/box3d.cpp
index e50cc4afb..c4c2728e4 100644
--- a/src/box3d.cpp
+++ b/src/box3d.cpp
@@ -23,12 +23,18 @@
 #include "box3d.h"
 #include "box3d-side.h"
 #include "ui/tools/box3d-tool.h"
+#include "proj_pt.h"
+#include "transf_mat_3x4.h"
 #include "perspective-line.h"
+#include "inkscape.h"
+#include "persp3d.h"
+#include "line-geometry.h"
 #include "persp3d-reference.h"
 #include "uri.h"
 #include <2geom/line.h>
 #include "sp-guide.h"
 #include "sp-namedview.h"
+#include "preferences.h"
 
 #include "desktop.h"
 
diff --git a/src/color-profile.cpp b/src/color-profile.cpp
index d6ff50a2b..aea9ccab0 100644
--- a/src/color-profile.cpp
+++ b/src/color-profile.cpp
@@ -10,6 +10,7 @@
 # include <gdkmm/color.h>
 #endif
 
+#include <glibmm/checksum.h>
 #include <glib/gstdio.h>
 #include <fcntl.h>
 #include <glib/gi18n.h>
@@ -20,6 +21,7 @@
 
 #include <unistd.h>
 #include <cstring>
+#include <string>
 #include <io/sys.h>
 
 #ifdef WIN32
@@ -51,6 +53,8 @@
 #include <icm.h>
 #endif // WIN32
 
+#include <glibmm/convert.h>
+
 using Inkscape::ColorProfile;
 using Inkscape::ColorProfileImpl;
 
@@ -585,9 +589,9 @@ bool ColorProfile::GamutCheck(SPColor color)
         static_cast<guchar>(SP_RGBA32_B_U(val)),
         255};
 
-    cmsHTRANSFORM gamutCheck = ColorProfile::getTransfGamutCheck();
-    if (gamutCheck) {
-        cmsDoTransform(gamutCheck, &check_color, &outofgamut, 1);
+    cmsHTRANSFORM gamutCheck = ColorProfile::getTransfGamutCheck();

+    if (gamutCheck) {

+        cmsDoTransform(gamutCheck, &check_color, &outofgamut, 1);

     }
 
 #if HAVE_LIBLCMS1
@@ -616,6 +620,8 @@ private:
     cmsProfileClassSignature _profileClass;
 };
 
+#include <iostream>
+
 ProfileInfo::ProfileInfo( cmsHPROFILE prof, Glib::ustring const & path ) :
     _path( path ),
     _name( getNameFromProfile(prof) ),
diff --git a/src/conn-avoid-ref.cpp b/src/conn-avoid-ref.cpp
index e4c8ce7b5..9190fe633 100644
--- a/src/conn-avoid-ref.cpp
+++ b/src/conn-avoid-ref.cpp
@@ -18,12 +18,17 @@
 #include "sp-item.h"
 #include "display/curve.h"
 #include "2geom/line.h"
+#include "2geom/crossing.h"
 #include "2geom/convex-hull.h"
+#include "helper/geom-curves.h"
 #include "svg/stringstream.h"
 #include "conn-avoid-ref.h"
 #include "sp-conn-end.h"
 #include "sp-path.h"
 #include "libavoid/router.h"
+#include "libavoid/connector.h"
+#include "libavoid/geomtypes.h"
+#include "libavoid/shape.h"
 #include "xml/node.h"
 #include "document.h"
 #include "desktop.h"
@@ -33,6 +38,7 @@
 #include "sp-item-group.h"
 #include "inkscape.h"
 #include "verbs.h"
+#include <glibmm/i18n.h>
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/context-fns.cpp b/src/context-fns.cpp
index 46bd19cb3..e1df53d98 100644
--- a/src/context-fns.cpp
+++ b/src/context-fns.cpp
@@ -6,6 +6,7 @@
 #include "message-context.h"
 #include "message-stack.h"
 #include "snap.h"
+#include "sp-item.h"
 #include "sp-namedview.h"
 #include "ui/tools/tool-base.h"
 
diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index 393e0caa7..7f9b46c7d 100644
--- a/src/desktop-style.cpp
+++ b/src/desktop-style.cpp
@@ -24,7 +24,11 @@
 #include "selection.h"
 #include "inkscape.h"
 #include "style.h"
+#include "preferences.h"
+#include "sp-use.h"
 #include "filters/blend.h"
+#include "sp-filter.h"
+#include "sp-filter-reference.h"
 #include "filters/gaussian-blur.h"
 #include "sp-flowtext.h"
 #include "sp-flowregion.h"
@@ -35,12 +39,15 @@
 #include "sp-textpath.h"
 #include "sp-tref.h"
 #include "sp-tspan.h"
+#include "xml/repr.h"
 #include "xml/sp-css-attr.h"
 #include "sp-path.h"
 #include "ui/tools/tool-base.h"
 
 #include "desktop-style.h"
+#include "svg/svg-icc-color.h"
 #include "box3d-side.h"
+#include <2geom/math-utils.h>
 
 namespace {
 
diff --git a/src/desktop.cpp b/src/desktop.cpp
index 7e0953d4d..d482d0d7f 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -23,11 +23,12 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include "ui/dialog/dialog-manager.h"
 #include <glibmm/i18n.h>
+#include <sigc++/functors/mem_fun.h>
 
 #include <2geom/transforms.h>
 #include <2geom/rect.h>
@@ -44,24 +45,35 @@
 #include "display/canvas-temporary-item-list.h"
 #include "display/drawing-group.h"
 #include "display/gnome-canvas-acetate.h"
+#include "display/drawing.h"
 #include "display/snap-indicator.h"
 #include "display/sodipodi-ctrlrect.h"
 #include "display/sp-canvas-group.h"
+#include "display/sp-canvas.h"
 #include "display/sp-canvas-util.h"
+#include "document.h"
 #include "document-undo.h"
 #include "event-log.h"
 #include "helper/action-context.h"
 #include "ui/interface.h"
 #include "layer-fns.h"
 #include "layer-manager.h"
+#include "layer-model.h"
+#include "macros.h"
 #include "message-context.h"
 #include "message-stack.h"
+#include "preferences.h"
 #include "resource-manager.h"
 #include "ui/tools/select-tool.h"
+#include "selection.h"
+#include "sp-item-group.h"
+#include "sp-item-group.h"
 #include "sp-namedview.h"
 #include "sp-root.h"
+#include "sp-defs.h"
 #include "ui/tool-factory.h"
 #include "widgets/desktop-widget.h"
+#include "xml/repr.h"
 #include "helper/action.h" //sp_action_perform
 
 // TODO those includes are only for node tool quick zoom. Remove them after fixing it.
diff --git a/src/desktop.h b/src/desktop.h
index 672a39c98..3652d4a97 100644
--- a/src/desktop.h
+++ b/src/desktop.h
@@ -25,12 +25,15 @@
 #include "config.h"
 #endif
 
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 
 #include <2geom/affine.h>
+#include <2geom/rect.h>
 
 #include "ui/view/view.h"
 #include "display/rendermode.h"
+#include <glibmm/ustring.h>
 
 #include "preferences.h"
 #include "sp-gradient.h" // TODO refactor enums out to their own .h file
diff --git a/src/device-manager.cpp b/src/device-manager.cpp
index 2e153ebde..aa3874da8 100644
--- a/src/device-manager.cpp
+++ b/src/device-manager.cpp
@@ -8,6 +8,7 @@
  */
 
 #include "device-manager.h"
+#include <map>
 #include <set>
 
 #include "preferences.h"
@@ -18,6 +19,8 @@
 # include <gdkmm/devicemanager.h>
 #endif
 
+#include <glibmm/regex.h>
+
 #include <gtk/gtk.h>
 
 #define noDEBUG_VERBOSE 1
diff --git a/src/dir-util.h b/src/dir-util.h
index 90d7b3a54..327e1ad5f 100644
--- a/src/dir-util.h
+++ b/src/dir-util.h
@@ -1,4 +1,4 @@
-#ifndef SEEN_DIR_UTIL_H#include <config.h>
+#ifndef SEEN_DIR_UTIL_H
 #define SEEN_DIR_UTIL_H
 
 /*
diff --git a/src/document-subset.cpp b/src/document-subset.cpp
index 649b1a406..7fad73d9e 100644
--- a/src/document-subset.cpp
+++ b/src/document-subset.cpp
@@ -13,7 +13,18 @@
 #include "document.h"
 #include "sp-object.h"
 
+#include <glib.h>
+
+#include <sigc++/signal.h>
+#include <sigc++/functors/mem_fun.h>
+
+#include "util/list.h"
+#include "util/reverse-list.h"
+
+#include <vector>
 #include <map>
+#include <algorithm>
+#include <iterator>
 
 namespace Inkscape {
 
diff --git a/src/document-undo.cpp b/src/document-undo.cpp
index 113d09d66..c27904ea8 100644
--- a/src/document-undo.cpp
+++ b/src/document-undo.cpp
@@ -45,6 +45,7 @@
  */
 
 #include <string>
+#include <cstring>
 #include "xml/repr.h"
 #include "document-private.h"
 #include "inkscape.h"
diff --git a/src/document.cpp b/src/document.cpp
index 181029cd0..9f408788b 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -37,17 +37,17 @@
 #define noSP_DOCUMENT_DEBUG_UNDO
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 #include <string>
 #include <cstring>
 #include <2geom/transforms.h>
-#include <libcroco/cr-cascade.h>
 
 #include "widgets/desktop-widget.h"
 #include "desktop.h"
 #include "dir-util.h"
 #include "display/drawing.h"
+#include "display/drawing-item.h"
 #include "document-private.h"
 #include "document-undo.h"
 #include "id-clash.h"
@@ -55,12 +55,18 @@
 #include "inkscape-version.h"
 #include "libavoid/router.h"
 #include "persp3d.h"
+#include "preferences.h"
 #include "profile-manager.h"
 #include "rdf.h"
 #include "sp-factory.h"
+#include "sp-item-group.h"
 #include "sp-namedview.h"
 #include "sp-symbol.h"
+#include "transf_mat_3x4.h"
+#include "util/units.h"
+#include "xml/repr.h"
 #include "xml/rebase-hrefs.h"
+#include "libcroco/cr-cascade.h"
 
 using Inkscape::DocumentUndo;
 using Inkscape::Util::unit_table;
diff --git a/src/document.h b/src/document.h
index 997435b55..813d4ae49 100644
--- a/src/document.h
+++ b/src/document.h
@@ -17,15 +17,18 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <stddef.h>
 #include <sigc++/sigc++.h>
+#include "libcroco/cr-cascade.h"
 #include <2geom/forward.h>
 #include "inkgc/gc-managed.h"
 #include "gc-finalized.h"
 #include "gc-anchored.h"
 #include <glibmm/ustring.h>
 #include <boost/ptr_container/ptr_list.hpp>
-#include <deque>
 #include <vector>
+#include <set>
+#include <deque>
 
 namespace Avoid {
 class Router;
@@ -57,9 +60,6 @@ class Persp3D;
 class Persp3DImpl;
 class SPItemCtx;
 
-struct _CRCascade;
-typedef struct _CRCascade CRCascade;
-
 namespace Proj {
     class TransfMat3x4;
 }
diff --git a/src/ege-color-prof-tracker.cpp b/src/ege-color-prof-tracker.cpp
index 332a16d3c..78ee6b8b5 100644
--- a/src/ege-color-prof-tracker.cpp
+++ b/src/ege-color-prof-tracker.cpp
@@ -45,6 +45,7 @@
 
 #ifdef GDK_WINDOWING_X11
 #include <X11/Xlib.h>
+#include <X11/Xatom.h>
 
 #include <gdk/gdkx.h>
 #endif /* GDK_WINDOWING_X11 */
diff --git a/src/event-log.cpp b/src/event-log.cpp
index 5a73b649e..db680d6d2 100644
--- a/src/event-log.cpp
+++ b/src/event-log.cpp
@@ -12,13 +12,17 @@
 
 #include "event-log.h"
 #include <glibmm/i18n.h>
+#include <gtkmm/treemodel.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/make_shared.hpp>
 
 #include "desktop.h"
 #include "inkscape.h"
+#include "util/signal-blocker.h"
 #include "util/ucompose.hpp"
 #include "document.h"
+#include "xml/repr.h"
+#include "sp-object.h"
 
 namespace
 {
diff --git a/src/extension/db.cpp b/src/extension/db.cpp
index f17b784a9..a3c54915d 100644
--- a/src/extension/db.cpp
+++ b/src/extension/db.cpp
@@ -13,7 +13,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 #include "db.h"
 #include "input.h"
diff --git a/src/extension/dependency.cpp b/src/extension/dependency.cpp
index 837520381..624be12f9 100644
--- a/src/extension/dependency.cpp
+++ b/src/extension/dependency.cpp
@@ -9,12 +9,14 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include <glibmm/i18n.h>
 #include <glibmm/fileutils.h>
 #include <glibmm/miscutils.h>
+#include "config.h"
+#include "path-prefix.h"
 #include "dependency.h"
 #include "db.h"
 #include "extension.h"
diff --git a/src/extension/effect.cpp b/src/extension/effect.cpp
index ef254f623..e7299ba51 100644
--- a/src/extension/effect.cpp
+++ b/src/extension/effect.cpp
@@ -13,6 +13,7 @@
 #include "helper/action.h"
 #include "ui/view/view.h"
 
+#include "selection.h"
 #include "sp-namedview.h"
 #include "desktop.h"
 #include "implementation/implementation.h"
diff --git a/src/extension/error-file.cpp b/src/extension/error-file.cpp
index 9ec643759..db354c0ce 100644
--- a/src/extension/error-file.cpp
+++ b/src/extension/error-file.cpp
@@ -9,7 +9,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include "ui/dialog/extensions.h"
diff --git a/src/extension/execution-env.cpp b/src/extension/execution-env.cpp
index 569e2c762..d5c80f26e 100644
--- a/src/extension/execution-env.cpp
+++ b/src/extension/execution-env.cpp
@@ -8,8 +8,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
 #endif
 
 #include "gtkmm/messagedialog.h"
@@ -23,6 +25,7 @@
 #include "document.h"
 #include "document-undo.h"
 #include "desktop.h"
+#include "ui/view/view.h"
 #include "sp-namedview.h"
 
 #include "display/sp-canvas.h"
diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp
index 56ff0a5f4..6f7539360 100644
--- a/src/extension/extension.cpp
+++ b/src/extension/extension.cpp
@@ -16,7 +16,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <gtkmm/box.h>
diff --git a/src/extension/implementation/implementation.cpp b/src/extension/implementation/implementation.cpp
index 995d3d9ad..92a8a2833 100644
--- a/src/extension/implementation/implementation.cpp
+++ b/src/extension/implementation/implementation.cpp
@@ -11,7 +11,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 #include "implementation.h"
 
@@ -22,6 +22,7 @@
 #include "selection.h"
 #include "desktop.h"
 
+#include "ui/view/view.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/implementation/xslt.cpp b/src/extension/implementation/xslt.cpp
index 373378d97..85ae9efde 100644
--- a/src/extension/implementation/xslt.cpp
+++ b/src/extension/implementation/xslt.cpp
@@ -13,7 +13,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include "file.h"
@@ -22,11 +22,13 @@
 #include "../output.h"
 #include "extension/input.h"
 
+#include "xml/repr.h"
 #include "io/sys.h"
 #include <unistd.h>
 #include <cstring>
 #include "document.h"
 
+#include <libxml/parser.h>
 #include <libxslt/transform.h>
 #include <libxslt/xsltutils.h>
 
diff --git a/src/extension/input.cpp b/src/extension/input.cpp
index 2ba48ffda..5cef38009 100644
--- a/src/extension/input.cpp
+++ b/src/extension/input.cpp
@@ -8,12 +8,14 @@
  */
 
 #ifdef HAVE_CONFIG_H
+# include "config.h"
 #endif
 
 #include "prefdialog.h"
 #include "implementation/implementation.h"
 #include "timer.h"
 #include "input.h"
+#include "io/sys.h"
 
 /* Inkscape::Extension::Input */
 
diff --git a/src/extension/loader.cpp b/src/extension/loader.cpp
index 3bea0e1e6..863a176ca 100644
--- a/src/extension/loader.cpp
+++ b/src/extension/loader.cpp
@@ -11,6 +11,7 @@
 
 #include "loader.h"
 #include "system.h"
+#include <exception>
 #include <string.h>
 #include "dependency.h"
 #include "inkscape-version.h"
diff --git a/src/extension/loader.h b/src/extension/loader.h
index cd362f87b..0d3a69061 100644
--- a/src/extension/loader.h
+++ b/src/extension/loader.h
@@ -1,5 +1,4 @@
-/** @file#include <config.h>
-
+/** @file
  * Loader for external plug-ins.
  *//*
  *
diff --git a/src/extension/patheffect.cpp b/src/extension/patheffect.cpp
index e30ec97df..bedab7fd8 100644
--- a/src/extension/patheffect.cpp
+++ b/src/extension/patheffect.cpp
@@ -8,6 +8,7 @@
  */
 
 #include "document-private.h"
+#include "sp-object.h"
 
 #include "patheffect.h"
 #include "db.h"
diff --git a/src/extension/system.cpp b/src/extension/system.cpp
index df9e967bc..3c623455a 100644
--- a/src/extension/system.cpp
+++ b/src/extension/system.cpp
@@ -17,10 +17,12 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include "ui/interface.h"
+#include <unistd.h>
+#include <glibmm/miscutils.h>
 
 #include "system.h"
 #include "preferences.h"
@@ -38,7 +40,7 @@
 #include "inkscape.h"
 #include "document-undo.h"
 #include "loader.h"
-#include <glibmm/miscutils.h>
+
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/file.cpp b/src/file.cpp
index a5e1c3d3b..650ce5d0f 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -33,12 +33,14 @@
 #include "ui/dialog/ocaldialogs.h"
 #include "desktop.h"
 
+#include "dir-util.h"
 #include "document-private.h"
 #include "document-undo.h"
 #include "ui/tools/tool-base.h"
 #include "extension/db.h"
 #include "extension/input.h"
 #include "extension/output.h"
+#include "extension/system.h"
 #include "file.h"
 #include "helper/png-write.h"
 #include "id-clash.h"
@@ -46,23 +48,34 @@
 #include "inkscape-version.h"
 #include "ui/interface.h"
 #include "io/sys.h"
+#include "message.h"
 #include "message-stack.h"
 #include "path-prefix.h"
+#include "preferences.h"
 #include "print.h"
 #include "resource-manager.h"
 #include "rdf.h"
 #include "selection-chemistry.h"
+#include "selection.h"
 #include "sp-namedview.h"
 #include "style.h"
 #include "ui/view/view-widget.h"
+#include "uri.h"
 #include "xml/rebase-hrefs.h"
 #include "xml/sp-css-attr.h"
 #include "verbs.h"
 #include "event-log.h"
 #include "ui/dialog/font-substitution.h"
 
+#include <gtk/gtk.h>
 #include <gtkmm/main.h>
 
+#include <glibmm/convert.h>
+#include <glibmm/i18n.h>
+#include <glibmm/miscutils.h>
+
+#include <string>
+
 using Inkscape::DocumentUndo;
 
 #ifdef WITH_GNOME_VFS
diff --git a/src/filter-chemistry.cpp b/src/filter-chemistry.cpp
index 3618b2642..9298a1ffc 100644
--- a/src/filter-chemistry.cpp
+++ b/src/filter-chemistry.cpp
@@ -26,6 +26,11 @@
 
 #include "filters/blend.h"
 #include "filters/gaussian-blur.h"
+#include "sp-filter.h"
+#include "sp-filter-reference.h"
+#include "svg/css-ostringstream.h"
+
+#include "xml/repr.h"
 
 /**
  * Count how many times the filter is used by the styles of o and its
diff --git a/src/filters/blend.cpp b/src/filters/blend.cpp
index b3767632f..6e92ef50f 100644
--- a/src/filters/blend.cpp
+++ b/src/filters/blend.cpp
@@ -18,9 +18,13 @@
 #include "sp-filter.h"
 #include "filters/blend.h"
 #include "attributes.h"
+#include "svg/svg.h"
 #include "xml/repr.h"
 
 #include "display/nr-filter.h"
+#include "display/nr-filter-primitive.h"
+#include "display/nr-filter-blend.h"
+#include "display/nr-filter-types.h"
 
 SPFeBlend::SPFeBlend()
     : SPFilterPrimitive(), blend_mode(Inkscape::Filters::BLEND_NORMAL),
diff --git a/src/filters/colormatrix.cpp b/src/filters/colormatrix.cpp
index 0e8398ace..a7f0296c2 100644
--- a/src/filters/colormatrix.cpp
+++ b/src/filters/colormatrix.cpp
@@ -23,6 +23,7 @@
 #include "helper-fns.h"
 
 #include "display/nr-filter.h"
+#include "display/nr-filter-colormatrix.h"
 
 SPFeColorMatrix::SPFeColorMatrix() 
     : SPFilterPrimitive(), type(Inkscape::Filters::COLORMATRIX_MATRIX), value(0)
diff --git a/src/filters/componenttransfer-funcnode.cpp b/src/filters/componenttransfer-funcnode.cpp
index 23c8dbd96..76e99a648 100644
--- a/src/filters/componenttransfer-funcnode.cpp
+++ b/src/filters/componenttransfer-funcnode.cpp
@@ -19,10 +19,12 @@
 #include "document.h"
 #include "componenttransfer.h"
 #include "componenttransfer-funcnode.h"
+#include "display/nr-filter-component-transfer.h"
 #include "xml/repr.h"
 #include "helper-fns.h"
 
 #define SP_MACROS_SILENT
+#include "macros.h"
 
 
 /* FeFuncNode class */
diff --git a/src/filters/componenttransfer.cpp b/src/filters/componenttransfer.cpp
index 47e570fa4..3d0264390 100644
--- a/src/filters/componenttransfer.cpp
+++ b/src/filters/componenttransfer.cpp
@@ -12,12 +12,16 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <string.h>
+
 #include "document.h"
 #include "attributes.h"
+#include "svg/svg.h"
 #include "filters/componenttransfer.h"
 #include "filters/componenttransfer-funcnode.h"
 #include "xml/repr.h"
 #include "display/nr-filter.h"
+#include "display/nr-filter-component-transfer.h"
 
 SPFeComponentTransfer::SPFeComponentTransfer()
     : SPFilterPrimitive(), renderer(NULL)
diff --git a/src/filters/convolvematrix.cpp b/src/filters/convolvematrix.cpp
index 1b1e58407..3a443bebc 100644
--- a/src/filters/convolvematrix.cpp
+++ b/src/filters/convolvematrix.cpp
@@ -17,10 +17,12 @@
 #include <math.h>
 #include <vector>
 #include "attributes.h"
+#include "svg/svg.h"
 #include "filters/convolvematrix.h"
 #include "helper-fns.h"
 #include "xml/repr.h"
 #include "display/nr-filter.h"
+#include "display/nr-filter-convolve-matrix.h"
 
 SPFeConvolveMatrix::SPFeConvolveMatrix() : SPFilterPrimitive() {
 	this->bias = 0;
diff --git a/src/filters/distantlight.cpp b/src/filters/distantlight.cpp
index 617f53121..fb7380174 100644
--- a/src/filters/distantlight.cpp
+++ b/src/filters/distantlight.cpp
@@ -23,6 +23,7 @@
 #include "xml/repr.h"
 
 #define SP_MACROS_SILENT
+#include "macros.h"
 
 
 SPFeDistantLight::SPFeDistantLight()
diff --git a/src/filters/flood.cpp b/src/filters/flood.cpp
index cbcaa83eb..94ca61b98 100644
--- a/src/filters/flood.cpp
+++ b/src/filters/flood.cpp
@@ -19,6 +19,7 @@
 #include "svg/svg-color.h"
 #include "filters/flood.h"
 #include "xml/repr.h"
+#include "helper-fns.h"
 #include "display/nr-filter.h"
 #include "display/nr-filter-flood.h"
 
diff --git a/src/filters/gaussian-blur.cpp b/src/filters/gaussian-blur.cpp
index 814224ab1..43a1f6dfb 100644
--- a/src/filters/gaussian-blur.cpp
+++ b/src/filters/gaussian-blur.cpp
@@ -14,7 +14,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include "attributes.h"
@@ -23,7 +23,9 @@
 #include "xml/repr.h"
 
 #include "display/nr-filter.h"
+#include "display/nr-filter-primitive.h"
 #include "display/nr-filter-gaussian.h"
+#include "display/nr-filter-types.h"
 
 SPGaussianBlur::SPGaussianBlur() : SPFilterPrimitive() {
 }
diff --git a/src/filters/image.cpp b/src/filters/image.cpp
index 887201eb3..62e8b76b9 100644
--- a/src/filters/image.cpp
+++ b/src/filters/image.cpp
@@ -18,9 +18,12 @@
 #include "display/nr-filter-image.h"
 #include "uri.h"
 #include "uri-references.h"
+#include "enums.h"
 #include "attributes.h"
+#include "svg/svg.h"
 #include "image.h"
 #include "xml/repr.h"
+#include <string.h>
 
 #include "display/nr-filter.h"
 
diff --git a/src/filters/morphology.cpp b/src/filters/morphology.cpp
index b3cfa0697..326c9b7a6 100644
--- a/src/filters/morphology.cpp
+++ b/src/filters/morphology.cpp
@@ -20,6 +20,7 @@
 #include "morphology.h"
 #include "xml/repr.h"
 #include "display/nr-filter.h"
+#include "display/nr-filter-morphology.h"
 
 SPFeMorphology::SPFeMorphology() : SPFilterPrimitive() {
 	this->Operator = Inkscape::Filters::MORPHOLOGY_OPERATOR_ERODE;
diff --git a/src/filters/spotlight.cpp b/src/filters/spotlight.cpp
index a1e7207f3..2e55d39d0 100644
--- a/src/filters/spotlight.cpp
+++ b/src/filters/spotlight.cpp
@@ -23,6 +23,7 @@
 #include "xml/repr.h"
 
 #define SP_MACROS_SILENT
+#include "macros.h"
 
 SPFeSpotLight::SPFeSpotLight()
     : SPObject(), x(0), x_set(FALSE), y(0), y_set(FALSE), z(0), z_set(FALSE), pointsAtX(0), pointsAtX_set(FALSE),
diff --git a/src/filters/turbulence.cpp b/src/filters/turbulence.cpp
index 9af51892e..7541175ed 100644
--- a/src/filters/turbulence.cpp
+++ b/src/filters/turbulence.cpp
@@ -19,8 +19,10 @@
 #include "turbulence.h"
 #include "helper-fns.h"
 #include "xml/repr.h"
+#include <string.h>
 
 #include "display/nr-filter.h"
+#include "display/nr-filter-turbulence.h"
 
 SPFeTurbulence::SPFeTurbulence() : SPFilterPrimitive() {
 	this->stitchTiles = 0;
diff --git a/src/gc-anchored.cpp b/src/gc-anchored.cpp
index 4abd44b57..0350e6bdd 100644
--- a/src/gc-anchored.cpp
+++ b/src/gc-anchored.cpp
@@ -14,6 +14,7 @@
 #include "debug/event-tracker.h"
 #include "debug/simple-event.h"
 #include "debug/demangle.h"
+#include "util/share.h"
 #include "util/format.h"
 
 namespace Inkscape {
diff --git a/src/gc-finalized.cpp b/src/gc-finalized.cpp
index 1deadcb1f..88685ae52 100644
--- a/src/gc-finalized.cpp
+++ b/src/gc-finalized.cpp
@@ -17,6 +17,7 @@
 #include "debug/simple-event.h"
 #include "debug/event-tracker.h"
 #include "util/format.h"
+#include "util/share.h"
 #include "gc-finalized.h"
 
 namespace Inkscape {
diff --git a/src/gradient-chemistry.cpp b/src/gradient-chemistry.cpp
index ae82499de..edeb523d7 100644
--- a/src/gradient-chemistry.cpp
+++ b/src/gradient-chemistry.cpp
@@ -24,6 +24,7 @@
 #include <2geom/bezier-curve.h>
 #include <2geom/crossing.h>
 #include <2geom/line.h>
+#include <2geom/angle.h>
 
 #include "style.h"
 #include "document-private.h"
@@ -37,6 +38,7 @@
 #include <glibmm/i18n.h>
 
 #include "sp-gradient-reference.h"
+#include "sp-gradient-vector.h"
 #include "sp-linear-gradient.h"
 #include "sp-radial-gradient.h"
 #include "sp-mesh.h"
@@ -46,9 +48,11 @@
 
 #include "sp-text.h"
 #include "sp-tspan.h"
+#include "xml/repr.h"
 #include "svg/svg.h"
 #include "svg/svg-color.h"
 #include "svg/css-ostringstream.h"
+#include "preferences.h"
 
 #define noSP_GR_VERBOSE
 
diff --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp
index aa4da7fcc..613dc2fc1 100644
--- a/src/gradient-drag.cpp
+++ b/src/gradient-drag.cpp
@@ -15,7 +15,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include <glibmm/i18n.h>
@@ -32,15 +32,20 @@
 #include "display/sp-ctrlline.h"
 #include "display/sp-ctrlcurve.h"
 #include "display/sp-canvas-util.h"
+#include "xml/repr.h"
 #include "xml/sp-css-attr.h"
 #include "svg/css-ostringstream.h"
 #include "svg/svg.h"
+#include "preferences.h"
 #include "inkscape.h"
+#include "sp-item.h"
 #include "style.h"
 #include "knot.h"
 #include "sp-linear-gradient.h"
 #include "sp-radial-gradient.h"
 #include "sp-mesh.h"
+#include "sp-mesh-row.h"
+#include "sp-mesh-patch.h"
 #include "gradient-chemistry.h"
 #include "gradient-drag.h"
 #include "sp-stop.h"
diff --git a/src/graphlayout.cpp b/src/graphlayout.cpp
index 52bb6b6a2..3956b39fe 100644
--- a/src/graphlayout.cpp
+++ b/src/graphlayout.cpp
@@ -13,21 +13,31 @@
  */
 
 #include <iostream>
+#include <config.h>
 #include <map>
 #include <vector>
 #include <algorithm>
 #include <cstring>
+#include <cstdlib>
+#include <float.h>
 #include <2geom/transforms.h>
 
 #include "desktop.h"
 #include "inkscape.h"
 #include "sp-namedview.h"
 #include "graphlayout.h"
+#include "sp-path.h"
+#include "sp-item.h"
 #include "sp-item-transform.h"
+#include "sp-conn-end-pair.h"
 #include "style.h"
 #include "conn-avoid-ref.h"
+#include "libavoid/connector.h"
 #include "libavoid/router.h"
+#include "libavoid/geomtypes.h"
 #include "libcola/cola.h"
+#include "libvpsc/generate-constraints.h"
+#include "preferences.h"
 
 using namespace std;
 using namespace cola;
diff --git a/src/helper/action-context.cpp b/src/helper/action-context.cpp
index 1ea12776b..d52e43d96 100644
--- a/src/helper/action-context.cpp
+++ b/src/helper/action-context.cpp
@@ -14,6 +14,7 @@
 #include "layer-model.h"
 #include "selection.h"
 #include "helper/action-context.h"
+#include "ui/view/view.h"
 
 namespace Inkscape {
 
diff --git a/src/helper/action.cpp b/src/helper/action.cpp
index e37575a9c..060bf317c 100644
--- a/src/helper/action.cpp
+++ b/src/helper/action.cpp
@@ -9,6 +9,8 @@
  * This code is in public domain
  */
 
+#include <string.h>
+
 #include "debug/logger.h"
 #include "debug/timestamp.h"
 #include "debug/simple-event.h"
diff --git a/src/helper/action.h b/src/helper/action.h
index 9a16cdfc7..4b81ee7f9 100644
--- a/src/helper/action.h
+++ b/src/helper/action.h
@@ -15,7 +15,6 @@
 #include "helper/action-context.h"
 #include <sigc++/signal.h>
 #include <glibmm/ustring.h>
-#include <glib-object.h>
 
 #define SP_TYPE_ACTION (sp_action_get_type())
 #define SP_ACTION(o) (G_TYPE_CHECK_INSTANCE_CAST((o), SP_TYPE_ACTION, SPAction))
diff --git a/src/helper/geom-nodetype.cpp b/src/helper/geom-nodetype.cpp
index da620b3fd..fe8e8af0e 100644
--- a/src/helper/geom-nodetype.cpp
+++ b/src/helper/geom-nodetype.cpp
@@ -12,6 +12,8 @@
 #include "helper/geom-nodetype.h"
 
 #include <2geom/curve.h>
+#include <2geom/point.h>
+#include <vector>
 
 namespace Geom {
 
diff --git a/src/helper/geom-pathstroke.cpp b/src/helper/geom-pathstroke.cpp
index 10641692d..d2e9f9a1b 100644
--- a/src/helper/geom-pathstroke.cpp
+++ b/src/helper/geom-pathstroke.cpp
@@ -9,9 +9,13 @@
 
 #include <iomanip>
 #include <2geom/path-sink.h>
+#include <2geom/point.h>
+#include <2geom/bezier-curve.h>
+#include <2geom/elliptical-arc.h>
 #include <2geom/sbasis-to-bezier.h> // cubicbezierpath_from_sbasis
 #include <2geom/path-intersection.h>
 #include <2geom/circle.h>
+#include <math.h>
 
 #include "helper/geom-pathstroke.h"
 
diff --git a/src/helper/geom.cpp b/src/helper/geom.cpp
index 42c494c00..ecb330b01 100644
--- a/src/helper/geom.cpp
+++ b/src/helper/geom.cpp
@@ -12,8 +12,15 @@
 #include <algorithm>
 #include "helper/geom.h"
 #include "helper/geom-curves.h"
+#include <typeinfo>
+#include <2geom/pathvector.h>
+#include <2geom/path.h>
 #include <2geom/curves.h>
+#include <2geom/transforms.h>
+#include <2geom/rect.h>
+#include <2geom/coord.h>
 #include <2geom/sbasis-to-bezier.h>
+#include <math.h> // for M_PI
 
 using Geom::X;
 using Geom::Y;
diff --git a/src/helper/pixbuf-ops.cpp b/src/helper/pixbuf-ops.cpp
index 8a363d736..9639096fb 100644
--- a/src/helper/pixbuf-ops.cpp
+++ b/src/helper/pixbuf-ops.cpp
@@ -12,9 +12,10 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
+#include <png.h>
 #include <boost/scoped_ptr.hpp>
 #include <2geom/transforms.h>
 
@@ -23,8 +24,11 @@
 #include "display/cairo-utils.h"
 #include "display/drawing.h"
 #include "display/drawing-context.h"
+#include "display/drawing-item.h"
 #include "document.h"
+#include "sp-item.h"
 #include "sp-root.h"
+#include "sp-use.h"
 #include "sp-defs.h"
 #include "util/units.h"
 
diff --git a/src/helper/png-write.cpp b/src/helper/png-write.cpp
index e2b7e5b8c..9430feeff 100644
--- a/src/helper/png-write.cpp
+++ b/src/helper/png-write.cpp
@@ -14,17 +14,19 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <png.h>
 #include "ui/interface.h"
 #include <2geom/rect.h>
 #include <2geom/transforms.h>
+#include <glib.h>
 #include "png-write.h"
 #include "io/sys.h"
 #include "display/drawing.h"
 #include "display/drawing-context.h"
+#include "display/drawing-item.h"
 #include "document.h"
 #include "sp-item.h"
 #include "sp-root.h"
diff --git a/src/id-clash.cpp b/src/id-clash.cpp
index b14526e79..4bd66e858 100644
--- a/src/id-clash.cpp
+++ b/src/id-clash.cpp
@@ -23,6 +23,8 @@
 #include "sp-object.h"
 #include "style.h"
 #include "sp-paint-server.h"
+#include "xml/node.h"
+#include "xml/repr.h"
 #include "sp-root.h"
 #include "sp-gradient.h"
 
diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index 0fb46e893..888a64430 100644
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
@@ -15,7 +15,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <errno.h>
@@ -40,8 +40,14 @@
 # include <shlobj.h>
 #endif
 
+#include <cstring>
 #include <glib/gstdio.h>
 #include <glibmm/i18n.h>
+#include <glibmm/miscutils.h>
+#include <glibmm/convert.h>
+#include <gtk/gtk.h>
+#include <signal.h>
+#include <string>
 
 #include "desktop.h"
 
@@ -52,12 +58,17 @@
 #include "extension/output.h"
 #include "extension/system.h"
 #include "helper/action-context.h"
+#include "helper/sp-marshal.h"
 #include "inkscape.h"
 #include "io/sys.h"
+#include "layer-model.h"
 #include "message-stack.h"
+#include "preferences.h"
 #include "resource-manager.h"
+#include "selection.h"
 #include "ui/tools/tool-base.h"
 #include "ui/dialog/debug.h"
+#include "xml/repr.h"
 
 /* Backbones of configuration xml data */
 #include "menus-skeleton.h"
diff --git a/src/inkscape.h b/src/inkscape.h
index 96a9b8e93..fe424377c 100644
--- a/src/inkscape.h
+++ b/src/inkscape.h
@@ -16,6 +16,7 @@
 #include <map>
 #include <vector>
 #include <glib.h>
+#include <glib-object.h>
 #include <sigc++/signal.h>
 #include "layer-model.h"
 #include "selection.h"
diff --git a/src/inkview.cpp b/src/inkview.cpp
index b377a3bd0..db4b1aeb0 100644
--- a/src/inkview.cpp
+++ b/src/inkview.cpp
@@ -35,6 +35,7 @@
 #include <locale.h>
 
 #include <gtkmm/main.h>
+#include <glib.h>
 
 // #include <stropts.h>
 
@@ -57,6 +58,8 @@
 
 #include "inkscape.h"
 
+#include <iostream>
+
 #ifndef HAVE_BIND_TEXTDOMAIN_CODESET
 #define bind_textdomain_codeset(p,c)
 #endif
diff --git a/src/knot-holder-entity.cpp b/src/knot-holder-entity.cpp
index b3c913c41..173025920 100644
--- a/src/knot-holder-entity.cpp
+++ b/src/knot-holder-entity.cpp
@@ -25,7 +25,8 @@
 #include "snap.h"
 #include "desktop.h"
 #include "sp-namedview.h"
-#include <gdk/gdk.h>
+#include <2geom/affine.h>
+#include <2geom/transforms.h>
 
 int KnotHolderEntity::counter = 0;
 
diff --git a/src/knot.cpp b/src/knot.cpp
index c914315ec..bfc0c4f0b 100644
--- a/src/knot.cpp
+++ b/src/knot.cpp
@@ -13,6 +13,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
+# include <config.h>
 #endif
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
@@ -23,6 +24,7 @@
 #include "knot-ptr.h"
 #include "document.h"
 #include "document-undo.h"
+#include "preferences.h"
 #include "message-stack.h"
 #include "message-context.h"
 #include "ui/tools-switch.h"
diff --git a/src/knotholder.cpp b/src/knotholder.cpp
index 98348a59f..a2d1cf017 100644
--- a/src/knotholder.cpp
+++ b/src/knotholder.cpp
@@ -22,6 +22,7 @@
 #include "knotholder.h"
 #include "knot-holder-entity.h"
 #include "ui/tools/rect-tool.h"
+#include "sp-rect.h"
 #include "ui/tools/arc-tool.h"
 #include "sp-ellipse.h"
 #include "ui/tools/tweak-tool.h"
@@ -36,9 +37,12 @@
 #include "live_effects/effect.h"
 #include "desktop.h"
 #include "display/sp-canvas.h"
+#include "display/sp-canvas-item.h"
 #include "verbs.h"
 #include "ui/control-manager.h"
 
+#include "xml/repr.h" // for debugging only
+
 using Inkscape::ControlManager;
 using Inkscape::DocumentUndo;
 
diff --git a/src/layer-manager.cpp b/src/layer-manager.cpp
index 3a6cce99c..19c4b890c 100644
--- a/src/layer-manager.cpp
+++ b/src/layer-manager.cpp
@@ -17,10 +17,16 @@
 #include "desktop.h"
 
 #include "layer-manager.h"
+#include "preferences.h"
+#include "ui/view/view.h"
 #include "selection.h"
+#include "sp-object.h"
 #include "sp-item-group.h"
+#include "xml/node.h"
 #include "xml/node-observer.h"
 #include "util/format.h"
+// #include "debug/event-tracker.h"
+// #include "debug/simple-event.h"
 
 namespace Inkscape {
 
diff --git a/src/layer-model.cpp b/src/layer-model.cpp
index b941e43b1..6833852ad 100644
--- a/src/layer-model.cpp
+++ b/src/layer-model.cpp
@@ -22,7 +22,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include "document.h"
@@ -32,7 +32,11 @@
 #include "sp-defs.h"
 #include "sp-item.h"
 #include "sp-item-group.h"
+#include "sp-object.h"
 #include "sp-root.h"
+#include <glib.h>
+#include <glibmm/i18n.h>
+#include <sigc++/functors/ptr_fun.h>
 
 // Callbacks
 static void _layer_activated(SPObject *layer, Inkscape::LayerModel *layer_model);
diff --git a/src/line-geometry.cpp b/src/line-geometry.cpp
index 6e0f82d45..c5357e213 100644
--- a/src/line-geometry.cpp
+++ b/src/line-geometry.cpp
@@ -10,6 +10,7 @@
  */
 
 #include "line-geometry.h"
+#include "inkscape.h"
 #include "desktop.h"
 #include "desktop-style.h"
 
diff --git a/src/line-snapper.cpp b/src/line-snapper.cpp
index 6be447a4f..6122b133a 100644
--- a/src/line-snapper.cpp
+++ b/src/line-snapper.cpp
@@ -11,8 +11,10 @@
  */
 
 #include <2geom/line.h>
+#include <cassert>
 
 #include "line-snapper.h"
+#include "snapped-line.h"
 #include "snap.h"
 
 Inkscape::LineSnapper::LineSnapper(SnapManager *sm, Geom::Coord const d) : Snapper(sm, d)
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index ef807d586..1868ca43b 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -8,11 +8,12 @@
 //#define LPE_ENABLE_TEST_EFFECTS //uncomment for toy effects
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 // include effects:
 #include "live_effects/lpe-patternalongpath.h"
+#include "live_effects/effect.h"
 #include "live_effects/lpe-angle_bisector.h"
 #include "live_effects/lpe-attach-path.h"
 #include "live_effects/lpe-bendpath.h"
@@ -63,14 +64,30 @@
 #include "live_effects/lpe-vonkoch.h"
 
 #include "xml/node-event-vector.h"
+#include "sp-object.h"
+#include "attributes.h"
 #include "message-stack.h"
+#include "desktop.h"
+#include "inkscape.h"
+#include "document.h"
 #include "document-private.h"
+#include "xml/document.h"
+#include <glibmm/i18n.h>
 #include "ui/tools/pen-tool.h"
 #include "ui/tools-switch.h"
 #include "knotholder.h"
+#include "sp-lpe-item.h"
 #include "live_effects/lpeobject.h"
+#include "live_effects/parameter/parameter.h"
+#include <glibmm/ustring.h>
 #include "display/curve.h"
 
+#include <exception>
+
+#include <2geom/sbasis-to-bezier.h>
+#include <2geom/affine.h>
+#include <2geom/pathvector.h>
+
 
 namespace Inkscape {
 
diff --git a/src/live_effects/lpe-angle_bisector.cpp b/src/live_effects/lpe-angle_bisector.cpp
index 9bfbf4ca8..900d29e3a 100644
--- a/src/live_effects/lpe-angle_bisector.cpp
+++ b/src/live_effects/lpe-angle_bisector.cpp
@@ -12,6 +12,7 @@
 
 #include "live_effects/lpe-angle_bisector.h"
 
+#include <2geom/path.h>
 #include <2geom/sbasis-to-bezier.h>
 
 #include "sp-lpe-item.h"
diff --git a/src/live_effects/lpe-attach-path.cpp b/src/live_effects/lpe-attach-path.cpp
index d2b44dd4e..21459f322 100644
--- a/src/live_effects/lpe-attach-path.cpp
+++ b/src/live_effects/lpe-attach-path.cpp
@@ -10,9 +10,16 @@
 #include "live_effects/lpe-attach-path.h"
 
 #include "display/curve.h"
+#include "sp-item.h"
+#include "2geom/path.h"
 #include "sp-shape.h"
 #include "sp-text.h"
+#include "2geom/bezier-curve.h"
 #include "2geom/path-sink.h"
+#include "parameter/parameter.h"
+#include "live_effects/parameter/point.h"
+#include "parameter/originalpath.h"
+#include "2geom/affine.h"
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-bendpath.cpp b/src/live_effects/lpe-bendpath.cpp
index c24d38d7b..bc112285f 100644
--- a/src/live_effects/lpe-bendpath.cpp
+++ b/src/live_effects/lpe-bendpath.cpp
@@ -6,11 +6,27 @@
  */
 
 #include "live_effects/lpe-bendpath.h"
+#include "sp-shape.h"
+#include "sp-item.h"
+#include "sp-path.h"
 #include "sp-item-group.h"
+#include "svg/svg.h"
+#include "ui/widget/scalar.h"
+
+#include <2geom/sbasis.h>
+#include <2geom/sbasis-geometric.h>
+#include <2geom/bezier-to-sbasis.h>
+#include <2geom/sbasis-to-bezier.h>
+#include <2geom/d2.h>
+#include <2geom/piecewise.h>
 
 #include "knot-holder-entity.h"
 #include "knotholder.h"
 
+#include <glibmm/i18n.h>
+
+#include <algorithm>
+
 using std::vector;
 
 
diff --git a/src/live_effects/lpe-bounding-box.cpp b/src/live_effects/lpe-bounding-box.cpp
index cfe1f5165..43a60d482 100644
--- a/src/live_effects/lpe-bounding-box.cpp
+++ b/src/live_effects/lpe-bounding-box.cpp
@@ -9,8 +9,12 @@
 #include "live_effects/lpe-bounding-box.h"
 
 #include "display/curve.h"
+#include "sp-item.h"
+#include "2geom/path.h"
 #include "sp-shape.h"
 #include "sp-text.h"
+#include "2geom/bezier-curve.h"
+#include "lpe-bounding-box.h"
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-circle_3pts.cpp b/src/live_effects/lpe-circle_3pts.cpp
index 18252f6a0..dbb1f4b6b 100644
--- a/src/live_effects/lpe-circle_3pts.cpp
+++ b/src/live_effects/lpe-circle_3pts.cpp
@@ -15,6 +15,7 @@
 #include "live_effects/lpe-circle_3pts.h"
 
 // You might need to include other 2geom files. You can add them here:
+#include <2geom/path.h>
 #include <2geom/circle.h>
 #include <2geom/path-sink.h>
 
diff --git a/src/live_effects/lpe-circle_with_radius.cpp b/src/live_effects/lpe-circle_with_radius.cpp
index 6e03cb1ce..8f2156044 100644
--- a/src/live_effects/lpe-circle_with_radius.cpp
+++ b/src/live_effects/lpe-circle_with_radius.cpp
@@ -15,6 +15,7 @@
 #include "display/curve.h"
 
 // You might need to include other 2geom files. You can add them here:
+#include <2geom/pathvector.h>
 #include <2geom/circle.h>
 #include <2geom/path-sink.h>
 
diff --git a/src/live_effects/lpe-constructgrid.cpp b/src/live_effects/lpe-constructgrid.cpp
index 4af8891e8..b1e0edaac 100644
--- a/src/live_effects/lpe-constructgrid.cpp
+++ b/src/live_effects/lpe-constructgrid.cpp
@@ -14,6 +14,9 @@
 
 #include "live_effects/lpe-constructgrid.h"
 
+#include <2geom/path.h>
+#include <2geom/transforms.h>
+
 namespace Inkscape {
 namespace LivePathEffect {
 
diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp
index f28ab4b31..80f5bdafd 100644
--- a/src/live_effects/lpe-copy_rotate.cpp
+++ b/src/live_effects/lpe-copy_rotate.cpp
@@ -15,7 +15,11 @@
 #include <2geom/path-intersection.h>
 #include <2geom/sbasis-to-bezier.h>
 #include "live_effects/lpe-copy_rotate.h"
+#include <2geom/path.h>
+#include <2geom/transforms.h>
+#include <2geom/angle.h>
 
+#include "knot-holder-entity.h"
 #include "knotholder.h"
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
diff --git a/src/live_effects/lpe-curvestitch.cpp b/src/live_effects/lpe-curvestitch.cpp
index 3beedaf57..609447f26 100644
--- a/src/live_effects/lpe-curvestitch.cpp
+++ b/src/live_effects/lpe-curvestitch.cpp
@@ -17,11 +17,19 @@
 
 #include "live_effects/lpe-curvestitch.h"
 
+#include "sp-item.h"
 #include "sp-path.h"
 #include "svg/svg.h"
 #include "xml/repr.h"
 
+#include <2geom/path.h>
+#include <2geom/piecewise.h>
+#include <2geom/sbasis.h>
+#include <2geom/sbasis-geometric.h>
 #include <2geom/bezier-to-sbasis.h>
+#include <2geom/sbasis-to-bezier.h>
+#include <2geom/d2.h>
+#include <2geom/affine.h>
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-dynastroke.cpp b/src/live_effects/lpe-dynastroke.cpp
index 7e22f6e51..aeecd5d5c 100644
--- a/src/live_effects/lpe-dynastroke.cpp
+++ b/src/live_effects/lpe-dynastroke.cpp
@@ -14,8 +14,14 @@
 #include "display/curve.h"
 //# include <libnr/n-art-bpath.h>
 
+#include <2geom/path.h>
+#include <2geom/sbasis.h>
+#include <2geom/sbasis-geometric.h>
 #include <2geom/bezier-to-sbasis.h>
+#include <2geom/sbasis-to-bezier.h>
+#include <2geom/d2.h>
 #include <2geom/sbasis-math.h>
+#include <2geom/piecewise.h>
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-ellipse_5pts.cpp b/src/live_effects/lpe-ellipse_5pts.cpp
index 8f0f8e18a..4c953bcda 100644
--- a/src/live_effects/lpe-ellipse_5pts.cpp
+++ b/src/live_effects/lpe-ellipse_5pts.cpp
@@ -15,6 +15,7 @@
 
 // You might need to include other 2geom files. You can add them here:
 #include <glibmm/i18n.h>
+#include <2geom/path.h>
 #include <2geom/circle.h>
 #include <2geom/ellipse.h>
 #include <2geom/path-sink.h>
diff --git a/src/live_effects/lpe-envelope.cpp b/src/live_effects/lpe-envelope.cpp
index 0ce784877..e873c0b15 100644
--- a/src/live_effects/lpe-envelope.cpp
+++ b/src/live_effects/lpe-envelope.cpp
@@ -5,8 +5,22 @@
  */
 
 #include "live_effects/lpe-envelope.h"
+#include "sp-shape.h"
+#include "sp-item.h"
+#include "sp-path.h"
+#include "sp-item-group.h"
 #include "display/curve.h"
+#include "svg/svg.h"
+#include "ui/widget/scalar.h"
 
+#include <2geom/sbasis.h>
+#include <2geom/sbasis-geometric.h>
+#include <2geom/bezier-to-sbasis.h>
+#include <2geom/sbasis-to-bezier.h>
+#include <2geom/d2.h>
+#include <2geom/piecewise.h>
+
+#include <algorithm>
 using std::vector;
 
 namespace Inkscape {
diff --git a/src/live_effects/lpe-extrude.cpp b/src/live_effects/lpe-extrude.cpp
index 22cdf3c3e..8b3f4714a 100644
--- a/src/live_effects/lpe-extrude.cpp
+++ b/src/live_effects/lpe-extrude.cpp
@@ -15,6 +15,11 @@
 
 #include <glibmm/i18n.h>
 
+#include <2geom/path.h>
+#include <2geom/piecewise.h>
+#include <2geom/transforms.h>
+#include <algorithm>
+
 #include "sp-item.h"
 
 namespace Inkscape {
diff --git a/src/live_effects/lpe-fill-between-many.cpp b/src/live_effects/lpe-fill-between-many.cpp
index ccb9cf56d..574ec3580 100644
--- a/src/live_effects/lpe-fill-between-many.cpp
+++ b/src/live_effects/lpe-fill-between-many.cpp
@@ -9,8 +9,11 @@
 #include "live_effects/lpe-fill-between-many.h"
 
 #include "display/curve.h"
+#include "sp-item.h"
+#include "2geom/path.h"
 #include "sp-shape.h"
 #include "sp-text.h"
+#include "2geom/bezier-curve.h"
 
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/lpe-fill-between-strokes.cpp b/src/live_effects/lpe-fill-between-strokes.cpp
index b1e328d18..89ea80545 100644
--- a/src/live_effects/lpe-fill-between-strokes.cpp
+++ b/src/live_effects/lpe-fill-between-strokes.cpp
@@ -9,8 +9,11 @@
 #include "live_effects/lpe-fill-between-strokes.h"
 
 #include "display/curve.h"
+#include "sp-item.h"
+#include "2geom/path.h"
 #include "sp-shape.h"
 #include "sp-text.h"
+#include "2geom/bezier-curve.h"
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-fillet-chamfer.cpp b/src/live_effects/lpe-fillet-chamfer.cpp
index 24ee2ccc3..07760b172 100644
--- a/src/live_effects/lpe-fillet-chamfer.cpp
+++ b/src/live_effects/lpe-fillet-chamfer.cpp
@@ -17,16 +17,21 @@
  
 #include <2geom/sbasis-to-bezier.h>
 #include <2geom/elliptical-arc.h>
+#include <2geom/line.h>
 
+#include "desktop.h"
 #include "display/curve.h"
 #include "helper/geom-nodetype.h"
 #include "helper/geom-curves.h"
 #include "helper/geom.h"
 
+#include "live_effects/parameter/filletchamferpointarray.h"
+
 // for programmatically updating knots
 #include "ui/tools-switch.h"
 
 // TODO due to internal breakage in glibmm headers, this must be last:
+#include <glibmm/i18n.h>
 
 using namespace Geom;
 namespace Inkscape {
diff --git a/src/live_effects/lpe-gears.cpp b/src/live_effects/lpe-gears.cpp
index 307fab6fd..d4d695542 100644
--- a/src/live_effects/lpe-gears.cpp
+++ b/src/live_effects/lpe-gears.cpp
@@ -8,9 +8,14 @@
 
 #include "live_effects/lpe-gears.h"
 
+#include <vector>
+
 #include <glibmm/i18n.h>
 
+#include <2geom/d2.h>
+#include <2geom/sbasis.h>
 #include <2geom/bezier-to-sbasis.h>
+#include <2geom/path.h>
 
 using std::vector;
 using namespace Geom;
diff --git a/src/live_effects/lpe-interpolate.cpp b/src/live_effects/lpe-interpolate.cpp
index 43da4d105..74c7efd90 100644
--- a/src/live_effects/lpe-interpolate.cpp
+++ b/src/live_effects/lpe-interpolate.cpp
@@ -14,7 +14,10 @@
 
 #include "live_effects/lpe-interpolate.h"
 
+#include <2geom/path.h>
 #include <2geom/sbasis-to-bezier.h>
+#include <2geom/piecewise.h>
+#include <2geom/sbasis-geometric.h>
 
 #include "sp-path.h"
 #include "display/curve.h"
diff --git a/src/live_effects/lpe-interpolate_points.cpp b/src/live_effects/lpe-interpolate_points.cpp
index ab0576174..cf70832ee 100644
--- a/src/live_effects/lpe-interpolate_points.cpp
+++ b/src/live_effects/lpe-interpolate_points.cpp
@@ -13,6 +13,8 @@
 
 #include "live_effects/lpe-interpolate_points.h"
 
+#include <2geom/path.h>
+
 #include "live_effects/lpe-powerstroke-interpolators.h"
 
 namespace Inkscape {
diff --git a/src/live_effects/lpe-jointype.cpp b/src/live_effects/lpe-jointype.cpp
index 3bfbd6288..fe42932be 100644
--- a/src/live_effects/lpe-jointype.cpp
+++ b/src/live_effects/lpe-jointype.cpp
@@ -10,12 +10,16 @@
 #include "live_effects/parameter/enum.h"
 #include "helper/geom-pathstroke.h"
 
+#include "sp-shape.h"
 #include "style.h"
+#include "xml/repr.h"
+#include "sp-paint-server.h"
 #include "svg/svg-color.h"
 #include "desktop-style.h"
 #include "svg/css-ostringstream.h"
 #include "display/curve.h"
 
+#include <2geom/path.h>
 #include <2geom/elliptical-arc.h>
 
 #include "lpe-jointype.h"
diff --git a/src/live_effects/lpe-knot.cpp b/src/live_effects/lpe-knot.cpp
index 221d03ebf..a033a6c4a 100644
--- a/src/live_effects/lpe-knot.cpp
+++ b/src/live_effects/lpe-knot.cpp
@@ -16,6 +16,7 @@
 #include "sp-path.h"
 #include "display/curve.h"
 #include "live_effects/lpe-knot.h"
+#include "svg/svg.h"
 #include "style.h"
 #include "knot-holder-entity.h"
 #include "knotholder.h"
@@ -24,14 +25,20 @@
 #include <gdk/gdk.h>
 
 #include <2geom/sbasis-to-bezier.h>
+#include <2geom/sbasis.h>
+#include <2geom/d2.h>
+#include <2geom/path.h>
 #include <2geom/bezier-to-sbasis.h>
 #include <2geom/basic-intersection.h>
+#include <2geom/exception.h>
 
 // for change crossing undo
 #include "verbs.h"
 #include "document.h"
 #include "document-undo.h"
 
+#include <exception>
+
 namespace Inkscape {
 namespace LivePathEffect {
 
diff --git a/src/live_effects/lpe-lattice.cpp b/src/live_effects/lpe-lattice.cpp
index 091b6ddca..3c23e349e 100644
--- a/src/live_effects/lpe-lattice.cpp
+++ b/src/live_effects/lpe-lattice.cpp
@@ -6,7 +6,7 @@
  * Authors:
  *   Johan Engelen <j.b.c.engelen@utwente.nl>
  *   Steren Giannini
- *   No� Falzon
+ *   Noé Falzon
  *   Victor Navez
 *
 * Copyright (C) 2007-2008 Authors 
@@ -16,10 +16,22 @@
 
 #include "live_effects/lpe-lattice.h"
 
+#include "sp-shape.h"
+#include "sp-item.h"
+#include "sp-path.h"
 #include "display/curve.h"
+#include "svg/svg.h"
 
+#include <2geom/sbasis.h>
 #include <2geom/sbasis-2d.h>
+#include <2geom/sbasis-geometric.h>
 #include <2geom/bezier-to-sbasis.h>
+#include <2geom/sbasis-to-bezier.h>
+#include <2geom/d2.h>
+#include <2geom/piecewise.h>
+#include <2geom/transforms.h>
+
+#include "desktop.h" // TODO: should be factored out (see below)
 
 using namespace Geom;
 
diff --git a/src/live_effects/lpe-lattice2.cpp b/src/live_effects/lpe-lattice2.cpp
index 9e9fc153a..bacbe5fa7 100644
--- a/src/live_effects/lpe-lattice2.cpp
+++ b/src/live_effects/lpe-lattice2.cpp
@@ -6,7 +6,7 @@
  * Authors:
  *   Johan Engelen <j.b.c.engelen@utwente.nl>
  *   Steren Giannini
- *   No� Falzon
+ *   Noé Falzon
  *   Victor Navez
  *   ~suv
  *   Jabiertxo Arraiza
@@ -17,11 +17,24 @@
  */
 
 #include "live_effects/lpe-lattice2.h"
+#include "sp-shape.h"
+#include "sp-item.h"
+#include "sp-path.h"
 #include "display/curve.h"
+#include "svg/svg.h"
 #include "helper/geom.h"
+#include <2geom/path.h>
+#include <2geom/sbasis.h>
 #include <2geom/sbasis-2d.h>
+#include "helper/geom-curves.h"
+#include <2geom/sbasis-geometric.h>
 #include <2geom/bezier-to-sbasis.h>
+#include <2geom/sbasis-to-bezier.h>
+#include <2geom/d2.h>
+#include <2geom/piecewise.h>
+#include <2geom/transforms.h>
 // TODO due to internal breakage in glibmm headers, this must be last:
+#include <glibmm/i18n.h>
 
 using namespace Geom;
 
diff --git a/src/live_effects/lpe-line_segment.cpp b/src/live_effects/lpe-line_segment.cpp
index 4c9edabd4..dfd8aea8f 100644
--- a/src/live_effects/lpe-line_segment.cpp
+++ b/src/live_effects/lpe-line_segment.cpp
@@ -14,6 +14,10 @@
 #include "live_effects/lpe-line_segment.h"
 #include "ui/tools/lpe-tool.h"
 
+#include <2geom/pathvector.h>
+#include <2geom/geom.h>
+#include <2geom/bezier-curve.h>
+
 namespace Inkscape {
 namespace LivePathEffect {
 
diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp
index a7459faed..cf866ad6a 100644
--- a/src/live_effects/lpe-mirror_symmetry.cpp
+++ b/src/live_effects/lpe-mirror_symmetry.cpp
@@ -14,12 +14,19 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 #include "live_effects/lpe-mirror_symmetry.h"
+#include <sp-path.h>
 #include <display/curve.h>
 #include <svg/path-string.h>
 #include "helper/geom.h"
+#include <2geom/path.h>
 #include <2geom/path-intersection.h>
+#include <2geom/transforms.h>
+#include <2geom/affine.h>
+#include "knot-holder-entity.h"
 #include "knotholder.h"
+#include "inkscape.h"
 // TODO due to internal breakage in glibmm headers, this must be last:
+#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-offset.cpp b/src/live_effects/lpe-offset.cpp
index a0fa46c3f..d611b88a1 100644
--- a/src/live_effects/lpe-offset.cpp
+++ b/src/live_effects/lpe-offset.cpp
@@ -17,7 +17,11 @@
 #include "sp-shape.h"
 #include "display/curve.h"
 
+#include <2geom/path.h>
+#include <2geom/piecewise.h>
+#include <2geom/sbasis-geometric.h>
 #include <2geom/elliptical-arc.h>
+#include <2geom/transforms.h>
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-parallel.cpp b/src/live_effects/lpe-parallel.cpp
index 9cd8ecf46..23cd5e2e7 100644
--- a/src/live_effects/lpe-parallel.cpp
+++ b/src/live_effects/lpe-parallel.cpp
@@ -17,6 +17,10 @@
 #include "sp-shape.h"
 #include "display/curve.h"
 
+#include <2geom/path.h>
+#include <2geom/transforms.h>
+
+#include "knot-holder-entity.h"
 #include "knotholder.h"
 
 namespace Inkscape {
diff --git a/src/live_effects/lpe-path_length.cpp b/src/live_effects/lpe-path_length.cpp
index 8fbf9d420..4ca380c15 100644
--- a/src/live_effects/lpe-path_length.cpp
+++ b/src/live_effects/lpe-path_length.cpp
@@ -16,6 +16,8 @@
 #include "live_effects/lpe-path_length.h"
 #include "util/units.h"
 
+#include "2geom/sbasis-geometric.h"
+
 namespace Inkscape {
 namespace LivePathEffect {
 
diff --git a/src/live_effects/lpe-patternalongpath.cpp b/src/live_effects/lpe-patternalongpath.cpp
index 7d6ac10ac..911c410f9 100644
--- a/src/live_effects/lpe-patternalongpath.cpp
+++ b/src/live_effects/lpe-patternalongpath.cpp
@@ -6,12 +6,22 @@
 
 #include "live_effects/lpe-patternalongpath.h"
 #include "live_effects/lpeobject.h"
+#include "sp-shape.h"
 #include "display/curve.h"
+#include "svg/svg.h"
+#include "ui/widget/scalar.h"
 
+#include <2geom/sbasis.h>
+#include <2geom/sbasis-geometric.h>
 #include <2geom/bezier-to-sbasis.h>
+#include <2geom/sbasis-to-bezier.h>
+#include <2geom/d2.h>
+#include <2geom/piecewise.h>
 
+#include "knot-holder-entity.h"
 #include "knotholder.h"
 
+#include <algorithm>
 using std::vector;
 
 
diff --git a/src/live_effects/lpe-perp_bisector.cpp b/src/live_effects/lpe-perp_bisector.cpp
index f69dae6a1..660318c57 100644
--- a/src/live_effects/lpe-perp_bisector.cpp
+++ b/src/live_effects/lpe-perp_bisector.cpp
@@ -18,7 +18,10 @@
 #include "display/curve.h"
 #include "sp-path.h"
 #include "line-geometry.h"
+#include "sp-lpe-item.h"
+#include <2geom/path.h>
 
+#include "knot-holder-entity.h"
 #include "knotholder.h"
 
 namespace Inkscape {
diff --git a/src/live_effects/lpe-perspective-envelope.cpp b/src/live_effects/lpe-perspective-envelope.cpp
index 8a6a95f2e..ae951dfc9 100644
--- a/src/live_effects/lpe-perspective-envelope.cpp
+++ b/src/live_effects/lpe-perspective-envelope.cpp
@@ -18,6 +18,7 @@
 #include "live_effects/lpe-perspective-envelope.h"
 #include "helper/geom.h"
 #include "display/curve.h"
+#include "svg/svg.h"
 #include <gsl/gsl_linalg.h>
 
 using namespace Geom;
diff --git a/src/live_effects/lpe-perspective_path.cpp b/src/live_effects/lpe-perspective_path.cpp
index 6857d4363..c8cdd7912 100644
--- a/src/live_effects/lpe-perspective_path.cpp
+++ b/src/live_effects/lpe-perspective_path.cpp
@@ -15,13 +15,18 @@
 
 #include "persp3d.h"
 //#include "transf_mat_3x4.h"
+#include "document.h"
 #include "document-private.h"
 #include "live_effects/lpe-perspective_path.h"
 #include "live_effects/lpeobject.h"
+#include "sp-item-group.h"
 #include "knot-holder-entity.h"
 #include "knotholder.h"
 #include "desktop.h"
 #include <util/units.h>
+#include "inkscape.h"
+
+#include <2geom/path.h>
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-powerstroke.cpp b/src/live_effects/lpe-powerstroke.cpp
index 0de668847..66c8776b5 100644
--- a/src/live_effects/lpe-powerstroke.cpp
+++ b/src/live_effects/lpe-powerstroke.cpp
@@ -13,17 +13,32 @@
 #include "live_effects/lpe-powerstroke.h"
 #include "live_effects/lpe-powerstroke-interpolators.h"
 
+#include "sp-shape.h"
 #include "style.h"
+#include "xml/repr.h"
+#include "sp-paint-server.h"
 #include "svg/svg-color.h"
 #include "desktop-style.h"
 #include "svg/css-ostringstream.h"
 #include "display/curve.h"
 
+#include <2geom/path.h>
+#include <2geom/piecewise.h>
+#include <2geom/sbasis-geometric.h>
+#include <2geom/transforms.h>
+#include <2geom/bezier-utils.h>
 #include <2geom/elliptical-arc.h>
+#include <2geom/sbasis-to-bezier.h>
 #include <2geom/path-sink.h>
 #include <2geom/path-intersection.h>
+#include <2geom/crossing.h>
+#include <2geom/ellipse.h>
 #include <2geom/circle.h>
+#include <2geom/math-utils.h>
 #include "helper/geom.h"
+#include <math.h>
+
+#include "spiro.h"
 
 namespace Geom {
 // should all be moved to 2geom at some point
diff --git a/src/live_effects/lpe-recursiveskeleton.cpp b/src/live_effects/lpe-recursiveskeleton.cpp
index ed0c915ce..ac571d963 100644
--- a/src/live_effects/lpe-recursiveskeleton.cpp
+++ b/src/live_effects/lpe-recursiveskeleton.cpp
@@ -14,7 +14,13 @@
 
 #include "live_effects/lpe-recursiveskeleton.h"
 
+#include <2geom/path.h>
+#include <2geom/sbasis.h>
+#include <2geom/sbasis-geometric.h>
 #include <2geom/bezier-to-sbasis.h>
+#include <2geom/sbasis-to-bezier.h>
+#include <2geom/d2.h>
+#include <2geom/piecewise.h>
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-rough-hatches.cpp b/src/live_effects/lpe-rough-hatches.cpp
index 2fb65b349..76421e0f0 100644
--- a/src/live_effects/lpe-rough-hatches.cpp
+++ b/src/live_effects/lpe-rough-hatches.cpp
@@ -18,10 +18,18 @@
 
 #include "sp-item.h"
 #include "sp-path.h"
+#include "svg/svg.h"
 #include "xml/repr.h"
 
+#include <2geom/path.h>
+#include <2geom/piecewise.h>
+#include <2geom/sbasis.h>
 #include <2geom/sbasis-math.h>
+#include <2geom/sbasis-geometric.h>
 #include <2geom/bezier-to-sbasis.h>
+#include <2geom/sbasis-to-bezier.h>
+#include <2geom/d2.h>
+#include <2geom/affine.h>
 
 
 namespace Inkscape {
diff --git a/src/live_effects/lpe-roughen.cpp b/src/live_effects/lpe-roughen.cpp
index 3a486ff10..13f2b7b51 100644
--- a/src/live_effects/lpe-roughen.cpp
+++ b/src/live_effects/lpe-roughen.cpp
@@ -14,10 +14,15 @@
  */
 
 #include "live_effects/lpe-roughen.h"
+#include "desktop.h"
 #include "display/curve.h"
+#include "live_effects/parameter/parameter.h"
 #include <boost/functional/hash.hpp>
 #include "helper/geom.h"
+#include "sp-item-group.h"
+#include <cmath>
 // TODO due to internal breakage in glibmm headers, this must be last:
+#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-ruler.cpp b/src/live_effects/lpe-ruler.cpp
index 3a2d78b2c..49b5faa2e 100644
--- a/src/live_effects/lpe-ruler.cpp
+++ b/src/live_effects/lpe-ruler.cpp
@@ -12,6 +12,10 @@
  */
 
 #include "live_effects/lpe-ruler.h"
+#include <2geom/piecewise.h>
+#include <2geom/sbasis-geometric.h>
+#include "inkscape.h"
+#include "desktop.h"
 
 
 namespace Inkscape {
diff --git a/src/live_effects/lpe-show_handles.cpp b/src/live_effects/lpe-show_handles.cpp
index 388ea176f..2d4666fe4 100644
--- a/src/live_effects/lpe-show_handles.cpp
+++ b/src/live_effects/lpe-show_handles.cpp
@@ -7,6 +7,7 @@
  */
 
 #include "live_effects/lpe-show_handles.h"
+#include "live_effects/parameter/parameter.h"
 #include <2geom/sbasis-to-bezier.h>
 #include <2geom/svg-path-parser.h>
 #include "helper/geom.h"
diff --git a/src/live_effects/lpe-simplify.cpp b/src/live_effects/lpe-simplify.cpp
index ec21e10d2..b0c1fbc23 100644
--- a/src/live_effects/lpe-simplify.cpp
+++ b/src/live_effects/lpe-simplify.cpp
@@ -4,11 +4,20 @@
 
 #include "live_effects/lpe-simplify.h"
 #include "display/curve.h"
+#include "live_effects/parameter/parameter.h"
 #include "helper/geom.h"
+#include "livarot/Path.h"
+#include "splivarot.h"
 #include <2geom/svg-path-parser.h>
+#include "desktop.h"
+#include "inkscape.h"
 #include "svg/svg.h"
 #include "ui/tools/node-tool.h"
+#include <2geom/d2.h>
+#include <2geom/generic-rect.h>
+#include <2geom/interval.h>
 #include "ui/icon-names.h"
+#include "util/units.h"
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/lpe-skeleton.cpp b/src/live_effects/lpe-skeleton.cpp
index 7d34db699..6e4afbe9b 100644
--- a/src/live_effects/lpe-skeleton.cpp
+++ b/src/live_effects/lpe-skeleton.cpp
@@ -21,9 +21,13 @@
 #include "live_effects/lpe-skeleton.h"
 
 // You might need to include other 2geom files. You can add them here:
+#include <2geom/path.h>
 
 #include <glibmm/i18n.h>
 
+//#include "knot-holder-entity.h"
+//#include "knotholder.h"
+
 namespace Inkscape {
 namespace LivePathEffect {
 
diff --git a/src/live_effects/lpe-sketch.cpp b/src/live_effects/lpe-sketch.cpp
index 95e2f6f0d..82d343f6e 100644
--- a/src/live_effects/lpe-sketch.cpp
+++ b/src/live_effects/lpe-sketch.cpp
@@ -16,8 +16,16 @@
 #include <glibmm/i18n.h>
 
 // You might need to include other 2geom files. You can add them here:
+#include <2geom/path.h>
+#include <2geom/sbasis.h>
+#include <2geom/sbasis-geometric.h>
 #include <2geom/sbasis-math.h>
 #include <2geom/bezier-to-sbasis.h>
+#include <2geom/sbasis-to-bezier.h>
+#include <2geom/d2.h>
+#include <2geom/sbasis-math.h>
+#include <2geom/piecewise.h>
+#include <2geom/crossing.h>
 #include <2geom/path-intersection.h>
 
 namespace Inkscape {
diff --git a/src/live_effects/lpe-spiro.cpp b/src/live_effects/lpe-spiro.cpp
index 4a41dc5a0..0d42596b2 100644
--- a/src/live_effects/lpe-spiro.cpp
+++ b/src/live_effects/lpe-spiro.cpp
@@ -7,6 +7,9 @@
 #include "live_effects/lpe-spiro.h"
 
 #include "display/curve.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"
diff --git a/src/live_effects/lpe-tangent_to_curve.cpp b/src/live_effects/lpe-tangent_to_curve.cpp
index b308ef8d7..978ab57fb 100644
--- a/src/live_effects/lpe-tangent_to_curve.cpp
+++ b/src/live_effects/lpe-tangent_to_curve.cpp
@@ -19,6 +19,10 @@
 #include "sp-path.h"
 #include "display/curve.h"
 
+#include <2geom/path.h>
+#include <2geom/transforms.h>
+
+#include "knot-holder-entity.h"
 #include "knotholder.h"
 
 namespace Inkscape {
diff --git a/src/live_effects/lpe-taperstroke.cpp b/src/live_effects/lpe-taperstroke.cpp
index f6f6b33dc..f2ddd4929 100644
--- a/src/live_effects/lpe-taperstroke.cpp
+++ b/src/live_effects/lpe-taperstroke.cpp
@@ -13,20 +13,28 @@
 
 #include "live_effects/lpe-taperstroke.h"
 
+#include <2geom/path.h>
+#include <2geom/path.h>
 #include <2geom/circle.h>
 #include <2geom/sbasis-to-bezier.h>
 
 #include "helper/geom-nodetype.h"
 #include "helper/geom-pathstroke.h"
 #include "display/curve.h"
+#include "sp-shape.h"
 #include "style.h"
+#include "xml/repr.h"
+#include "sp-paint-server.h"
 #include "svg/svg-color.h"
 #include "desktop-style.h"
 #include "svg/css-ostringstream.h"
 #include "svg/svg.h"
 
+#include "knot-holder-entity.h"
 #include "knotholder.h"
 
+#include <glibmm/i18n.h>
+
 template<typename T>
 inline bool withinRange(T value, T low, T high) {
     return (value > low && value < high);
diff --git a/src/live_effects/lpe-test-doEffect-stack.cpp b/src/live_effects/lpe-test-doEffect-stack.cpp
index c7ecf6481..2bcd4c136 100644
--- a/src/live_effects/lpe-test-doEffect-stack.cpp
+++ b/src/live_effects/lpe-test-doEffect-stack.cpp
@@ -8,6 +8,9 @@
 
 #include "live_effects/lpe-test-doEffect-stack.h"
 
+#include <2geom/piecewise.h>
+#include <vector>
+#include <cstring>
 using std::memcpy;
 
 namespace Inkscape {
diff --git a/src/live_effects/lpe-transform_2pts.cpp b/src/live_effects/lpe-transform_2pts.cpp
index 2b03a4bb2..3c4ce0708 100644
--- a/src/live_effects/lpe-transform_2pts.cpp
+++ b/src/live_effects/lpe-transform_2pts.cpp
@@ -14,6 +14,9 @@
 
 #include "live_effects/lpe-transform_2pts.h"
 #include "display/curve.h"
+#include <2geom/transforms.h>
+#include <2geom/pathvector.h>
+#include "sp-path.h"
 #include "ui/icon-names.h"
 #include "svg/svg.h"
 #include "verbs.h"
diff --git a/src/live_effects/lpe-vonkoch.cpp b/src/live_effects/lpe-vonkoch.cpp
index 2486f3366..7eda7446e 100644
--- a/src/live_effects/lpe-vonkoch.cpp
+++ b/src/live_effects/lpe-vonkoch.cpp
@@ -8,6 +8,8 @@
 
 #include <glibmm/i18n.h>
 
+#include <2geom/transforms.h>
+
 //using std::vector;
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpegroupbbox.cpp b/src/live_effects/lpegroupbbox.cpp
index 3862ebcc8..2a1b70a6a 100644
--- a/src/live_effects/lpegroupbbox.cpp
+++ b/src/live_effects/lpegroupbbox.cpp
@@ -7,6 +7,8 @@
 
 #include "live_effects/lpegroupbbox.h"
 
+#include "sp-item.h"
+
 namespace Inkscape {
 namespace LivePathEffect {
 
diff --git a/src/live_effects/lpeobject-reference.cpp b/src/live_effects/lpeobject-reference.cpp
index 1940806bd..d9de6e77f 100644
--- a/src/live_effects/lpeobject-reference.cpp
+++ b/src/live_effects/lpeobject-reference.cpp
@@ -8,6 +8,7 @@
 
 #include <string.h>
 
+#include "enums.h"
 #include "live_effects/lpeobject-reference.h"
 #include "live_effects/lpeobject.h"
 #include "uri.h"
diff --git a/src/live_effects/lpeobject.cpp b/src/live_effects/lpeobject.cpp
index b5b27c984..8e5ae568f 100644
--- a/src/live_effects/lpeobject.cpp
+++ b/src/live_effects/lpeobject.cpp
@@ -11,10 +11,13 @@
 
 #include "xml/repr.h"
 #include "xml/node-event-vector.h"
+#include "sp-object.h"
 #include "attributes.h"
 #include "document.h"
 #include "document-private.h"
 
+#include <glibmm/i18n.h>
+
 //#define LIVEPATHEFFECT_VERBOSE
 
 static void livepatheffect_on_repr_attr_changed (Inkscape::XML::Node * repr, const gchar *key, const gchar *oldval, const gchar *newval, bool is_interactive, void * data);
diff --git a/src/live_effects/spiro.cpp b/src/live_effects/spiro.cpp
index a2ff4813e..0ac2815bf 100644
--- a/src/live_effects/spiro.cpp
+++ b/src/live_effects/spiro.cpp
@@ -29,6 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #include <string.h>
 
 #include "display/curve.h"
+#include <2geom/math-utils.h>
 
 #define SPIRO_SHOW_INFINITE_COORDINATE_CALLS
 
diff --git a/src/main-cmdlineact.cpp b/src/main-cmdlineact.cpp
index d22b513d6..496c16d5d 100644
--- a/src/main-cmdlineact.cpp
+++ b/src/main-cmdlineact.cpp
@@ -10,6 +10,7 @@
 #include <ui/view/view.h>
 #include <desktop.h>
 #include <helper/action.h>
+#include <helper/action-context.h>
 #include <selection.h>
 #include <verbs.h>
 #include <inkscape.h>
diff --git a/src/main.cpp b/src/main.cpp
index 7678ca241..8cf52127b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -38,6 +38,9 @@
 #include <ieeefp.h>
 #endif
 #include <cstring>
+#include <string>
+#include <locale.h>
+#include <stdlib.h>
 
 #include <popt.h>
 #ifndef POPT_TABLEEND
@@ -45,6 +48,9 @@
 #endif /* Not def: POPT_TABLEEND */
 
 #include <libxml/tree.h>
+#include <glib/gprintf.h>
+#include <glib-object.h>
+#include <gtk/gtk.h>
 
 #if GTK_CHECK_VERSION(3,0,0)
 #include <gtkmm/cssprovider.h>
@@ -57,13 +63,16 @@
 #undef AND
 #endif
 
+#include "macros.h"
 #include "file.h"
 #include "document.h"
 #include "layer-model.h"
 #include "selection.h"
+#include "sp-object.h"
 #include "ui/interface.h"
 #include "print.h"
 #include "color.h"
+#include "sp-item.h"
 #include "sp-root.h"
 
 #include "svg/svg.h"
@@ -84,8 +93,10 @@
 
 #include "helper/action-context.h"
 #include "helper/png-write.h"
+#include "helper/geom.h"
 
 #include <extension/extension.h>
+#include <extension/system.h>
 #include <extension/db.h>
 #include <extension/output.h>
 #include <extension/input.h>
@@ -103,6 +114,8 @@
 #endif // WITH_DBUS
 
 #include <glibmm/i18n.h>
+#include <glibmm/main.h>
+#include <glibmm/miscutils.h>
 
 #include <gtkmm/main.h>
 
@@ -116,6 +129,8 @@
 #include <errno.h>
 #include "verbs.h"
 
+#include <gdk/gdkkeysyms.h>
+
 #include "path-chemistry.h"
 #include "sp-text.h"
 #include "sp-flowtext.h"
diff --git a/src/message-stack.cpp b/src/message-stack.cpp
index 70b2fb42d..bc89520b7 100644
--- a/src/message-stack.cpp
+++ b/src/message-stack.cpp
@@ -12,6 +12,7 @@
 #include <string.h>
 #include <glib.h>
 #include <cstring>
+#include <string>
 #include "message-stack.h"
 
 namespace Inkscape {
diff --git a/src/object-hierarchy.cpp b/src/object-hierarchy.cpp
index 87b7ac570..f241da83d 100644
--- a/src/object-hierarchy.cpp
+++ b/src/object-hierarchy.cpp
@@ -10,10 +10,13 @@
  */
 
 #include <cstdio>
+#include <cassert>
 
 #include "sp-object.h"
 #include "object-hierarchy.h"
 
+#include <sigc++/functors/mem_fun.h>
+
 namespace Inkscape {
 
 ObjectHierarchy::ObjectHierarchy(SPObject *top) {
diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp
index af33415a1..3e559ee7a 100644
--- a/src/object-snapper.cpp
+++ b/src/object-snapper.cpp
@@ -14,6 +14,9 @@
 
 #include "svg/svg.h"
 #include <2geom/path-intersection.h>
+#include <2geom/pathvector.h>
+#include <2geom/point.h>
+#include <2geom/rect.h>
 #include <2geom/line.h>
 #include <2geom/circle.h>
 #include <2geom/path-sink.h>
@@ -21,7 +24,9 @@
 #include "sp-namedview.h"
 #include "sp-image.h"
 #include "sp-item-group.h"
+#include "sp-item.h"
 #include "sp-use.h"
+#include "display/curve.h"
 #include "inkscape.h"
 #include "preferences.h"
 #include "sp-text.h"
@@ -29,6 +34,7 @@
 #include "text-editing.h"
 #include "sp-clippath.h"
 #include "sp-mask.h"
+#include "helper/geom-curves.h"
 #include "desktop.h"
 #include "sp-root.h"
 
diff --git a/src/path-chemistry.cpp b/src/path-chemistry.cpp
index 9f98cb8a9..1a345b565 100644
--- a/src/path-chemistry.cpp
+++ b/src/path-chemistry.cpp
@@ -15,12 +15,15 @@
  */
 
 #ifdef HAVE_CONFIG_H
+# include <config.h>
 #endif
 #include <cstring>
 #include <string>
 #include "xml/repr.h"
 #include "svg/svg.h"
 #include "display/curve.h"
+#include "color.h"
+#include <glib.h>
 #include <glibmm/i18n.h>
 #include "sp-path.h"
 #include "sp-text.h"
@@ -34,6 +37,7 @@
 #include "selection.h"
 
 #include "box3d.h"
+#include <2geom/pathvector.h>
 #include "selection-chemistry.h"
 #include "path-chemistry.h"
 #include "verbs.h"
diff --git a/src/persp3d-reference.cpp b/src/persp3d-reference.cpp
index 49510764e..4526a8d8f 100644
--- a/src/persp3d-reference.cpp
+++ b/src/persp3d-reference.cpp
@@ -8,6 +8,7 @@
  */
 
 #include "persp3d-reference.h"
+#include "persp3d.h"
 #include "uri.h"
 
 static void persp3dreference_href_changed(SPObject *old_ref, SPObject *ref, Persp3DReference *persp3dref);
diff --git a/src/persp3d.cpp b/src/persp3d.cpp
index 809242ed8..a48481145 100644
--- a/src/persp3d.cpp
+++ b/src/persp3d.cpp
@@ -18,7 +18,9 @@
 #include "document-undo.h"
 #include "vanishing-point.h"
 #include "ui/tools/box3d-tool.h"
+#include "box3d.h"
 #include "svg/stringstream.h"
+#include "xml/document.h"
 #include "xml/node-event-vector.h"
 #include "desktop.h"
 
diff --git a/src/perspective-line.cpp b/src/perspective-line.cpp
index cf40e4c60..e6c78403b 100644
--- a/src/perspective-line.cpp
+++ b/src/perspective-line.cpp
@@ -10,6 +10,7 @@
  */
 
 #include "perspective-line.h"
+#include "persp3d.h"
 
 namespace Box3D {
 
diff --git a/src/preferences.cpp b/src/preferences.cpp
index 988604a14..e5a5fe7f0 100644
--- a/src/preferences.cpp
+++ b/src/preferences.cpp
@@ -15,6 +15,7 @@
 #include <glibmm/fileutils.h>
 #include <glibmm/convert.h>
 #include <glibmm/i18n.h>
+#include <glib.h>
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
 #include "preferences.h"
diff --git a/src/preferences.h b/src/preferences.h
index 1fb26851b..d5ae40e56 100644
--- a/src/preferences.h
+++ b/src/preferences.h
@@ -13,6 +13,8 @@
 #ifndef INKSCAPE_PREFSTORE_H
 #define INKSCAPE_PREFSTORE_H
 
+#include <climits>
+#include <cfloat>
 #include <glibmm/ustring.h>
 #include <map>
 #include <vector>
diff --git a/src/prefix.cpp b/src/prefix.cpp
index 4e2204cff..6bf5cb2cf 100644
--- a/src/prefix.cpp
+++ b/src/prefix.cpp
@@ -27,7 +27,7 @@
 #define _PREFIX_C_
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 
@@ -35,6 +35,7 @@
 #include <cstdlib>
 #include <cstdio>
 #include <cstring>
+#include <limits.h>
 #include "prefix.h"
 
 
diff --git a/src/resource-manager.cpp b/src/resource-manager.cpp
index f960d9a24..09b9364c6 100644
--- a/src/resource-manager.cpp
+++ b/src/resource-manager.cpp
@@ -8,10 +8,13 @@
 
 #include <string>
 #include <vector>
-#include <set>
 #include <algorithm>
 #include <gtkmm/recentmanager.h>
 #include <glibmm/i18n.h>
+#include <glibmm/convert.h>
+#include <glibmm/fileutils.h>
+#include <glibmm/miscutils.h>
+#include <glibmm/uriutils.h>
 
 #include "resource-manager.h"
 
@@ -21,6 +24,8 @@
 #include "document-undo.h"
 #include "verbs.h"
 
+#include <set>
+
 namespace Inkscape {
 
 static std::vector<std::string> splitPath( std::string const &path )
diff --git a/src/rubberband.cpp b/src/rubberband.cpp
index 47fdffb28..4a171f4a1 100644
--- a/src/rubberband.cpp
+++ b/src/rubberband.cpp
@@ -15,6 +15,7 @@
 
 #include "rubberband.h"
 #include "display/sp-canvas.h"
+#include "display/sp-canvas-item.h"
 #include "display/canvas-bpath.h"
 #include "display/curve.h"
 
diff --git a/src/satisfied-guide-cns.cpp b/src/satisfied-guide-cns.cpp
index 83b8b555c..a83417865 100644
--- a/src/satisfied-guide-cns.cpp
+++ b/src/satisfied-guide-cns.cpp
@@ -1,6 +1,7 @@
 #include <2geom/coord.h>
 #include "desktop.h"
 #include "sp-guide.h"
+#include "sp-guide-constraint.h"
 #include "sp-namedview.h"
 #include "satisfied-guide-cns.h"
 
diff --git a/src/selcue.cpp b/src/selcue.cpp
index 3d9f3c619..297b9fffc 100644
--- a/src/selcue.cpp
+++ b/src/selcue.cpp
@@ -11,6 +11,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <string.h>
+
 #include "desktop.h"
 
 #include "selection.h"
@@ -21,6 +23,7 @@
 #include "text-editing.h"
 #include "sp-text.h"
 #include "sp-flowtext.h"
+#include "preferences.h"
 #include "selcue.h"
 
 Inkscape::SelCue::BoundingBoxPrefsObserver::BoundingBoxPrefsObserver(SelCue &sel_cue) :
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index f6923d1ea..7d32477a1 100644
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -20,7 +20,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <gtkmm/clipboard.h>
@@ -34,6 +34,7 @@ SPCycleType SP_CYCLING = SP_CYCLE_FOCUS;
 #include "svg/svg.h"
 #include "desktop.h"
 #include "desktop-style.h"
+#include "dir-util.h"
 #include "layer-model.h"
 #include "selection.h"
 #include "ui/tools-switch.h"
@@ -41,6 +42,7 @@ SPCycleType SP_CYCLING = SP_CYCLE_FOCUS;
 #include "message-stack.h"
 #include "sp-item-transform.h"
 #include "sp-marker.h"
+#include "sp-use.h"
 #include "sp-textpath.h"
 #include "sp-tspan.h"
 #include "sp-tref.h"
@@ -51,6 +53,7 @@ SPCycleType SP_CYCLING = SP_CYCLE_FOCUS;
 #include "sp-ellipse.h"
 #include "sp-star.h"
 #include "sp-spiral.h"
+#include "sp-switch.h"
 #include "sp-polyline.h"
 #include "sp-line.h"
 #include "text-editing.h"
@@ -61,10 +64,13 @@ SPCycleType SP_CYCLING = SP_CYCLE_FOCUS;
 #include "sp-conn-end.h"
 #include "ui/tools/dropper-tool.h"
 #include <glibmm/i18n.h>
+#include <2geom/transforms.h>
+#include "xml/repr.h"
 #include "xml/rebase-hrefs.h"
 #include "style.h"
 #include "document-private.h"
 #include "document-undo.h"
+#include "sp-gradient.h"
 #include "sp-gradient-reference.h"
 #include "sp-linear-gradient.h"
 #include "sp-pattern.h"
@@ -72,25 +78,42 @@ SPCycleType SP_CYCLING = SP_CYCLE_FOCUS;
 #include "sp-radial-gradient.h"
 #include "ui/tools/gradient-tool.h"
 #include "sp-namedview.h"
+#include "preferences.h"
 #include "sp-offset.h"
 #include "sp-clippath.h"
 #include "sp-mask.h"
 #include "helper/png-write.h"
 #include "layer-fns.h"
 #include "context-fns.h"
+#include <map>
+#include <cstring>
+#include <string>
+#include "sp-item.h"
 #include "box3d.h"
 #include "persp3d.h"
+#include "util/units.h"
 #include "xml/simple-document.h"
+#include "sp-filter-reference.h"
 #include "gradient-drag.h"
+#include "uri-references.h"
+#include "display/curve.h"
+#include "display/canvas-bpath.h"
 #include "display/cairo-utils.h"
+#include "inkscape.h"
 #include "path-chemistry.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/multi-path-manipulator.h"
+#include "sp-lpe-item.h"
 #include "live_effects/effect.h"
+#include "live_effects/effect-enum.h"
 #include "live_effects/parameter/originalpath.h"
 #include "layer-manager.h"
 
+#include "enums.h"
+#include "sp-item-group.h"
+
 // For clippath editing
+#include "ui/tools-switch.h"
 #include "ui/tools/node-tool.h"
 
 #include "ui/clipboard.h"
diff --git a/src/selection-describer.cpp b/src/selection-describer.cpp
index 584510756..ddc7a0d10 100644
--- a/src/selection-describer.cpp
+++ b/src/selection-describer.cpp
@@ -13,7 +13,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <glibmm/i18n.h>
@@ -27,8 +27,17 @@
 #include "sp-flowtext.h"
 #include "sp-use.h"
 #include "sp-symbol.h"
+#include "sp-rect.h"
+#include "box3d.h"
+#include "sp-ellipse.h"
+#include "sp-star.h"
+#include "sp-anchor.h"
 #include "sp-image.h"
 #include "sp-path.h"
+#include "sp-line.h"
+#include "sp-use.h"
+#include "sp-polyline.h"
+#include "sp-spiral.h"
 
 // Returns a list of terms for the items to be used in the statusbar
 char* collect_terms (const std::vector<SPItem*> &items)
diff --git a/src/selection.cpp b/src/selection.cpp
index 05ab68550..6fc426be7 100644
--- a/src/selection.cpp
+++ b/src/selection.cpp
@@ -17,11 +17,14 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
-
+#include "macros.h"
 #include "inkscape.h"
 #include "document.h"
+#include "layer-model.h"
+#include "selection.h"
+#include <2geom/rect.h>
 #include "xml/repr.h"
 #include "preferences.h"
 
@@ -29,8 +32,11 @@
 #include "sp-path.h"
 #include "sp-item-group.h"
 #include "box3d.h"
+#include "box3d.h"
 #include "persp3d.h"
 
+#include <sigc++/functors/mem_fun.h>
+
 #define SP_SELECTION_UPDATE_PRIORITY (G_PRIORITY_HIGH_IDLE + 1)
 
 namespace Inkscape {
diff --git a/src/selection.h b/src/selection.h
index 04bcca402..952dde51d 100644
--- a/src/selection.h
+++ b/src/selection.h
@@ -26,6 +26,8 @@
 #include "inkgc/gc-soft-ptr.h"
 #include "sp-item.h"
 
+
+
 class SPDesktop;
 class SPItem;
 class SPBox3D;
diff --git a/src/seltrans.cpp b/src/seltrans.cpp
index c1fb652be..b54525610 100644
--- a/src/seltrans.cpp
+++ b/src/seltrans.cpp
@@ -15,7 +15,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 #include <cstring>
 #include <string>
@@ -30,9 +30,11 @@
 #include "desktop-style.h"
 #include "knot.h"
 #include "message-stack.h"
+#include "snap.h"
 #include "pure-transform.h"
 #include "selection.h"
 #include "ui/tools/select-tool.h"
+#include "sp-item.h"
 #include "sp-item-transform.h"
 #include "sp-root.h"
 #include "seltrans-handles.h"
@@ -42,9 +44,13 @@
 #include <glibmm/i18n.h>
 #include "display/sp-ctrlline.h"
 #include "display/sodipodi-ctrl.h"
+#include "preferences.h"
+#include "xml/repr.h"
 #include "mod360.h"
+#include <2geom/angle.h>
 #include "display/snap-indicator.h"
 #include "ui/control-manager.h"
+#include "seltrans-handles.h"
 
 using Inkscape::ControlManager;
 using Inkscape::DocumentUndo;
diff --git a/src/shortcuts.cpp b/src/shortcuts.cpp
index a3b925d2d..194d4d2a4 100644
--- a/src/shortcuts.cpp
+++ b/src/shortcuts.cpp
@@ -26,12 +26,16 @@
 #include <map>
 
 #include "shortcuts.h"
+#include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
+#include <glibmm/convert.h>
 #include <glibmm/i18n.h>
+#include <glibmm/miscutils.h>
 
 #include "helper/action.h"
+#include "helper/action-context.h"
 #include "io/sys.h"
 #include "io/resource.h"
 #include "verbs.h"
diff --git a/src/snap-preferences.cpp b/src/snap-preferences.cpp
index 9985b0185..79e47ca83 100644
--- a/src/snap-preferences.cpp
+++ b/src/snap-preferences.cpp
@@ -10,6 +10,8 @@
  */
 
 #include "inkscape.h"
+#include "snap-preferences.h"
+#include <glib.h> // g_assert()
 
 Inkscape::SnapPreferences::SnapPreferences() :
     _snap_enabled_globally(true),
diff --git a/src/snap.cpp b/src/snap.cpp
index 50f40a9a1..7f0e8d9dc 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -19,6 +19,10 @@
 #include <2geom/transforms.h>
 
 #include "sp-namedview.h"
+#include "snap.h"
+#include "snap-enums.h"
+#include "snapped-line.h"
+#include "snapped-curve.h"
 #include "pure-transform.h"
 
 #include "display/canvas-grid.h"
@@ -26,7 +30,9 @@
 
 #include "inkscape.h"
 #include "desktop.h"
+#include "selection.h"
 #include "sp-guide.h"
+#include "preferences.h"
 #include "ui/tools/tool-base.h"
 #include "helper/mathfns.h"
 using std::vector;
diff --git a/src/snap.h b/src/snap.h
index 12fba05ff..41d21b1b2 100644
--- a/src/snap.h
+++ b/src/snap.h
@@ -21,6 +21,7 @@
 #include "guide-snapper.h"
 #include "object-snapper.h"
 #include "snap-preferences.h"
+//#include "pure-transform.h"
 
 
 // Guides
diff --git a/src/snapped-curve.cpp b/src/snapped-curve.cpp
index 1f6165813..b332fa8c1 100644
--- a/src/snapped-curve.cpp
+++ b/src/snapped-curve.cpp
@@ -9,6 +9,7 @@
  */
 
 #include "snapped-curve.h"
+#include <2geom/crossing.h>
 #include <2geom/path-intersection.h>
 
 Inkscape::SnappedCurve::SnappedCurve(Geom::Point const &snapped_point, Geom::Point const &tangent, int num_path, int num_segm, Geom::Coord const &snapped_distance, Geom::Coord const &snapped_tolerance, bool const &always_snap, bool const &fully_constrained, Geom::Curve const *curve, SnapSourceType source, long source_num, SnapTargetType target, Geom::OptRect target_bbox)
diff --git a/src/snapped-line.cpp b/src/snapped-line.cpp
index 8a307783a..fa333d6f1 100644
--- a/src/snapped-line.cpp
+++ b/src/snapped-line.cpp
@@ -1,4 +1,4 @@
-/**#include <config.h>
+/**
  *    \file src/snapped-line.cpp
  *    SnappedLine class.
  *
@@ -9,6 +9,7 @@
  */
 
 #include "snapped-line.h"
+#include <2geom/line.h>
 
 Inkscape::SnappedLineSegment::SnappedLineSegment(Geom::Point const &snapped_point, Geom::Coord const &snapped_distance, SnapSourceType const &source, long source_num, SnapTargetType const &target, Geom::Coord const &snapped_tolerance, bool const &always_snap, Geom::Point const &start_point_of_line, Geom::Point const &end_point_of_line)
     : _start_point_of_line(start_point_of_line), _end_point_of_line(end_point_of_line)
diff --git a/src/snapper.cpp b/src/snapper.cpp
index 78493746f..8c985b732 100644
--- a/src/snapper.cpp
+++ b/src/snapper.cpp
@@ -10,6 +10,7 @@
  */
 
 #include "sp-namedview.h"
+#include "inkscape.h"
 #include "desktop.h"
 
 /**
diff --git a/src/sp-clippath.cpp b/src/sp-clippath.cpp
index 915c57e45..0c07d1b3d 100644
--- a/src/sp-clippath.cpp
+++ b/src/sp-clippath.cpp
@@ -23,6 +23,7 @@
 #include "attributes.h"
 #include "document.h"
 #include "document-private.h"
+#include "sp-item.h"
 #include "style.h"
 
 #include <2geom/transforms.h>
diff --git a/src/sp-conn-end-pair.cpp b/src/sp-conn-end-pair.cpp
index 937163f45..dbd4f2e94 100644
--- a/src/sp-conn-end-pair.cpp
+++ b/src/sp-conn-end-pair.cpp
@@ -13,6 +13,7 @@
 
 #include <cstring>
 #include <string>
+#include <iostream>
 #include <glibmm/stringutils.h>
 
 #include "attributes.h"
@@ -21,6 +22,7 @@
 #include "display/curve.h"
 #include "xml/repr.h"
 #include "sp-path.h"
+#include "libavoid/vertices.h"
 #include "libavoid/router.h"
 #include "document.h"
 #include "sp-item-group.h"
diff --git a/src/sp-conn-end.cpp b/src/sp-conn-end.cpp
index 9ce1a3b56..75cce4374 100644
--- a/src/sp-conn-end.cpp
+++ b/src/sp-conn-end.cpp
@@ -10,6 +10,8 @@
 #include "uri.h"
 #include "document.h"
 #include "sp-item-group.h"
+#include "2geom/path.h"
+#include "2geom/pathvector.h"
 #include "2geom/path-intersection.h"
 
 
diff --git a/src/sp-ellipse.cpp b/src/sp-ellipse.cpp
index 995f880c2..0675b7781 100644
--- a/src/sp-ellipse.cpp
+++ b/src/sp-ellipse.cpp
@@ -21,6 +21,8 @@
 #include <2geom/circle.h>
 #include <2geom/ellipse.h>
 #include <2geom/path-sink.h>
+#include <2geom/pathvector.h>
+#include <2geom/transforms.h>
 
 #include "attributes.h"
 #include "display/curve.h"
@@ -31,6 +33,7 @@
 #include "style.h"
 #include "svg/svg.h"
 #include "svg/path-string.h"
+#include "xml/repr.h"
 
 
 #ifndef M_PI
diff --git a/src/sp-factory.cpp b/src/sp-factory.cpp
index 62af684a2..20472d425 100644
--- a/src/sp-factory.cpp
+++ b/src/sp-factory.cpp
@@ -32,6 +32,7 @@
 #include "sp-hatch.h"
 #include "sp-hatch-path.h"
 #include "sp-image.h"
+#include "sp-item-group.h"
 #include "sp-line.h"
 #include "sp-linear-gradient.h"
 #include "sp-marker.h"
@@ -42,8 +43,11 @@
 #include "sp-metadata.h"
 #include "sp-missing-glyph.h"
 #include "sp-namedview.h"
+#include "sp-object.h"
 #include "sp-offset.h"
+#include "sp-path.h"
 #include "sp-pattern.h"
+#include "sp-polygon.h"
 #include "sp-polyline.h"
 #include "sp-radial-gradient.h"
 #include "sp-rect.h"
@@ -64,6 +68,7 @@
 #include "sp-title.h"
 #include "sp-tref.h"
 #include "sp-tspan.h"
+#include "sp-use.h"
 #include "live_effects/lpeobject.h"
 
 // filters
diff --git a/src/sp-filter-primitive.cpp b/src/sp-filter-primitive.cpp
index 2e6e06caf..b18850914 100644
--- a/src/sp-filter-primitive.cpp
+++ b/src/sp-filter-primitive.cpp
@@ -14,16 +14,20 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <string.h>
 
 #include "display/nr-filter-primitive.h"
+#include "display/nr-filter-types.h"
 
 #include "attributes.h"
 #include "style.h"
 #include "sp-filter-primitive.h"
+#include "xml/repr.h"
+#include "sp-filter.h"
+#include "sp-item.h"
 
 
 // CPPIFY: Make pure virtual.
diff --git a/src/sp-filter.cpp b/src/sp-filter.cpp
index 64a972ff4..c17c67fc5 100644
--- a/src/sp-filter.cpp
+++ b/src/sp-filter.cpp
@@ -14,7 +14,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <map>
@@ -29,10 +29,14 @@ using std::pair;
 #include "sp-filter.h"
 #include "sp-filter-reference.h"
 #include "sp-filter-primitive.h"
+#include "sp-item.h"
 #include "uri.h"
 #include "xml/repr.h"
+#include <cstring>
+#include <string>
 
 #define SP_MACROS_SILENT
+#include "macros.h"
 
 static void filter_ref_changed(SPObject *old_ref, SPObject *ref, SPFilter *filter);
 static void filter_ref_modified(SPObject *href, guint flags, SPFilter *filter);
diff --git a/src/sp-flowregion.cpp b/src/sp-flowregion.cpp
index 3dc02c3ca..5715e5eb1 100644
--- a/src/sp-flowregion.cpp
+++ b/src/sp-flowregion.cpp
@@ -2,7 +2,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 #include <glibmm/i18n.h>
 
@@ -18,6 +18,8 @@
 
 #include "sp-flowregion.h"
 
+#include "display/canvas-bpath.h"
+
 #include "livarot/Path.h"
 #include "livarot/Shape.h"
 
diff --git a/src/sp-flowtext.cpp b/src/sp-flowtext.cpp
index d89de33bf..51fb3ae89 100644
--- a/src/sp-flowtext.cpp
+++ b/src/sp-flowtext.cpp
@@ -2,7 +2,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 #include <glibmm/i18n.h>
 #include <cstring>
@@ -13,15 +13,20 @@
 #include "style.h"
 #include "inkscape.h"
 #include "document.h"
+#include "selection.h"
 
 #include "desktop.h"
 
+#include "xml/repr.h"
+
 #include "sp-flowdiv.h"
 #include "sp-flowregion.h"
 #include "sp-flowtext.h"
 #include "sp-string.h"
+#include "sp-use.h"
 #include "sp-rect.h"
 #include "text-tag-attributes.h"
+#include "text-chemistry.h"
 #include "text-editing.h"
 #include "sp-text.h"
 
diff --git a/src/sp-font-face.cpp b/src/sp-font-face.cpp
index 52fc09ddd..afd2a9dee 100644
--- a/src/sp-font-face.cpp
+++ b/src/sp-font-face.cpp
@@ -1,5 +1,5 @@
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 /*
diff --git a/src/sp-font.cpp b/src/sp-font.cpp
index 2948dece4..341a6159f 100644
--- a/src/sp-font.cpp
+++ b/src/sp-font.cpp
@@ -1,5 +1,5 @@
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 /*
@@ -17,6 +17,8 @@
 #include "xml/repr.h"
 #include "attributes.h"
 #include "sp-font.h"
+#include "sp-glyph.h"
+#include "sp-missing-glyph.h"
 #include "document.h"
 
 #include "display/nr-svgfonts.h"
diff --git a/src/sp-glyph-kerning.cpp b/src/sp-glyph-kerning.cpp
index 66de5aed9..f33d3c509 100644
--- a/src/sp-glyph-kerning.cpp
+++ b/src/sp-glyph-kerning.cpp
@@ -16,6 +16,7 @@
 #include "sp-glyph-kerning.h"
 
 #include "document.h"
+#include <string>
 #include <cstring>
 
 
diff --git a/src/sp-glyph.cpp b/src/sp-glyph.cpp
index 6284cbfa1..4829aae51 100644
--- a/src/sp-glyph.cpp
+++ b/src/sp-glyph.cpp
@@ -1,4 +1,5 @@
 #ifdef HAVE_CONFIG_H
+# include <config.h>
 #endif
 
 /*
@@ -17,6 +18,7 @@
 #include "attributes.h"
 #include "sp-glyph.h"
 #include "document.h"
+#include <cstring>
 
 SPGlyph::SPGlyph()
     : SPObject() 
diff --git a/src/sp-gradient.cpp b/src/sp-gradient.cpp
index 49143bda4..854d53dc4 100644
--- a/src/sp-gradient.cpp
+++ b/src/sp-gradient.cpp
@@ -35,6 +35,7 @@
 
 #include "display/cairo-utils.h"
 #include "svg/svg.h"
+#include "svg/svg-color.h"
 #include "svg/css-ostringstream.h"
 #include "attributes.h"
 #include "document-private.h"
@@ -45,7 +46,13 @@
 #include "sp-radial-gradient.h"
 #include "sp-mesh.h"
 #include "sp-mesh-row.h"
+#include "sp-mesh-patch.h"
 #include "sp-stop.h"
+#include "streq.h"
+#include "uri.h"
+#include "xml/repr.h"
+#include "style.h"
+#include "display/grayscale.h"
 
 /// Has to be power of 2   Seems to be unused.
 //#define NCOLORS NR_GRADIENT_VECTOR_LENGTH
diff --git a/src/sp-gradient.h b/src/sp-gradient.h
index 0d0969f1d..ab45d6f08 100644
--- a/src/sp-gradient.h
+++ b/src/sp-gradient.h
@@ -15,6 +15,8 @@
  */
 
 #include <2geom/affine.h>
+#include <cstddef>
+#include <glibmm/ustring.h>
 #include <sigc++/connection.h>
 #include <vector>
 
diff --git a/src/sp-guide.cpp b/src/sp-guide.cpp
index ff0f6cadb..58a1a746e 100644
--- a/src/sp-guide.cpp
+++ b/src/sp-guide.cpp
@@ -16,7 +16,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <algorithm>
@@ -31,6 +31,8 @@
 #include "attributes.h"
 #include "sp-guide.h"
 #include <sp-item-notify-moveto.h>
+#include <sp-item.h>
+#include <sp-guide-constraint.h>
 #include <glibmm/i18n.h>
 #include <xml/repr.h>
 #include <remove-last.h>
@@ -38,6 +40,8 @@
 #include "desktop.h"
 #include "sp-root.h"
 #include "sp-namedview.h"
+#include <2geom/angle.h>
+#include "document.h"
 #include "document-undo.h"
 #include "helper-fns.h"
 #include "verbs.h"
diff --git a/src/sp-hatch-path.cpp b/src/sp-hatch-path.cpp
index b40f66064..32a514dcb 100644
--- a/src/sp-hatch-path.cpp
+++ b/src/sp-hatch-path.cpp
@@ -12,8 +12,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <cstring>
 #include <string>
 #include <2geom/path.h>
+#include <2geom/transforms.h>
 
 #include "svg/svg.h"
 #include "display/cairo-utils.h"
@@ -25,8 +27,11 @@
 #include "helper/geom.h"
 #include "attributes.h"
 #include "document-private.h"
+#include "uri.h"
+#include "style.h"
 #include "sp-hatch-path.h"
 #include "svg/css-ostringstream.h"
+#include "xml/repr.h"
 
 SPHatchPath::SPHatchPath()
     : offset(),
diff --git a/src/sp-hatch.cpp b/src/sp-hatch.cpp
index a17a555b8..2d938618c 100644
--- a/src/sp-hatch.cpp
+++ b/src/sp-hatch.cpp
@@ -25,8 +25,11 @@
 #include "display/drawing-pattern.h"
 #include "attributes.h"
 #include "document-private.h"
+#include "uri.h"
+#include "style.h"
 #include "sp-hatch.h"
 #include "sp-hatch-path.h"
+#include "xml/repr.h"
 
 SPHatch::SPHatch()
     : SPPaintServer(),
diff --git a/src/sp-image.cpp b/src/sp-image.cpp
index aa1dbfe20..bf5b9ebcd 100644
--- a/src/sp-image.cpp
+++ b/src/sp-image.cpp
@@ -30,6 +30,7 @@
 #include "display/cairo-utils.h"
 #include "display/curve.h"
 //Added for preserveAspectRatio support -- EAF
+#include "enums.h"
 #include "attributes.h"
 #include "print.h"
 #include "brokenimage.xpm"
@@ -37,6 +38,8 @@
 #include "sp-image.h"
 #include "sp-clippath.h"
 #include "xml/quote.h"
+#include "xml/repr.h"
+#include "snap-candidate.h"
 #include "preferences.h"
 #include "io/sys.h"
 
diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp
index f5c8f348e..70d2bc732 100644
--- a/src/sp-item-group.cpp
+++ b/src/sp-item-group.cpp
@@ -15,7 +15,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <glibmm/i18n.h>
@@ -32,13 +32,16 @@
 #include "attributes.h"
 #include "sp-item-transform.h"
 #include "sp-root.h"
+#include "sp-use.h"
 #include "sp-offset.h"
 #include "sp-clippath.h"
 #include "sp-mask.h"
 #include "sp-path.h"
 #include "box3d.h"
 #include "persp3d.h"
+#include "inkscape.h"
 
+#include "selection.h"
 #include "live_effects/effect.h"
 #include "live_effects/lpeobject.h"
 #include "live_effects/lpeobject-reference.h"
@@ -47,8 +50,10 @@
 #include "sp-switch.h"
 #include "sp-defs.h"
 #include "verbs.h"
+#include "layer-model.h"
 #include "sp-textpath.h"
 #include "sp-flowtext.h"
+#include "sp-tspan.h"
 #include "selection-chemistry.h"
 #include "xml/sp-css-attr.h"
 #include "svg/css-ostringstream.h"
diff --git a/src/sp-item-rm-unsatisfied-cns.cpp b/src/sp-item-rm-unsatisfied-cns.cpp
index 516c88672..7a712b083 100644
--- a/src/sp-item-rm-unsatisfied-cns.cpp
+++ b/src/sp-item-rm-unsatisfied-cns.cpp
@@ -4,6 +4,8 @@
 
 #include "remove-last.h"
 #include "sp-guide.h"
+#include "sp-guide-constraint.h"
+#include "sp-item.h"
 #include "sp-item-rm-unsatisfied-cns.h"
 
 using std::vector;
diff --git a/src/sp-item-update-cns.cpp b/src/sp-item-update-cns.cpp
index 9aef336c5..750f0d94f 100644
--- a/src/sp-item-update-cns.cpp
+++ b/src/sp-item-update-cns.cpp
@@ -1,8 +1,10 @@
 
 #include "satisfied-guide-cns.h"
+#include "sp-guide-constraint.h"
 #include "sp-item-update-cns.h"
 #include "sp-guide.h"
-
+#include "sp-item.h"
+#include <algorithm>
 using std::find;
 using std::vector;
 
diff --git a/src/sp-item.cpp b/src/sp-item.cpp
index 01cb2d09f..9fd6e8ecc 100644
--- a/src/sp-item.cpp
+++ b/src/sp-item.cpp
@@ -13,7 +13,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include "sp-item.h"
@@ -33,14 +33,19 @@
 #include "sp-clippath.h"
 #include "sp-mask.h"
 #include "sp-rect.h"
+#include "sp-use.h"
 #include "sp-text.h"
 #include "sp-textpath.h"
 #include "sp-item-rm-unsatisfied-cns.h"
 #include "sp-pattern.h"
+#include "sp-paint-server.h"
 #include "sp-switch.h"
+#include "sp-guide-constraint.h"
 #include "gradient-chemistry.h"
+#include "preferences.h"
 #include "conn-avoid-ref.h"
 #include "conditions.h"
+#include "sp-filter-reference.h"
 #include "filter-chemistry.h"
 #include "sp-guide.h"
 #include "sp-title.h"
@@ -48,8 +53,13 @@
 
 #include "util/find-last-if.h"
 #include "util/reverse-list.h"
+#include <2geom/rect.h>
+#include <2geom/affine.h>
+#include <2geom/transforms.h>
 
+#include "xml/repr.h"
 #include "extract-uri.h"
+#include "helper/geom.h"
 
 #include "live_effects/lpeobject.h"
 #include "live_effects/effect.h"
diff --git a/src/sp-item.h b/src/sp-item.h
index 8a80d69be..bdc6a0ad9 100644
--- a/src/sp-item.h
+++ b/src/sp-item.h
@@ -29,6 +29,7 @@
 #include "snap-preferences.h"
 #include "snap-candidate.h"
 
+//class SPGuideConstraint;
 #include "sp-guide-constraint.h"
 
 class SPClipPathReference;
diff --git a/src/sp-line.cpp b/src/sp-line.cpp
index 09ffd1f17..cf21be912 100644
--- a/src/sp-line.cpp
+++ b/src/sp-line.cpp
@@ -17,6 +17,7 @@
 #include "sp-guide.h"
 #include "display/curve.h"
 #include <glibmm/i18n.h>
+#include "xml/repr.h"
 #include "document.h"
 #include "inkscape.h"
 
diff --git a/src/sp-line.h b/src/sp-line.h
index 177555c77..d6a075659 100644
--- a/src/sp-line.h
+++ b/src/sp-line.h
@@ -1,5 +1,4 @@
-#ifndef SEEN_SP_LINE_H * SPGradient, SPStop, SPLinearGradient, SPRadialGradient,
-
+#ifndef SEEN_SP_LINE_H
 #define SEEN_SP_LINE_H
 
 /*
diff --git a/src/sp-lpe-item.cpp b/src/sp-lpe-item.cpp
index d9e53fbc5..fdc2949d5 100644
--- a/src/sp-lpe-item.cpp
+++ b/src/sp-lpe-item.cpp
@@ -13,6 +13,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
+# include "config.h"
 #endif
 
 #include "ui/tool/multi-path-manipulator.h"
@@ -26,7 +27,11 @@
 
 #include "sp-path.h"
 #include "sp-item-group.h"
+#include "streq.h"
+#include "macros.h"
 #include "attributes.h"
+#include "sp-lpe-item.h"
+#include "xml/repr.h"
 #include "uri.h"
 #include "message-stack.h"
 #include "inkscape.h"
@@ -35,10 +40,14 @@
 #include "sp-ellipse.h"
 #include "display/curve.h"
 #include "svg/svg.h"
+#include <2geom/pathvector.h>
 #include "sp-clippath.h"
 #include "sp-mask.h"
 #include "ui/tools-switch.h"
 #include "ui/tools/node-tool.h"
+#include "ui/tools/tool-base.h"
+
+#include <algorithm>
 
 /* LPEItem base class */
 static void sp_lpe_item_enable_path_effects(SPLPEItem *lpeitem, bool enable);
diff --git a/src/sp-marker.cpp b/src/sp-marker.cpp
index 43df8525d..3505e2fe8 100644
--- a/src/sp-marker.cpp
+++ b/src/sp-marker.cpp
@@ -16,6 +16,7 @@
 
 #include <cstring>
 #include <string>
+#include "config.h"
 
 #include <2geom/affine.h>
 #include <2geom/transforms.h>
diff --git a/src/sp-mask.cpp b/src/sp-mask.cpp
index e860206a2..3537c7bac 100644
--- a/src/sp-mask.cpp
+++ b/src/sp-mask.cpp
@@ -23,6 +23,7 @@
 #include "attributes.h"
 #include "document.h"
 #include "document-private.h"
+#include "sp-item.h"
 
 #include "sp-mask.h"
 
diff --git a/src/sp-mesh-patch.cpp b/src/sp-mesh-patch.cpp
index 9727ffef6..834c09935 100644
--- a/src/sp-mesh-patch.cpp
+++ b/src/sp-mesh-patch.cpp
@@ -18,6 +18,7 @@
 #include "style.h"
 
 #include "attributes.h"
+#include "xml/repr.h"
 
 SPMeshpatch* SPMeshpatch::getNextMeshpatch()
 {
diff --git a/src/sp-mesh-row.cpp b/src/sp-mesh-row.cpp
index 90173da8c..dd7948bdf 100644
--- a/src/sp-mesh-row.cpp
+++ b/src/sp-mesh-row.cpp
@@ -17,6 +17,8 @@
 #include "sp-mesh-row.h"
 #include "style.h"
 
+#include "xml/repr.h"
+
 SPMeshrow* SPMeshrow::getNextMeshrow()
 {
     SPMeshrow *result = 0;
diff --git a/src/sp-mesh.cpp b/src/sp-mesh.cpp
index 5a6f2bd8e..e04c29e8e 100644
--- a/src/sp-mesh.cpp
+++ b/src/sp-mesh.cpp
@@ -2,6 +2,7 @@
 
 #include "attributes.h"
 #include "display/cairo-utils.h"
+#include "xml/repr.h"
 
 #include "sp-mesh.h"
 
diff --git a/src/sp-metadata.cpp b/src/sp-metadata.cpp
index e7907e4f0..6bdc2f0b9 100644
--- a/src/sp-metadata.cpp
+++ b/src/sp-metadata.cpp
@@ -10,7 +10,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include "sp-metadata.h"
diff --git a/src/sp-missing-glyph.cpp b/src/sp-missing-glyph.cpp
index f441b66d2..75de55693 100644
--- a/src/sp-missing-glyph.cpp
+++ b/src/sp-missing-glyph.cpp
@@ -1,5 +1,5 @@
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 /*
diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index 45e3d4cf8..616ec3921 100644
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
@@ -14,12 +14,14 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "config.h"
 #include <cstring>
 #include <string>
 #include "event-log.h"
 #include <2geom/transforms.h>
 
 #include "display/canvas-grid.h"
+#include "display/guideline.h"
 #include "util/units.h"
 #include "svg/svg-color.h"
 #include "xml/repr.h"
diff --git a/src/sp-object.cpp b/src/sp-object.cpp
index 9cb386026..d1659eedc 100644
--- a/src/sp-object.cpp
+++ b/src/sp-object.cpp
@@ -32,10 +32,12 @@
 #include "sp-script.h"
 #include "streq.h"
 #include "strneq.h"
+#include "xml/repr.h"
 #include "xml/node-fns.h"
 #include "debug/event-tracker.h"
 #include "debug/simple-event.h"
 #include "debug/demangle.h"
+#include "util/share.h"
 #include "util/format.h"
 #include "util/longest-common-suffix.h"
 
diff --git a/src/sp-offset.cpp b/src/sp-offset.cpp
index 9e2264d76..d84bdbdd3 100644
--- a/src/sp-offset.cpp
+++ b/src/sp-offset.cpp
@@ -15,7 +15,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <cstring>
@@ -36,6 +36,11 @@
 #include "sp-use-reference.h"
 #include "uri.h"
 
+#include <2geom/affine.h>
+#include <2geom/pathvector.h>
+
+#include "xml/repr.h"
+
 class SPDocument;
 
 #define noOFFSET_VERBOSE
diff --git a/src/sp-paint-server.cpp b/src/sp-paint-server.cpp
index 958078012..d445ca0a7 100644
--- a/src/sp-paint-server.cpp
+++ b/src/sp-paint-server.cpp
@@ -13,6 +13,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <string.h>
 #include "sp-paint-server-reference.h"
 #include "sp-paint-server.h"
 
diff --git a/src/sp-path.cpp b/src/sp-path.cpp
index a7119dd31..c4d24c503 100644
--- a/src/sp-path.cpp
+++ b/src/sp-path.cpp
@@ -16,7 +16,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <glibmm/i18n.h>
@@ -27,6 +27,7 @@
 #include "sp-lpe-item.h"
 
 #include "display/curve.h"
+#include <2geom/pathvector.h>
 #include <2geom/curves.h>
 #include "helper/geom-curves.h"
 
@@ -45,6 +46,7 @@
 #include "inkscape.h"
 #include "style.h"
 #include "message-stack.h"
+#include "selection.h"
 
 #define noPATH_VERBOSE
 
diff --git a/src/sp-pattern.cpp b/src/sp-pattern.cpp
index a68bee721..55110f3c5 100644
--- a/src/sp-pattern.cpp
+++ b/src/sp-pattern.cpp
@@ -13,13 +13,14 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include <cstring>
 #include <string>
 #include <glibmm.h>
 #include <2geom/transforms.h>
+#include <sigc++/functors/mem_fun.h>
 
 #include "svg/svg.h"
 #include "display/cairo-utils.h"
@@ -29,7 +30,10 @@
 #include "display/drawing-group.h"
 #include "attributes.h"
 #include "document-private.h"
+#include "uri.h"
+#include "style.h"
 #include "sp-pattern.h"
+#include "xml/repr.h"
 
 #include "sp-factory.h"
 
diff --git a/src/sp-polygon.cpp b/src/sp-polygon.cpp
index 14fd104b3..ced485f12 100644
--- a/src/sp-polygon.cpp
+++ b/src/sp-polygon.cpp
@@ -15,6 +15,7 @@
 #include "sp-polygon.h"
 #include "display/curve.h"
 #include <glibmm/i18n.h>
+#include <2geom/pathvector.h>
 #include <2geom/curves.h>
 #include "helper/geom-curves.h"
 #include "svg/stringstream.h"
diff --git a/src/sp-polyline.cpp b/src/sp-polyline.cpp
index 29054f934..a12f927b5 100644
--- a/src/sp-polyline.cpp
+++ b/src/sp-polyline.cpp
@@ -11,6 +11,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "config.h"
+
 #include "attributes.h"
 #include "sp-polyline.h"
 #include "display/curve.h"
diff --git a/src/sp-rect.cpp b/src/sp-rect.cpp
index 40107096f..2ba9a7023 100644
--- a/src/sp-rect.cpp
+++ b/src/sp-rect.cpp
@@ -12,10 +12,12 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
+
 #include "display/curve.h"
+#include <2geom/rect.h>
 
 #include "inkscape.h"
 #include "document.h"
@@ -23,6 +25,7 @@
 #include "style.h"
 #include "sp-rect.h"
 #include <glibmm/i18n.h>
+#include "xml/repr.h"
 #include "sp-guide.h"
 #include "preferences.h"
 
diff --git a/src/sp-script.cpp b/src/sp-script.cpp
index bd1ab512b..f1ea9c9bd 100644
--- a/src/sp-script.cpp
+++ b/src/sp-script.cpp
@@ -13,6 +13,8 @@
 
 #include "sp-script.h"
 #include "attributes.h"
+#include <cstring>
+#include "document.h"
 
 SPScript::SPScript() : SPObject() {
 	this->xlinkhref = NULL;
diff --git a/src/sp-shape.cpp b/src/sp-shape.cpp
index acec00024..78135d459 100644
--- a/src/sp-shape.cpp
+++ b/src/sp-shape.cpp
@@ -15,19 +15,21 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <2geom/rect.h>
 #include <2geom/transforms.h>
 #include <2geom/pathvector.h>
 #include <2geom/path-intersection.h>
+#include <2geom/exception.h>
 #include "helper/geom.h"
 #include "helper/geom-nodetype.h"
 
 #include <sigc++/functors/ptr_fun.h>
 #include <sigc++/adaptors/bind.h>
 
+#include "macros.h"
 #include "display/drawing-shape.h"
 #include "display/curve.h"
 #include "print.h"
@@ -39,6 +41,11 @@
 #include "attributes.h"
 
 #include "live_effects/lpeobject.h"
+#include "uri.h"
+#include "extract-uri.h"
+#include "uri-references.h"
+#include "bad-uri-exception.h"
+#include "xml/repr.h"
 
 #include "helper/mathfns.h" // for triangle_area()
 
diff --git a/src/sp-solid-color.cpp b/src/sp-solid-color.cpp
index 89858c18c..f319410b0 100644
--- a/src/sp-solid-color.cpp
+++ b/src/sp-solid-color.cpp
@@ -14,6 +14,10 @@
 
 #include "attributes.h"
 #include "style.h"
+#include "xml/repr.h"
+
+#include "sp-item.h"
+#include "style-internal.h"
 
 
 /*
diff --git a/src/sp-spiral.cpp b/src/sp-spiral.cpp
index 57eb918fe..5dbd7dfa0 100644
--- a/src/sp-spiral.cpp
+++ b/src/sp-spiral.cpp
@@ -14,6 +14,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "config.h"
+
 
 #include "svg/svg.h"
 #include "attributes.h"
diff --git a/src/sp-star.cpp b/src/sp-star.cpp
index d112962a2..8a1956e3b 100644
--- a/src/sp-star.cpp
+++ b/src/sp-star.cpp
@@ -14,7 +14,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <cstring>
@@ -28,6 +28,8 @@
 #include "xml/repr.h"
 #include "document.h"
 
+#include <2geom/pathvector.h>
+
 #include "sp-star.h"
 
 SPStar::SPStar() : SPPolygon() ,
diff --git a/src/sp-stop.cpp b/src/sp-stop.cpp
index d31946b94..5e8fed86c 100644
--- a/src/sp-stop.cpp
+++ b/src/sp-stop.cpp
@@ -22,6 +22,7 @@
 #include "svg/svg.h"
 #include "svg/svg-color.h"
 #include "svg/css-ostringstream.h"
+#include "xml/repr.h"
 
 SPStop::SPStop() : SPObject() {
 	this->path_string = NULL;
diff --git a/src/sp-string.cpp b/src/sp-string.cpp
index 0a959abea..26bb44006 100644
--- a/src/sp-string.cpp
+++ b/src/sp-string.cpp
@@ -25,6 +25,10 @@
 #include "sp-string.h"
 #include "style.h"
 
+#include "xml/repr.h"
+
+#include <iostream>
+
 /*#####################################################
 #  SPSTRING
 #####################################################*/
diff --git a/src/sp-style-elem.cpp b/src/sp-style-elem.cpp
index d85fe5032..80e45677c 100644
--- a/src/sp-style-elem.cpp
+++ b/src/sp-style-elem.cpp
@@ -1,12 +1,10 @@
+#include <libcroco/cr-parser.h>
 #include "xml/node-event-vector.h"
 #include "xml/repr.h"
 #include "document.h"
 #include "sp-style-elem.h"
 #include "attributes.h"
 #include "style.h"
-#include <libcroco/cr-parser.h>
-#include <libcroco/cr-cascade.h>
-
 using Inkscape::XML::TEXT_NODE;
 
 SPStyleElem::SPStyleElem() : SPObject() {
diff --git a/src/sp-switch.cpp b/src/sp-switch.cpp
index 1e0d81db9..d2dcde15d 100644
--- a/src/sp-switch.cpp
+++ b/src/sp-switch.cpp
@@ -18,6 +18,7 @@
 #include "display/drawing-group.h"
 #include "conditions.h"
 
+#include <sigc++/functors/ptr_fun.h>
 #include <sigc++/adaptors/bind.h>
 
 SPSwitch::SPSwitch() : SPGroup() {
diff --git a/src/sp-symbol.cpp b/src/sp-symbol.cpp
index 55b5101af..62fb232a3 100644
--- a/src/sp-symbol.cpp
+++ b/src/sp-symbol.cpp
@@ -12,9 +12,10 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
+#include <cstring>
 #include <string>
 
 #include <2geom/transforms.h>
diff --git a/src/sp-tag-use-reference.cpp b/src/sp-tag-use-reference.cpp
index cca24ed85..9fcb31fd1 100644
--- a/src/sp-tag-use-reference.cpp
+++ b/src/sp-tag-use-reference.cpp
@@ -8,9 +8,12 @@
 
 #include <cstring>
 #include <string>
+#include <string.h>
 
+#include "enums.h"
 #include "sp-tag-use-reference.h"
 
+#include "display/curve.h"
 #include "livarot/Path.h"
 #include "preferences.h"
 #include "sp-shape.h"
diff --git a/src/sp-text.cpp b/src/sp-text.cpp
index 2e1d4993d..4afc38524 100644
--- a/src/sp-text.cpp
+++ b/src/sp-text.cpp
@@ -29,14 +29,17 @@
 
 #include <glibmm/i18n.h>
 #include "svg/svg.h"
+#include "svg/stringstream.h"
 #include "display/drawing-text.h"
 #include "attributes.h"
 #include "document.h"
 #include "preferences.h"
 #include "desktop.h"
 #include "sp-namedview.h"
+#include "style.h"
 #include "inkscape.h"
 #include "xml/quote.h"
+#include "xml/repr.h"
 #include "mod360.h"
 #include "sp-title.h"
 #include "sp-desc.h"
@@ -49,7 +52,9 @@
 #include "text-editing.h"
 
 // For SVG 2 text flow
+#include "livarot/Path.h"
 #include "livarot/Shape.h"
+#include "sp-shape.h"
 #include "display/curve.h"
 
 /*#####################################################
diff --git a/src/sp-tref-reference.cpp b/src/sp-tref-reference.cpp
index dfb8dd60b..7c6ff00e7 100644
--- a/src/sp-tref-reference.cpp
+++ b/src/sp-tref-reference.cpp
@@ -13,6 +13,8 @@
 
 #include "sp-text.h"
 #include "sp-tref.h"
+#include "sp-tspan.h"
+
 
 
 bool SPTRefReference::_acceptObject(SPObject * const obj) const
diff --git a/src/sp-tref.cpp b/src/sp-tref.cpp
index 20bfc8cd0..ba592058b 100644
--- a/src/sp-tref.cpp
+++ b/src/sp-tref.cpp
@@ -22,9 +22,14 @@
 #include "document.h"
 #include "sp-factory.h"
 #include "sp-text.h"
+#include "sp-tspan.h"
 #include "sp-tref.h"
 #include "style.h"
 #include "text-editing.h"
+#include "uri.h"
+
+#include "xml/node.h"
+#include "xml/repr.h"
 
 //#define DEBUG_TREF
 #ifdef DEBUG_TREF
diff --git a/src/sp-tspan.cpp b/src/sp-tspan.cpp
index 2b4ecf92b..05f8430ba 100644
--- a/src/sp-tspan.cpp
+++ b/src/sp-tspan.cpp
@@ -24,7 +24,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <cstring>
@@ -40,7 +40,9 @@
 #include "sp-textpath.h"
 #include "text-editing.h"
 #include "style.h"
+#include "xml/repr.h"
 #include "document.h"
+#include "2geom/transforms.h"
 
 /*#####################################################
 #  SPTSPAN
diff --git a/src/sp-use-reference.cpp b/src/sp-use-reference.cpp
index 3dd63df40..f0b2985d2 100644
--- a/src/sp-use-reference.cpp
+++ b/src/sp-use-reference.cpp
@@ -9,6 +9,7 @@
 
 #include <cstring>
 #include <string>
+#include <string.h>
 
 #include "enums.h"
 #include "sp-use-reference.h"
@@ -20,6 +21,8 @@
 #include "sp-text.h"
 #include "uri.h"
 
+
+
 bool SPUseReference::_acceptObject(SPObject * const obj) const
 {
 	return URIReference::_acceptObject(obj);
diff --git a/src/sp-use.cpp b/src/sp-use.cpp
index 59064ce21..c8a0830c1 100644
--- a/src/sp-use.cpp
+++ b/src/sp-use.cpp
@@ -34,6 +34,7 @@
 #include "style.h"
 #include "sp-symbol.h"
 #include "sp-root.h"
+#include "sp-use.h"
 #include "sp-use-reference.h"
 #include "sp-shape.h"
 #include "sp-text.h"
diff --git a/src/splivarot.cpp b/src/splivarot.cpp
index d057f0ec5..1bc6da3e1 100644
--- a/src/splivarot.cpp
+++ b/src/splivarot.cpp
@@ -13,6 +13,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
+# include <config.h>
 #endif
 
 #include <cstring>
@@ -22,11 +23,14 @@
 #include "xml/repr.h"
 #include "svg/svg.h"
 #include "sp-path.h"
+#include "sp-shape.h"
 #include "sp-image.h"
 #include "sp-marker.h"
+#include "enums.h"
 #include "sp-text.h"
 #include "sp-flowtext.h"
 #include "text-editing.h"
+#include "sp-item-group.h"
 #include "style.h"
 #include "document.h"
 #include "document-undo.h"
@@ -35,9 +39,14 @@
 #include "selection.h"
 
 #include "desktop.h"
+#include "display/canvas-bpath.h"
+#include "display/curve.h"
 #include <glibmm/i18n.h>
+#include "preferences.h"
 
+#include "xml/repr.h"
 #include "xml/repr-sorting.h"
+#include <2geom/pathvector.h>
 #include <2geom/svg-path-writer.h>
 #include "helper/geom.h"
 
diff --git a/src/style-internal.cpp b/src/style-internal.cpp
index 136a522f8..62b0de52d 100644
--- a/src/style-internal.cpp
+++ b/src/style-internal.cpp
@@ -23,14 +23,16 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include "style-internal.h"
+#include "style-enums.h"
 #include "style.h"
 
 #include "svg/svg.h"
 #include "svg/svg-color.h"
+#include "svg/svg-icc-color.h"
 
 #include "streq.h"
 #include "strneq.h"
@@ -40,6 +42,9 @@
 #include "svg/css-ostringstream.h"
 #include "util/units.h"
 
+#include <sigc++/functors/ptr_fun.h>
+#include <sigc++/adaptors/bind.h>
+
 #include <glibmm/regex.h>
 
 // TODO REMOVE OR MAKE MEMBER FUNCTIONS
diff --git a/src/style.cpp b/src/style.cpp
index e51733cf0..c24818f2a 100644
--- a/src/style.cpp
+++ b/src/style.cpp
@@ -20,7 +20,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <cstring>
@@ -31,19 +31,33 @@
 #include "xml/croco-node-iface.h"
 
 #include "svg/svg.h"
+#include "svg/svg-color.h"
+#include "svg/svg-icc-color.h"
 
 #include "display/canvas-bpath.h"
 #include "attributes.h"
 #include "document.h"
+#include "extract-uri.h"
 #include "uri-references.h"
 #include "uri.h"
 #include "sp-paint-server.h"
+#include "streq.h"
+#include "strneq.h"
 #include "style.h"
 #include "svg/css-ostringstream.h"
+#include "xml/repr.h"
 #include "xml/simple-document.h"
 #include "util/units.h"
+#include "macros.h"
 #include "preferences.h"
 
+#include "sp-filter-reference.h"
+
+#include <sigc++/functors/ptr_fun.h>
+#include <sigc++/adaptors/bind.h>
+
+#include <2geom/math-utils.h>
+
 #include <glibmm/regex.h>
 
 using Inkscape::CSSOStringStream;
diff --git a/src/style.h b/src/style.h
index fe5cb2704..0e8e34145 100644
--- a/src/style.h
+++ b/src/style.h
@@ -21,6 +21,7 @@
 #include "style-internal.h"
 
 #include <sigc++/connection.h>
+#include <iostream>
 #include <vector>
 
 // Define SPIBasePtr, a Pointer to a data member of SPStyle of type SPIBase;
diff --git a/src/svg/css-ostringstream.cpp b/src/svg/css-ostringstream.cpp
index ef0413372..33985443e 100644
--- a/src/svg/css-ostringstream.cpp
+++ b/src/svg/css-ostringstream.cpp
@@ -1,6 +1,7 @@
 #include "svg/css-ostringstream.h"
 #include "svg/strip-trailing-zeros.h"
 #include "preferences.h"
+#include <glib.h>
 
 Inkscape::CSSOStringStream::CSSOStringStream()
 {
diff --git a/src/svg/path-string.cpp b/src/svg/path-string.cpp
index 7d0092dfa..6dddeadff 100644
--- a/src/svg/path-string.cpp
+++ b/src/svg/path-string.cpp
@@ -17,6 +17,7 @@
 #include "svg/stringstream.h"
 #include "svg/svg.h"
 #include "preferences.h"
+#include <algorithm>
 
 // 1<=numericprecision<=16, doubles are only accurate upto (slightly less than) 16 digits (and less than one digit doesn't make sense)
 // Please note that these constants are used to allocate sufficient space to hold serialized numbers
diff --git a/src/svg/svg-affine.cpp b/src/svg/svg-affine.cpp
index 21635c79b..d9d79bba5 100644
--- a/src/svg/svg-affine.cpp
+++ b/src/svg/svg-affine.cpp
@@ -12,7 +12,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <cstring>
@@ -21,6 +21,7 @@
 #include <cstdio>
 #include <glib.h>
 #include <2geom/transforms.h>
+#include <2geom/angle.h>
 #include "svg.h"
 #include "preferences.h"
 
diff --git a/src/svg/svg-angle.cpp b/src/svg/svg-angle.cpp
index 9d4435a18..ed5ccd45e 100644
--- a/src/svg/svg-angle.cpp
+++ b/src/svg/svg-angle.cpp
@@ -13,13 +13,16 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <cstring>
 #include <string>
+#include <math.h>
 #include <glib.h>
 
+#include "svg.h"
+#include "stringstream.h"
 #include "svg/svg-angle.h"
 #include "util/units.h"
 
diff --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp
index 89a5636a8..693094048 100644
--- a/src/svg/svg-color.cpp
+++ b/src/svg/svg-color.cpp
@@ -19,6 +19,7 @@
 #include <cstdio> // sprintf
 #include <cstring>
 #include <string>
+#include <cassert>
 #include <math.h>
 #include <glib.h> // g_assert
 #include <errno.h>
diff --git a/src/svg/svg-path.cpp b/src/svg/svg-path.cpp
index 13795f2a3..7bb58fc9c 100644
--- a/src/svg/svg-path.cpp
+++ b/src/svg/svg-path.cpp
@@ -17,13 +17,17 @@
 
 #include <cstring>
 #include <string>
+#include <cassert>
 #include <glib.h> // g_assert()
 
 #include <2geom/pathvector.h>
+#include <2geom/path.h>
 #include <2geom/curves.h>
 #include <2geom/sbasis-to-bezier.h>
 #include <2geom/path-sink.h>
 #include <2geom/svg-path-parser.h>
+#include <2geom/exception.h>
+#include <2geom/angle.h>
 
 #include "svg/svg.h"
 #include "svg/path-string.h"
diff --git a/src/syseq.h b/src/syseq.h
index 43c3414c6..582f2949f 100644
--- a/src/syseq.h
+++ b/src/syseq.h
@@ -13,6 +13,7 @@
  */
 
 #include <algorithm>
+#include <iostream>
 #include <iomanip>
 #include <vector>
 #include "math.h"
diff --git a/src/text-chemistry.cpp b/src/text-chemistry.cpp
index ddadf8275..fbbbe5807 100644
--- a/src/text-chemistry.cpp
+++ b/src/text-chemistry.cpp
@@ -12,7 +12,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <cstring>
@@ -27,6 +27,7 @@
 #include "document.h"
 #include "document-undo.h"
 #include "message-stack.h"
+#include "selection.h"
 #include "style.h"
 
 #include "text-editing.h"
diff --git a/src/text-editing.cpp b/src/text-editing.cpp
index 6669abcef..057523b1e 100644
--- a/src/text-editing.cpp
+++ b/src/text-editing.cpp
@@ -13,6 +13,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
+# include "config.h"
 #endif
 
 #include <cstring>
@@ -26,6 +27,7 @@
 #include "util/units.h"
 
 #include "document.h"
+#include "xml/repr.h"
 #include "xml/attribute-record.h"
 #include "xml/sp-css-attr.h"
 
diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index 09ba9a1a9..d581dbf7e 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -27,6 +27,9 @@
 // TODO: reduce header bloat if possible
 
 #include "file.h" // for file_import, used in _pasteImage
+#include <list>
+#include <algorithm>
+#include <glibmm/ustring.h>
 #include <glibmm/i18n.h>
 #include <glib/gstdio.h> // for g_file_set_contents etc., used in _onGet and paste
 #include "inkgc/gc-core.h"
@@ -38,6 +41,7 @@
 #include "desktop-style.h" // for sp_desktop_set_style, used in _pasteStyle
 #include "document.h"
 #include "document-private.h"
+#include "selection.h"
 #include "message-stack.h"
 #include "context-fns.h"
 #include "ui/tools/dropper-tool.h" // used in copy()
@@ -46,13 +50,17 @@
 #include "extension/input.h"
 #include "extension/output.h"
 #include "selection-chemistry.h"
+#include <2geom/rect.h>
 #include <2geom/transforms.h>
 #include "box3d.h"
 #include "gradient-drag.h"
 #include "sp-marker.h"
+#include "sp-item.h"
 #include "sp-item-transform.h" // for sp_item_scale_rel, used in _pasteSize
 #include "sp-path.h"
 #include "sp-pattern.h"
+#include "sp-shape.h"
+#include "sp-gradient.h"
 #include "sp-gradient-reference.h"
 #include "sp-linear-gradient.h"
 #include "sp-radial-gradient.h"
@@ -60,6 +68,8 @@
 #include "sp-mask.h"
 #include "sp-textpath.h"
 #include "sp-rect.h"
+#include "sp-use.h"
+#include "sp-symbol.h"
 #include "live_effects/lpeobject.h"
 #include "live_effects/lpeobject-reference.h"
 #include "live_effects/parameter/path.h"
@@ -73,7 +83,9 @@
 #include "helper/png-write.h"
 #include "svg/svg-color.h"
 #include "sp-namedview.h"
+#include "snap.h"
 #include "persp3d.h"
+#include "preferences.h"
 
 /// Made up mimetype to represent Gdk::Pixbuf clipboard contents.
 #define CLIPBOARD_GDK_PIXBUF_TARGET "image/x-gdk-pixbuf"
diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp
index 973625574..a2c977533 100644
--- a/src/ui/control-manager.cpp
+++ b/src/ui/control-manager.cpp
@@ -17,6 +17,7 @@
 #include <glib-object.h>
 
 #include "display/sodipodi-ctrl.h" // for SP_TYPE_CTRL
+#include "display/sp-canvas-item.h"
 #include "display/sp-ctrlline.h"
 #include "display/sp-ctrlcurve.h"
 #include "preferences.h"
diff --git a/src/ui/dialog-events.cpp b/src/ui/dialog-events.cpp
index d7d56fa50..8856631c0 100644
--- a/src/ui/dialog-events.cpp
+++ b/src/ui/dialog-events.cpp
@@ -12,14 +12,17 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <gtkmm/entry.h>
 #include <gtkmm/window.h>
+#include <gdk/gdkkeysyms.h>
 #include "macros.h"
+#include <gtk/gtk.h>
 #include "desktop.h"
 #include "inkscape.h"
+#include "preferences.h"
 #include "ui/tools/tool-base.h"
 
 #include "ui/dialog-events.h"
diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index f269d1cb9..8f87932b8 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -18,7 +18,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
 #endif
 
 #include "align-and-distribute.h"
@@ -27,10 +27,13 @@
 
 #include "unclump.h"
 #include "document.h"
+#include "enums.h"
 #include "graphlayout.h"
 #include "inkscape.h"
+#include "macros.h"
 #include "preferences.h"
 #include "removeoverlap.h"
+#include "selection.h"
 #include "sp-flowtext.h"
 #include "sp-item-transform.h"
 #include "sp-text.h"
diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index bdb826384..b727c87ee 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -15,11 +15,13 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "clonetiler.h"
 
+#include <climits>
+
 #include <glibmm/i18n.h>
 #include <2geom/transforms.h>
 #include <gtkmm/adjustment.h>
@@ -29,15 +31,23 @@
 #include "display/cairo-utils.h"
 #include "display/drawing.h"
 #include "display/drawing-context.h"
+#include "display/drawing-item.h"
 #include "document.h"
 #include "document-undo.h"
 #include "filter-chemistry.h"
 #include "ui/widget/unit-menu.h"
+#include "util/units.h"
 #include "helper/window.h"
 #include "inkscape.h"
 #include "ui/interface.h"
+#include "macros.h"
 #include "message-stack.h"
+#include "preferences.h"
+#include "selection.h"
+#include "sp-filter.h"
 #include "sp-namedview.h"
+#include "sp-use.h"
+#include "style.h"
 #include "svg/svg-color.h"
 #include "svg/svg.h"
 #include "ui/icon-names.h"
@@ -45,6 +55,8 @@
 #include "unclump.h"
 #include "verbs.h"
 #include "widgets/icon.h"
+#include "xml/repr.h"
+#include "sp-root.h"
 
 using Inkscape::DocumentUndo;
 using Inkscape::Util::unit_table;
diff --git a/src/ui/dialog/color-item.cpp b/src/ui/dialog/color-item.cpp
index df4ab6485..34cdb92e3 100644
--- a/src/ui/dialog/color-item.cpp
+++ b/src/ui/dialog/color-item.cpp
@@ -12,13 +12,15 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <errno.h>
 
 #include <gtkmm/label.h>
 #include <glibmm/i18n.h>
+#include <cairo.h>
+#include <gtk/gtk.h>
 
 #include "color-item.h"
 
@@ -32,10 +34,16 @@
 #include "io/resource.h"
 #include "io/sys.h"
 #include "message-context.h"
+#include "sp-gradient.h"
+#include "sp-item.h"
 #include "svg/svg-color.h"
+#include "xml/node.h"
+#include "xml/repr.h"
 #include "verbs.h"
 #include "widgets/gradient-vector.h"
 
+#include "color.h" // for SP_RGBA32_U_COMPOSE
+
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/debug.cpp b/src/ui/dialog/debug.cpp
index d5ce6a160..d127261c0 100644
--- a/src/ui/dialog/debug.cpp
+++ b/src/ui/dialog/debug.cpp
@@ -10,12 +10,13 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
 #endif
 
 #include <gtkmm/box.h>
 #include <gtkmm/dialog.h>
 #include <gtkmm/textview.h>
+#include <gtkmm/button.h>
 #include <gtkmm/menubar.h>
 #include <gtkmm/scrolledwindow.h>
 #include <glibmm/i18n.h>
diff --git a/src/ui/dialog/desktop-tracker.cpp b/src/ui/dialog/desktop-tracker.cpp
index c18711a55..0659de67b 100644
--- a/src/ui/dialog/desktop-tracker.cpp
+++ b/src/ui/dialog/desktop-tracker.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "widgets/desktop-widget.h"
+#include <glib-object.h>
 
 #include "desktop-tracker.h"
 
diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp
index c53112656..49853277c 100644
--- a/src/ui/dialog/dialog-manager.cpp
+++ b/src/ui/dialog/dialog-manager.cpp
@@ -14,7 +14,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
 #endif
 
 #include "ui/dialog/dialog-manager.h"
@@ -45,8 +45,11 @@
 #include "ui/dialog/panel-dialog.h"
 #include "ui/dialog/layers.h"
 #include "ui/dialog/icon-preview.h"
+#include "ui/dialog/floating-behavior.h"
+#include "ui/dialog/dock-behavior.h"
 //#include "ui/dialog/print-colors-preview-dialog.h"
 #include "util/ege-appear-time-tracker.h"
+#include "preferences.h"
 #include "ui/dialog/object-attributes.h"
 #include "ui/dialog/object-properties.h"
 #include "ui/dialog/text-edit.h"
diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp
index d0b618c65..27d88bae7 100644
--- a/src/ui/dialog/dialog.cpp
+++ b/src/ui/dialog/dialog.cpp
@@ -14,7 +14,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
 #endif
 
 #include "dialog-manager.h"
@@ -27,10 +27,13 @@
 #include "desktop.h"
 
 #include "shortcuts.h"
+#include "preferences.h"
 #include "ui/interface.h"
 #include "verbs.h"
 #include "ui/tool/event-utils.h"
 
+#include <gtk/gtk.h>
+
 #define MIN_ONSCREEN_DISTANCE 50
 
 
diff --git a/src/ui/dialog/dock-behavior.cpp b/src/ui/dialog/dock-behavior.cpp
index ec630c08f..50a6db208 100644
--- a/src/ui/dialog/dock-behavior.cpp
+++ b/src/ui/dialog/dock-behavior.cpp
@@ -12,7 +12,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
 #endif
 
 #include "dock-behavior.h"
@@ -23,11 +23,15 @@
 #include "ui/widget/dock.h"
 #include "verbs.h"
 #include "dialog.h"
+#include "preferences.h"
 #include "ui/dialog-events.h"
 
 #include <gtkmm/invisible.h>
+#include <gtkmm/label.h>
 #include <gtkmm/stock.h>
 
+#include <gtk/gtk.h>
+
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
diff --git a/src/ui/dialog/document-metadata.cpp b/src/ui/dialog/document-metadata.cpp
index 40495456b..da1facc08 100644
--- a/src/ui/dialog/document-metadata.cpp
+++ b/src/ui/dialog/document-metadata.cpp
@@ -15,12 +15,13 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
 #endif
 
 #include "document-metadata.h"
 #include "desktop.h"
 
+#include "inkscape.h"
 #include "rdf.h"
 #include "sp-namedview.h"
 #include "ui/widget/entity-entry.h"
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index b2c6c6d9f..589973162 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -25,17 +25,27 @@
 #include "ui/widget/notebook-page.h"
 #include "document-properties.h"
 #include "display/canvas-grid.h"
+#include "document.h"
 
+#include "desktop.h"
+#include "inkscape.h"
 #include "io/sys.h"
+#include "preferences.h"
 #include "ui/shape-editor.h"
+#include "sp-namedview.h"
 #include "sp-root.h"
 #include "sp-script.h"
 #include "style.h"
+#include "svg/stringstream.h"
 #include "ui/tools-switch.h"
+#include "ui/widget/color-picker.h"
+#include "ui/widget/scalar-unit.h"
 #include "ui/dialog/filedialog.h"
 #include "verbs.h"
 #include "widgets/icon.h"
 #include "xml/node-event-vector.h"
+#include "xml/repr.h"
+#include <algorithm>    // std::min
 
 #include "rdf.h"
 #include "ui/widget/entity-entry.h"
@@ -44,8 +54,11 @@
 #include "color-profile.h"
 #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
 
+#include <gtkmm/imagemenuitem.h>
 #include <gtkmm/stock.h>
+#include <gtkmm/table.h>
 
+#include <2geom/transforms.h>
 #include "ui/icon-names.h"
 
 using std::pair;
diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp
index 2e78be8ac..2fb5f9e3b 100644
--- a/src/ui/dialog/export.cpp
+++ b/src/ui/dialog/export.cpp
@@ -24,28 +24,37 @@
 #include <gtkmm/buttonbox.h>
 #include <gtkmm/dialog.h>
 #include <gtkmm/entry.h>
+#include <gtkmm/image.h>
+#include <gtkmm/label.h>
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/stock.h>
-
+#include <gtkmm/stockid.h>
 #if WITH_GTKMM_3_0
 # include <gtkmm/grid.h>
 #else
 # include <gtkmm/table.h>
 #endif
+#include <gtkmm/togglebutton.h>
+#include <gtkmm/widget.h>
 
 #ifdef WITH_GNOME_VFS
 # include <libgnomevfs/gnome-vfs-init.h>  // gnome_vfs_initialized
 #endif
 
 #include <glibmm/i18n.h>
+#include <glibmm/miscutils.h>
 
 #include "ui/widget/unit-menu.h"
+#include "util/units.h"
 #include "helper/window.h"
 #include "inkscape.h"
 #include "document.h"
 #include "document-undo.h"
 
+#include "sp-item.h"
+#include "selection.h"
 #include "file.h"
+#include "macros.h"
 #include "sp-namedview.h"
 #include "selection-chemistry.h"
 
@@ -80,12 +89,17 @@
 #include <glibmm/fileutils.h>
 #endif
 
+#include <gtk/gtk.h>
+
 #define SP_EXPORT_MIN_SIZE 1.0
 
 #define DPI_BASE Inkscape::Util::Quantity::convert(1, "in", "px")
 
 #define EXPORT_COORD_PRECISION 3
 
+#include "../../document.h"
+#include "../../document-undo.h"
+#include "verbs.h"
 #include "export.h"
 
 using Inkscape::Util::unit_table;
diff --git a/src/ui/dialog/extension-editor.cpp b/src/ui/dialog/extension-editor.cpp
index 84840f22d..9bdddc0e0 100644
--- a/src/ui/dialog/extension-editor.cpp
+++ b/src/ui/dialog/extension-editor.cpp
@@ -12,13 +12,14 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
 #endif
 
 #include "extension-editor.h"
 #include <glibmm/i18n.h>
 
 #include <gtkmm/frame.h>
+#include <gtkmm/scrolledwindow.h>
 #include <gtkmm/alignment.h>
 #include <gtkmm/notebook.h>
 
@@ -26,6 +27,7 @@
 #include "preferences.h"
 #include "ui/interface.h"
 
+#include "extension/extension.h"
 #include "extension/db.h"
 
 namespace Inkscape {
diff --git a/src/ui/dialog/filedialog.cpp b/src/ui/dialog/filedialog.cpp
index ee673aecf..4e4b0278a 100644
--- a/src/ui/dialog/filedialog.cpp
+++ b/src/ui/dialog/filedialog.cpp
@@ -17,9 +17,14 @@
 
 #include "filedialogimpl-win32.h"
 #include "filedialogimpl-gtkmm.h"
+#include "filedialog.h"
 
+#include "inkgc/gc-core.h"
 #include "ui/dialog-events.h"
 #include "extension/output.h"
+#include "preferences.h"
+
+#include <glibmm/convert.h>
 
 namespace Inkscape
 {
diff --git a/src/ui/dialog/fill-and-stroke.cpp b/src/ui/dialog/fill-and-stroke.cpp
index fa69851e4..8141f7696 100644
--- a/src/ui/dialog/fill-and-stroke.cpp
+++ b/src/ui/dialog/fill-and-stroke.cpp
@@ -22,6 +22,7 @@
 #include "fill-and-stroke.h"
 #include "filter-chemistry.h"
 #include "inkscape.h"
+#include "selection.h"
 #include "preferences.h"
 #include "style.h"
 #include "svg/css-ostringstream.h"
@@ -31,9 +32,12 @@
 #include "widgets/icon.h"
 #include "widgets/paint-selector.h"
 #include "widgets/stroke-style.h"
+#include "xml/repr.h"
 
 #include "ui/view/view-widget.h"
 
+#include <gtkmm/table.h>
+
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index e733d1b72..d3ad5d1da 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -16,7 +16,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
 #endif
 
 #include "dialog-manager.h"
@@ -28,36 +28,57 @@
 
 #include "ui/widget/spinbutton.h"
 
+#include <glibmm/convert.h>
 #include <glibmm/i18n.h>
+#include <glibmm/main.h>
+#include <glibmm/stringutils.h>
 
 #include "desktop.h"
 
+#include "dir-util.h"
 #include "document.h"
 #include "document-undo.h"
 #include "filter-chemistry.h"
 #include "filter-effects-dialog.h"
 #include "filter-enums.h"
 #include "inkscape.h"
+#include "path-prefix.h"
+#include "preferences.h"
+#include "selection.h"
 #include "filters/blend.h"
 #include "filters/colormatrix.h"
 #include "filters/componenttransfer.h"
 #include "filters/componenttransfer-funcnode.h"
+#include "filters/composite.h"
 #include "filters/convolvematrix.h"
+#include "filters/displacementmap.h"
 #include "filters/distantlight.h"
+#include "filters/gaussian-blur.h"
 #include "filters/merge.h"
 #include "filters/mergenode.h"
+#include "filters/offset.h"
 #include "filters/pointlight.h"
 #include "filters/spotlight.h"
+#include "sp-filter-primitive.h"
 
 #include "style.h"
 #include "svg/svg-color.h"
+#include "svg/stringstream.h"
 #include "ui/dialog/filedialog.h"
 #include "verbs.h"
+#include "xml/node.h"
+#include "xml/node-observer.h"
+#include "xml/repr.h"
+#include <sstream>
 
 #include "io/sys.h"
+#include <iostream>
 #include "selection-chemistry.h"
 
+#include <gtkmm/checkbutton.h>
 #include <gtkmm/colorbutton.h>
+#include <gtkmm/paned.h>
+#include <gtkmm/scrolledwindow.h>
 #include <gtkmm/stock.h>
 #include <gdkmm/general.h>
 
diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp
index aa26342df..0f368c5ac 100644
--- a/src/ui/dialog/find.cpp
+++ b/src/ui/dialog/find.cpp
@@ -11,25 +11,30 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
 #endif
 
 #include "find.h"
 
 #include <gtkmm/entry.h>
+#include <gtkmm/widget.h>
 
 #include "verbs.h"
 
 #include "message-stack.h"
 #include "helper/window.h"
+#include "macros.h"
 #include "inkscape.h"
 #include "desktop.h"
 #include "document.h"
 #include "document-undo.h"
+#include "selection.h"
 
 
 #include "ui/dialog-events.h"
+#include "verbs.h"
 #include "ui/interface.h"
+#include "preferences.h"
 #include "sp-text.h"
 #include "sp-flowtext.h"
 #include "sp-flowdiv.h"
@@ -46,13 +51,16 @@
 #include "sp-line.h"
 #include "sp-polyline.h"
 #include "sp-item-group.h"
+#include "sp-use.h"
 #include "sp-image.h"
 #include "sp-offset.h"
 #include "sp-root.h"
+#include "xml/repr.h"
 #include "xml/node-iterators.h"
 #include "xml/attribute-record.h"
 
 #include <glibmm/i18n.h>
+#include <glibmm/regex.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/floating-behavior.cpp b/src/ui/dialog/floating-behavior.cpp
index 2a4a6c028..55ef0c5bb 100644
--- a/src/ui/dialog/floating-behavior.cpp
+++ b/src/ui/dialog/floating-behavior.cpp
@@ -11,11 +11,13 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <gtkmm/dialog.h>
 #include <gtkmm/stock.h>
+#include <glibmm/main.h>
+#include <gtk/gtk.h>
 
 #include "floating-behavior.h"
 #include "dialog.h"
@@ -24,6 +26,7 @@
 #include "desktop.h"
 #include "ui/dialog-events.h"
 #include "ui/interface.h"
+#include "preferences.h"
 #include "verbs.h"
 
 namespace Inkscape {
diff --git a/src/ui/dialog/font-substitution.cpp b/src/ui/dialog/font-substitution.cpp
index 0a96188ca..f219f3db6 100644
--- a/src/ui/dialog/font-substitution.cpp
+++ b/src/ui/dialog/font-substitution.cpp
@@ -7,7 +7,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
 #endif
 
 #include <gtkmm/messagedialog.h>
@@ -21,11 +21,16 @@
 #include "inkscape.h"
 #include "desktop.h"
 #include "document.h"
+#include "selection.h"
 
 #include "ui/dialog-events.h"
 
 #include "selection-chemistry.h"
+#include "preferences.h"
 
+#include "xml/repr.h"
+
+#include "sp-defs.h"
 #include "sp-root.h"
 #include "sp-text.h"
 #include "sp-textpath.h"
@@ -40,6 +45,7 @@
 #include "libnrtype/font-instance.h"
 
 #include <glibmm/i18n.h>
+#include <glibmm/regex.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/glyphs.cpp b/src/ui/dialog/glyphs.cpp
index 7ce3eabfc..56b001291 100644
--- a/src/ui/dialog/glyphs.cpp
+++ b/src/ui/dialog/glyphs.cpp
@@ -14,7 +14,9 @@
 #include <glibmm/i18n.h>
 #include <gtkmm/alignment.h>
 #include <gtkmm/comboboxtext.h>
+#include <gtkmm/entry.h>
 #include <gtkmm/iconview.h>
+#include <gtkmm/label.h>
 #include <gtkmm/liststore.h>
 #include <gtkmm/scrolledwindow.h>
 
@@ -24,6 +26,9 @@
 # include <gtkmm/table.h>
 #endif
 
+#include <gtkmm/treemodelcolumn.h>
+#include <gtkmm/widget.h>
+
 #include "desktop.h"
 #include "document.h" // for SPDocumentUndo::done()
 #include "document-undo.h"
diff --git a/src/ui/dialog/grid-arrange-tab.cpp b/src/ui/dialog/grid-arrange-tab.cpp
index 8d83814b4..639e463ea 100644
--- a/src/ui/dialog/grid-arrange-tab.cpp
+++ b/src/ui/dialog/grid-arrange-tab.cpp
@@ -16,12 +16,14 @@
 //#define DEBUG_GRID_ARRANGE 1
 
 #include "ui/dialog/grid-arrange-tab.h"
+#include <gtk/gtk.h> //for GTK_RESPONSE* types
 #include <glibmm/i18n.h>
 #include <gtkmm/stock.h>
 
 #if WITH_GTKMM_3_0
 # include <gtkmm/grid.h>
 #else
+# include <gtkmm/table.h>
 #endif
 
 #include <2geom/transforms.h>
@@ -30,8 +32,10 @@
 #include "preferences.h"
 #include "inkscape.h"
 
+#include "selection.h"
 #include "document.h"
 #include "document-undo.h"
+#include "sp-item.h"
 #include "widgets/icon.h"
 #include "desktop.h"
 //#include "sp-item-transform.h" FIXME
diff --git a/src/ui/dialog/guides.cpp b/src/ui/dialog/guides.cpp
index 469bd5155..556d77a28 100644
--- a/src/ui/dialog/guides.cpp
+++ b/src/ui/dialog/guides.cpp
@@ -14,7 +14,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
 #endif
 #include "guides.h"
 
@@ -30,8 +30,12 @@
 #include <glibmm/i18n.h>
 #include "ui/dialog-events.h"
 #include "message-context.h"
+#include "xml/repr.h"
 #include "verbs.h"
 
+#include <2geom/point.h>
+#include <2geom/angle.h>
+
 #include <gtkmm/stock.h>
 
 namespace Inkscape {
diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index 8709a5855..83656a1f2 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -14,13 +14,15 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
 #endif
 
 #include <gtkmm/buttonbox.h>
 #include <boost/scoped_ptr.hpp>
 
 #include <glibmm/i18n.h>
+#include <glibmm/main.h>
+#include <glibmm/timer.h>
 
 #include <gtkmm/alignment.h>
 #include <gtkmm/checkbutton.h>
@@ -33,7 +35,10 @@
 #include "display/drawing.h"
 #include "document.h"
 #include "inkscape.h"
+#include "preferences.h"
+#include "selection.h"
 #include "sp-root.h"
+#include "xml/repr.h"
 #include "verbs.h"
 
 #include "icon-preview.h"
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index d53e3dd73..6dd62d3bb 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -19,20 +19,30 @@
 
 #include "inkscape-preferences.h"
 #include <glibmm/i18n.h>
+#include <glibmm/markup.h>
+#include <glibmm/miscutils.h>
 #include <gtkmm/main.h>
+#include <gtkmm/frame.h>
+#include <gtkmm/scrolledwindow.h>
 #include <gtkmm/alignment.h>
 
 #include "preferences.h"
 #include "verbs.h"
 #include "selcue.h"
+#include "util/units.h"
+#include <iostream>
+#include "enums.h"
 
 #include "extension/internal/gdkpixbuf-input.h"
 #include "message-stack.h"
 #include "style.h"
 #include "selection.h"
 #include "selection-chemistry.h"
+#include "xml/repr.h"
 #include "ui/widget/style-swatch.h"
+#include "ui/widget/spinbutton.h"
 #include "display/nr-filter-gaussian.h"
+#include "display/nr-filter-types.h"
 #include "cms-system.h"
 #include "color-profile.h"
 #include "display/canvas-grid.h"
diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h
index ea8ccf8fb..d1abcfc58 100644
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -19,6 +19,7 @@
 # include "config.h"
 #endif
 
+#include <iostream>
 #include <vector>
 #include "ui/widget/preferences-widget.h"
 #include "ui/widget/button.h"
diff --git a/src/ui/dialog/input.cpp b/src/ui/dialog/input.cpp
index 1bfb59ae5..8343cd6fe 100644
--- a/src/ui/dialog/input.cpp
+++ b/src/ui/dialog/input.cpp
@@ -15,12 +15,18 @@
 #include "ui/widget/panel.h"
 #include "ui/widget/frame.h"
 
+#include <glib/gprintf.h>
 #include <glibmm/i18n.h>
 
+#include <gtkmm/alignment.h>
 #include <gtkmm/buttonbox.h>
 #include <gtkmm/cellrenderercombo.h>
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/comboboxtext.h>
+#include <gtkmm/enums.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/frame.h>
+#include <gtkmm/image.h>
 #include <gtkmm/liststore.h>
 #include <gtkmm/menubar.h>
 #include <gtkmm/notebook.h>
@@ -34,7 +40,10 @@
 # include <gtkmm/table.h>
 #endif
 
+#include <gtkmm/treemodel.h>
+#include <gtkmm/treemodelcolumn.h>
 #include <gtkmm/treestore.h>
+#include <gtkmm/treeview.h>
 
 #include "device-manager.h"
 #include "preferences.h"
diff --git a/src/ui/dialog/knot-properties.cpp b/src/ui/dialog/knot-properties.cpp
index 133ed6f4c..a91a09a4f 100644
--- a/src/ui/dialog/knot-properties.cpp
+++ b/src/ui/dialog/knot-properties.cpp
@@ -14,10 +14,12 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
 #endif
 #include "ui/dialog/knot-properties.h"
 #include <boost/lexical_cast.hpp>
+#include <gtkmm/stock.h>
+#include <glibmm/main.h>
 #include <glibmm/i18n.h>
 #include "inkscape.h"
 #include "util/units.h"
@@ -25,8 +27,15 @@
 #include "document.h"
 #include "document-undo.h"
 #include "layer-manager.h"
+#include "message-stack.h"
 
+#include "sp-object.h"
+#include "sp-item.h"
+#include "verbs.h"
+#include "selection.h"
 #include "selection-chemistry.h"
+#include "ui/icon-names.h"
+#include "ui/widget/imagetoggler.h"
 
 //#include "event-context.h"
 
diff --git a/src/ui/dialog/layer-properties.cpp b/src/ui/dialog/layer-properties.cpp
index 9af91eb92..5d550ed48 100644
--- a/src/ui/dialog/layer-properties.cpp
+++ b/src/ui/dialog/layer-properties.cpp
@@ -15,6 +15,7 @@
 
 #include "layer-properties.h"
 #include <gtkmm/stock.h>
+#include <glibmm/main.h>
 #include <glibmm/i18n.h>
 #include "inkscape.h"
 #include "desktop.h"
@@ -23,7 +24,10 @@
 #include "layer-manager.h"
 #include "message-stack.h"
 
+#include "sp-object.h"
+#include "sp-item.h"
 #include "verbs.h"
+#include "selection.h"
 #include "selection-chemistry.h"
 #include "ui/icon-names.h"
 #include "ui/widget/imagetoggler.h"
diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index ce4fbeedc..1c022ecad 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -10,25 +10,36 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
 #endif
 
 #include "layers.h"
+#include <gtkmm/widget.h>
 #include <gtkmm/icontheme.h>
+#include <gtkmm/imagemenuitem.h>
+#include <gtkmm/separatormenuitem.h>
+
+#include <glibmm/i18n.h>
+#include <glibmm/main.h>
 
 #include "desktop.h"
 #include "desktop-style.h"
 #include "document.h"
 #include "document-undo.h"
 #include "helper/action.h"
+#include "helper/action-context.h"
 #include "inkscape.h"
 #include "layer-fns.h"
 #include "layer-manager.h"
+#include "preferences.h"
+#include "sp-item.h"
+#include "sp-object.h"
 #include "svg/css-ostringstream.h"
 #include "ui/icon-names.h"
 #include "ui/widget/imagetoggler.h"
 #include "verbs.h"
 #include "widgets/icon.h"
+#include "xml/repr.h"
 #include "sp-root.h"
 #include "ui/tools/tool-base.h"
 #include "selection-chemistry.h"
diff --git a/src/ui/dialog/livepatheffect-add.cpp b/src/ui/dialog/livepatheffect-add.cpp
index 3602b04df..c558eddaf 100644
--- a/src/ui/dialog/livepatheffect-add.cpp
+++ b/src/ui/dialog/livepatheffect-add.cpp
@@ -9,7 +9,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
 #endif
 
 #include "livepatheffect-add.h"
@@ -17,6 +17,7 @@
 #include <gtkmm/stock.h>
 
 #include "desktop.h"
+#include "live_effects/effect-enum.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp
index ac64143f1..422ec10ae 100644
--- a/src/ui/dialog/livepatheffect-editor.cpp
+++ b/src/ui/dialog/livepatheffect-editor.cpp
@@ -13,16 +13,20 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
 #endif
 
 #include "livepatheffect-editor.h"
+#include <glibmm/i18n.h>
 #include <gtkmm/stock.h>
+#include <gtkmm/toolbar.h>
+#include <vector>
 
 #include "desktop.h"
 
 #include "document.h"
 #include "document-undo.h"
+#include "gtkmm/widget.h"
 #include "helper/action.h"
 #include "inkscape.h"
 #include "live_effects/effect.h"
@@ -30,14 +34,19 @@
 #include "live_effects/lpeobject-reference.h"
 #include "path-chemistry.h"
 #include "selection-chemistry.h"
+#include "selection.h"
 #include "sp-item-group.h"
+#include "sp-lpe-item.h"
 #include "sp-path.h"
 #include "sp-rect.h"
+#include "sp-use.h"
 #include "sp-text.h"
+#include "sp-shape.h"
 #include "ui/icon-names.h"
 #include "ui/widget/imagetoggler.h"
 #include "verbs.h"
 #include "widgets/icon.h"
+#include "xml/node.h"
 #include "livepatheffect-add.h"
 
 namespace Inkscape {
diff --git a/src/ui/dialog/lpe-fillet-chamfer-properties.cpp b/src/ui/dialog/lpe-fillet-chamfer-properties.cpp
index d33ee758d..b0cc91868 100644
--- a/src/ui/dialog/lpe-fillet-chamfer-properties.cpp
+++ b/src/ui/dialog/lpe-fillet-chamfer-properties.cpp
@@ -5,20 +5,30 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <gtkmm.h>
 #include "lpe-fillet-chamfer-properties.h"
 #include <boost/lexical_cast.hpp>
+#include <glibmm/main.h>
 #include <glibmm/i18n.h>
 #include "inkscape.h"
 #include "desktop.h"
+#include "document.h"
 #include "document-undo.h"
 #include "layer-manager.h"
 #include "message-stack.h"
 
+#include "sp-object.h"
+#include "sp-item.h"
+#include "verbs.h"
+#include "selection.h"
 #include "selection-chemistry.h"
+#include "ui/icon-names.h"
+#include "ui/widget/imagetoggler.h"
+#include "live_effects/parameter/parameter.h"
+#include <cmath>
 
 //#include "event-context.h"
 
diff --git a/src/ui/dialog/lpe-powerstroke-properties.cpp b/src/ui/dialog/lpe-powerstroke-properties.cpp
index d5b3bb30d..a6dcce907 100644
--- a/src/ui/dialog/lpe-powerstroke-properties.cpp
+++ b/src/ui/dialog/lpe-powerstroke-properties.cpp
@@ -14,18 +14,29 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
 #endif
 
 #include "lpe-powerstroke-properties.h"
 #include <boost/lexical_cast.hpp>
+#include <gtkmm/stock.h>
+#include <glibmm/main.h>
 #include <glibmm/i18n.h>
 #include "inkscape.h"
 #include "desktop.h"
+#include "document.h"
 #include "document-undo.h"
 #include "layer-manager.h"
+#include "message-stack.h"
 
+#include "sp-object.h"
+#include "sp-item.h"
+#include "verbs.h"
+#include "selection.h"
 #include "selection-chemistry.h"
+#include "ui/icon-names.h"
+#include "ui/widget/imagetoggler.h"
+#include "live_effects/parameter/parameter.h"
 //#include "event-context.h"
 
 namespace Inkscape {
diff --git a/src/ui/dialog/memory.cpp b/src/ui/dialog/memory.cpp
index f2813d4ce..c0bc884fa 100644
--- a/src/ui/dialog/memory.cpp
+++ b/src/ui/dialog/memory.cpp
@@ -11,10 +11,11 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
 #endif
 
 #include "ui/dialog/memory.h"
+#include <glibmm/main.h>
 #include <glibmm/i18n.h>
 #include <gtkmm/liststore.h>
 #include <gtkmm/treeview.h>
diff --git a/src/ui/dialog/messages.cpp b/src/ui/dialog/messages.cpp
index 3a8e7338d..df02215fe 100644
--- a/src/ui/dialog/messages.cpp
+++ b/src/ui/dialog/messages.cpp
@@ -11,7 +11,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
 #endif
 
 #include "messages.h"
diff --git a/src/ui/dialog/new-from-template.cpp b/src/ui/dialog/new-from-template.cpp
index 96fa72791..74ec7111e 100644
--- a/src/ui/dialog/new-from-template.cpp
+++ b/src/ui/dialog/new-from-template.cpp
@@ -9,13 +9,14 @@
  */
 
 #if HAVE_CONFIG_H
-#include "config.h"
+ #include "config.h"
 #endif
 
 #include "new-from-template.h"
 #include "file.h"
 
 #include <gtkmm/alignment.h>
+#include <glibmm/i18n.h>
 
 
 namespace Inkscape {
diff --git a/src/ui/dialog/object-attributes.cpp b/src/ui/dialog/object-attributes.cpp
index 72520d3d0..1bc570f43 100644
--- a/src/ui/dialog/object-attributes.cpp
+++ b/src/ui/dialog/object-attributes.cpp
@@ -23,12 +23,15 @@
 #include "ui/dialog/dialog-manager.h"
 #include "desktop.h"
 
+#include "macros.h"
 #include "sp-anchor.h"
 #include "sp-image.h"
 #include "verbs.h"
+#include "xml/repr.h"
 #include "ui/dialog/object-attributes.h"
 #include "widgets/sp-attribute-widget.h"
 #include "inkscape.h"
+#include "selection.h"
 #include <glibmm/i18n.h>
 
 namespace Inkscape {
diff --git a/src/ui/dialog/object-properties.cpp b/src/ui/dialog/object-properties.cpp
index 545c240fc..be46129c4 100644
--- a/src/ui/dialog/object-properties.cpp
+++ b/src/ui/dialog/object-properties.cpp
@@ -33,8 +33,11 @@
 #include "document-undo.h"
 #include "verbs.h"
 #include "inkscape.h"
+#include "selection.h"
 #include "desktop.h"
+#include "sp-item.h"
 #include "sp-image.h"
+#include "xml/repr.h"
 #include <glibmm/i18n.h>
 
 #if WITH_GTKMM_3_0
diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index 007c48b71..27694a9ac 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -10,13 +10,19 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
 #endif
 
 #include "objects.h"
+#include <gtkmm/widget.h>
 #include <gtkmm/icontheme.h>
+#include <gtkmm/imagemenuitem.h>
+#include <gtkmm/separatormenuitem.h>
 #include <gtkmm/stock.h>
 
+#include <glibmm/i18n.h>
+#include <glibmm/main.h>
+
 #include "desktop.h"
 #include "desktop-style.h"
 #include "ui/dialog-events.h"
@@ -28,8 +34,12 @@
 #include "helper/action.h"
 #include "inkscape.h"
 #include "layer-manager.h"
+#include "preferences.h"
+#include "selection.h"
 #include "sp-clippath.h"
 #include "sp-mask.h"
+#include "sp-item.h"
+#include "sp-object.h"
 #include "sp-root.h"
 #include "sp-shape.h"
 #include "style.h"
@@ -42,10 +52,13 @@
 #include "ui/widget/clipmaskicon.h"
 #include "ui/widget/highlight-picker.h"
 #include "ui/tools/node-tool.h"
+#include "ui/tools/tool-base.h"
 #include "verbs.h"
 #include "ui/widget/color-notebook.h"
 #include "widgets/icon.h"
+#include "xml/node.h"
 #include "xml/node-observer.h"
+#include "xml/repr.h"
 
 //#define DUMP_LAYERS 1
 
diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp
index e271f190e..f2ee79d06 100644
--- a/src/ui/dialog/ocaldialogs.cpp
+++ b/src/ui/dialog/ocaldialogs.cpp
@@ -18,10 +18,16 @@
 
 #include "ocaldialogs.h"
 
+#include <stdio.h>  // rename()
+#include <unistd.h> // close()
+#include <errno.h>  // errno
+#include <string.h> // strerror()
+
 #include "path-prefix.h"
 #include "filedialogimpl-gtkmm.h"
 #include "ui/interface.h"
 #include "inkgc/gc-core.h"
+#include "ui/dialog-events.h"
 #include "io/sys.h"
 #include "preferences.h"
 
@@ -31,7 +37,12 @@
 #include <gdkmm/general.h>
 #include <libxml/tree.h>
 
+#include <glibmm/convert.h>
+#include <glibmm/fileutils.h>
 #include <glibmm/i18n.h>
+#include <glibmm/main.h>
+#include <glibmm/markup.h>
+#include <glibmm/miscutils.h>
 #include "ui/icon-names.h"
 
 namespace Inkscape
diff --git a/src/ui/dialog/pixelartdialog.cpp b/src/ui/dialog/pixelartdialog.cpp
index 62e6bf591..f557ff0fc 100644
--- a/src/ui/dialog/pixelartdialog.cpp
+++ b/src/ui/dialog/pixelartdialog.cpp
@@ -31,6 +31,7 @@
 #include <gtkmm/stock.h>
 #include <gtkmm/messagedialog.h>
 
+#include <gtk/gtk.h> //for GTK_RESPONSE* types
 #include <glibmm/i18n.h>
 
 #include "ui/widget/spinbutton.h"
@@ -40,13 +41,18 @@
 #include "desktop-tracker.h"
 #include "message-stack.h"
 #include "selection.h"
+#include "preferences.h"
 
 #include "sp-image.h"
 #include "display/cairo-utils.h"
 #include "libdepixelize/kopftracer2011.h"
+#include <algorithm>
 #include "document.h"
+#include "xml/repr.h"
+#include "xml/document.h"
 #include "svg/svg.h"
 #include "svg/svg-color.h"
+#include "color.h"
 #include "svg/css-ostringstream.h"
 #include "document-undo.h"
 
diff --git a/src/ui/dialog/polar-arrange-tab.cpp b/src/ui/dialog/polar-arrange-tab.cpp
index da914dcd4..5ec1285c1 100644
--- a/src/ui/dialog/polar-arrange-tab.cpp
+++ b/src/ui/dialog/polar-arrange-tab.cpp
@@ -17,8 +17,10 @@
 #include "preferences.h"
 #include "inkscape.h"
 
+#include "selection.h"
 #include "document.h"
 #include "document-undo.h"
+#include "sp-item.h"
 #include "widgets/icon.h"
 #include "desktop.h"
 #include "sp-ellipse.h"
diff --git a/src/ui/dialog/print.cpp b/src/ui/dialog/print.cpp
index 9ebbf040c..c44d645a5 100644
--- a/src/ui/dialog/print.cpp
+++ b/src/ui/dialog/print.cpp
@@ -11,7 +11,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
 #endif
 
 #include <gtkmm.h>
@@ -26,6 +26,7 @@
 
 #include "extension/internal/cairo-render-context.h"
 #include "extension/internal/cairo-renderer.h"
+#include "ui/widget/rendering-options.h"
 #include "document.h"
 
 #include "util/units.h"
diff --git a/src/ui/dialog/spellcheck.cpp b/src/ui/dialog/spellcheck.cpp
index 61fa4c22b..6da8acb20 100644
--- a/src/ui/dialog/spellcheck.cpp
+++ b/src/ui/dialog/spellcheck.cpp
@@ -17,18 +17,25 @@
 #include "message-stack.h"
 
 #include "helper/window.h"
+#include "macros.h"
 #include "inkscape.h"
 #include "document.h"
+#include "selection.h"
 #include "desktop.h"
 
 #include "ui/tools-switch.h"
 #include "ui/tools/text-tool.h"
 #include "ui/interface.h"
+#include "preferences.h"
+#include "sp-text.h"
 #include "sp-flowtext.h"
 #include "text-editing.h"
+#include "sp-tspan.h"
 #include "sp-tref.h"
 #include "sp-defs.h"
 #include "selection-chemistry.h"
+#include <xml/repr.h>
+#include "display/canvas-bpath.h"
 #include "display/curve.h"
 #include "document-undo.h"
 #include "sp-root.h"
@@ -40,7 +47,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 
diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp
index c940931ed..08ebbcf14 100644
--- a/src/ui/dialog/svg-fonts-dialog.cpp
+++ b/src/ui/dialog/svg-fonts-dialog.cpp
@@ -12,18 +12,21 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
 #endif
 
 #include "svg-fonts-dialog.h"
 #include "document-private.h"
 #include "document-undo.h"
 #include <gtkmm/notebook.h>
+#include <gtkmm/imagemenuitem.h>
 #include <gtkmm/scale.h>
 #include <gtkmm/stock.h>
 #include <message-stack.h>
 #include "selection.h"
+#include <string.h>
 #include "svg/svg.h"
+#include "xml/node.h"
 #include "xml/repr.h"
 #include "sp-font-face.h"
 #include "desktop.h"
@@ -36,6 +39,7 @@
 #include "sp-glyph-kerning.h"
 
 #include <glibmm/i18n.h>
+#include <glibmm/stringutils.h>
 
 SvgFontDrawingArea::SvgFontDrawingArea():
     _x(0),
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index fdc8efe1b..6577c8d4e 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -22,6 +22,9 @@
 #include <gtkmm/radiomenuitem.h>
 
 #include <glibmm/i18n.h>
+#include <glibmm/main.h>
+#include <glibmm/timer.h>
+#include <gdkmm/pixbuf.h>
 
 #include "color-item.h"
 #include "desktop.h"
@@ -32,20 +35,28 @@
 #include "document-undo.h"
 #include "extension/db.h"
 #include "inkscape.h"
+#include "inkscape.h"
 #include "io/sys.h"
 #include "io/resource.h"
 #include "message-context.h"
 #include "path-prefix.h"
+#include "preferences.h"
+#include "sp-item.h"
+#include "sp-gradient.h"
+#include "sp-gradient-vector.h"
 #include "style.h"
 #include "ui/previewholder.h"
 #include "widgets/desktop-widget.h"
 #include "widgets/gradient-vector.h"
+#include "widgets/eek-preview.h"
 #include "display/cairo-utils.h"
 #include "sp-gradient-reference.h"
 #include "dialog-manager.h"
+#include "selection.h"
 #include "verbs.h"
 #include "gradient-chemistry.h"
 #include "helper/action.h"
+#include "helper/action-context.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp
index 8433073a6..06c17611f 100644
--- a/src/ui/dialog/symbols.cpp
+++ b/src/ui/dialog/symbols.cpp
@@ -15,6 +15,7 @@
 #include <iostream>
 #include <algorithm>
 #include <locale>
+#include <functional>
 #include <sstream>
 
 #include <gtkmm/buttonbox.h>
@@ -31,6 +32,10 @@
 #include <gtkmm/comboboxtext.h>
 #include <gtkmm/iconview.h>
 #include <gtkmm/liststore.h>
+#include <gtkmm/treemodelcolumn.h>
+#include <gtkmm/clipboard.h>
+#include <glibmm/stringutils.h>
+#include <glibmm/markup.h>
 #include <glibmm/i18n.h>
 #include "path-prefix.h"
 #include "io/sys.h"
@@ -71,6 +76,8 @@
 
 #include "verbs.h"
 #include "helper/action.h"
+#include "helper/action-context.h"
+#include "xml/repr.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/tags.cpp b/src/ui/dialog/tags.cpp
index d03c781f3..c99c1bff3 100644
--- a/src/ui/dialog/tags.cpp
+++ b/src/ui/dialog/tags.cpp
@@ -10,11 +10,17 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
 #endif
 
 #include "tags.h"
+#include <gtkmm/widget.h>
 #include <gtkmm/icontheme.h>
+#include <gtkmm/imagemenuitem.h>
+#include <gtkmm/separatormenuitem.h>
+
+#include <glibmm/main.h>
+#include <glibmm/i18n.h>
 
 #include "desktop.h"
 #include "desktop-style.h"
@@ -24,19 +30,28 @@
 #include "inkscape.h"
 #include "layer-fns.h"
 #include "layer-manager.h"
+#include "preferences.h"
+#include "sp-item.h"
+#include "sp-object.h"
 #include "sp-shape.h"
 #include "svg/css-ostringstream.h"
+#include "ui/icon-names.h"
 #include "ui/widget/layertypeicon.h"
 #include "ui/widget/addtoicon.h"
 #include "verbs.h"
 #include "widgets/icon.h"
+#include "xml/node.h"
 #include "xml/node-observer.h"
+#include "xml/repr.h"
 #include "sp-root.h"
 #include "ui/tools/tool-base.h" //"event-context.h"
+#include "selection.h"
 //#include "dialogs/dialog-events.h"
 #include "ui/widget/color-notebook.h"
 #include "style.h"
 #include "filter-chemistry.h"
+#include "filters/blend.h"
+#include "filters/gaussian-blur.h"
 #include "sp-clippath.h"
 #include "sp-mask.h"
 #include "sp-tag.h"
diff --git a/src/ui/dialog/template-load-tab.cpp b/src/ui/dialog/template-load-tab.cpp
index 780da4ce3..7eb04ff79 100644
--- a/src/ui/dialog/template-load-tab.cpp
+++ b/src/ui/dialog/template-load-tab.cpp
@@ -9,17 +9,28 @@
  */
 
 #include "template-widget.h"
+#include "template-load-tab.h"
 #include "new-from-template.h"
 
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/scrolledwindow.h>
+#include <glibmm/i18n.h>
+#include <glibmm/fileutils.h>
+#include <glibmm/miscutils.h>
+#include <glibmm/stringutils.h>
 #include <iostream>
+#include <list>
 
 #include "extension/db.h"
+#include "extension/effect.h"
 #include "inkscape.h"
 #include "ui/interface.h"
 #include "file.h"
 #include "path-prefix.h"
+#include "preferences.h"
+#include "xml/repr.h"
+#include "xml/document.h"
+#include "xml/node.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/template-widget.cpp b/src/ui/dialog/template-widget.cpp
index 93b44fefe..0d110d853 100644
--- a/src/ui/dialog/template-widget.cpp
+++ b/src/ui/dialog/template-widget.cpp
@@ -11,8 +11,14 @@
 #include "template-widget.h"
 
 #include <gtkmm/alignment.h>
+#include <gtkmm/button.h>
+#include <gtkmm/label.h>
 #include <gtkmm/messagedialog.h>
 
+#include <glibmm/i18n.h>
+#include <glibmm/miscutils.h>
+
+#include "template-load-tab.h"
 #include "desktop.h"
 
 #include "document.h"
diff --git a/src/ui/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp
index 73d2cd042..c01da8864 100644
--- a/src/ui/dialog/text-edit.cpp
+++ b/src/ui/dialog/text-edit.cpp
@@ -22,6 +22,7 @@
 
 #include "text-edit.h"
 #include <libnrtype/font-instance.h>
+#include <gtk/gtk.h>
 
 #ifdef WITH_GTKSPELL
 extern "C" {
@@ -30,8 +31,11 @@ extern "C" {
 #endif
 
 #include <gtkmm/stock.h>
+#include <libnrtype/font-instance.h>
 #include <libnrtype/font-lister.h>
+#include <xml/repr.h>
 
+#include "macros.h"
 #include "helper/window.h"
 #include "inkscape.h"
 #include "document.h"
@@ -39,16 +43,20 @@ extern "C" {
 #include "desktop-style.h"
 
 #include "document-undo.h"
+#include "selection.h"
+#include "style.h"
 #include "sp-text.h"
 #include "sp-flowtext.h"
 #include "text-editing.h"
 #include "ui/icon-names.h"
+#include "preferences.h"
 #include "verbs.h"
 #include "ui/interface.h"
 #include "svg/css-ostringstream.h"
 #include "widgets/icon.h"
 #include "widgets/font-selector.h"
 #include <glibmm/i18n.h>
+#include <glibmm/markup.h>
 #include "util/units.h"
 #include "sp-textpath.h"
 
diff --git a/src/ui/dialog/tracedialog.cpp b/src/ui/dialog/tracedialog.cpp
index a264d83c8..11e75391b 100644
--- a/src/ui/dialog/tracedialog.cpp
+++ b/src/ui/dialog/tracedialog.cpp
@@ -12,7 +12,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
 #endif
 
 #include "tracedialog.h"
@@ -20,8 +20,10 @@
 #include <gtkmm/frame.h>
 #include "ui/widget/spinbutton.h"
 #include "ui/widget/frame.h"
+#include <gtkmm/radiobutton.h>
 #include <gtkmm/stock.h>
 
+#include <gtk/gtk.h> //for GTK_RESPONSE* types
 #include <glibmm/i18n.h>
 
 #include "desktop.h"
diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index 031bc5ae1..b7638e8c1 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -12,7 +12,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
 #endif
 
 #include <gtkmm/dialog.h>
@@ -26,11 +26,15 @@
 #include "transformation.h"
 #include "align-and-distribute.h"
 #include "inkscape.h"
+#include "selection.h"
 #include "selection-chemistry.h"
 #include "message-stack.h"
 #include "verbs.h"
+#include "preferences.h"
 #include "sp-namedview.h"
 #include "sp-item-transform.h"
+#include "macros.h"
+#include "sp-item.h"
 #include "ui/icon-names.h"
 #include "widgets/icon.h"
 
diff --git a/src/ui/dialog/undo-history.cpp b/src/ui/dialog/undo-history.cpp
index 38fab8f07..a50a169eb 100644
--- a/src/ui/dialog/undo-history.cpp
+++ b/src/ui/dialog/undo-history.cpp
@@ -12,14 +12,18 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
 #endif
 
 #include "undo-history.h"
+#include <glibmm/i18n.h>
+#include <stddef.h>
+#include <sigc++/sigc++.h>
 
 #include "document.h"
 #include "document-undo.h"
 #include "inkscape.h"
+#include "verbs.h"
 
 #include "util/signal-blocker.h"
 
diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp
index c2711bb02..99a4acc69 100644
--- a/src/ui/dialog/xml-tree.cpp
+++ b/src/ui/dialog/xml-tree.cpp
@@ -18,6 +18,7 @@
 
 #include "xml-tree.h"
 #include "widgets/icon.h"
+#include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
 #include <gtkmm/stock.h>
 
@@ -30,14 +31,18 @@
 #include "helper/window.h"
 #include "inkscape.h"
 #include "ui/interface.h"
+#include "macros.h"
 #include "message-context.h"
 #include "message-stack.h"
+#include "preferences.h"
+#include "selection.h"
 #include "shortcuts.h"
 #include "sp-root.h"
 #include "sp-string.h"
 #include "sp-tspan.h"
 #include "ui/icon-names.h"
 #include "verbs.h"
+#include "widgets/icon.h"
 
 #include "widgets/sp-xmlview-attr-list.h"
 #include "widgets/sp-xmlview-content.h"
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index 16fc5c474..ab29471ed 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -20,7 +20,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include "ui/dialog/dialog-manager.h"
@@ -35,20 +35,25 @@
 #include "extension/input.h"
 #include "widgets/icon.h"
 #include "preferences.h"
+#include "path-prefix.h"
 #include "shortcuts.h"
 #include "document.h"
 
 #include "ui/interface.h"
 #include "desktop.h"
+#include "selection.h"
 #include "selection-chemistry.h"
 #include "svg-view-widget.h"
 #include "widgets/desktop-widget.h"
 #include "sp-item-group.h"
 #include "sp-text.h"
+#include "sp-gradient.h"
 #include "sp-flowtext.h"
 #include "sp-namedview.h"
 #include "sp-root.h"
+#include "ui/view/view.h"
 #include "helper/action.h"
+#include "helper/action-context.h"
 #include "helper/gnome-utils.h"
 #include "helper/window.h"
 #include "io/sys.h"
@@ -58,6 +63,7 @@
 #include "ui/clipboard.h"
 
 #include "display/sp-canvas.h"
+#include "color.h"
 #include "svg/svg-color.h"
 #include "desktop-style.h"
 #include "style.h"
@@ -68,6 +74,7 @@
 #include "sp-anchor.h"
 #include "sp-clippath.h"
 #include "sp-image.h"
+#include "sp-item.h"
 #include "sp-mask.h"
 #include "message-stack.h"
 #include "ui/dialog/layer-properties.h"
@@ -76,6 +83,10 @@
     #include "widgets/image-menu-item.h"
 #endif
 
+#include <gdk/gdkkeysyms.h>
+
+#include <glibmm/miscutils.h>
+
 using Inkscape::DocumentUndo;
 
 /* Drag and Drop */
diff --git a/src/ui/object-edit.cpp b/src/ui/object-edit.cpp
index 90676dc5f..459acf002 100644
--- a/src/ui/object-edit.cpp
+++ b/src/ui/object-edit.cpp
@@ -12,9 +12,11 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
+
+
 #include "sp-item.h"
 #include "sp-rect.h"
 #include "box3d.h"
@@ -30,10 +32,12 @@
 #include "sp-namedview.h"
 #include "live_effects/effect.h"
 #include "sp-pattern.h"
+#include "sp-path.h"
 #include <glibmm/i18n.h>
 #include "ui/object-edit.h"
+#include "xml/repr.h"
+#include <2geom/math-utils.h>
 #include "knot-holder-entity.h"
-#include <gdk/gdk.h>
 
 #define sp_round(v,m) (((v) < 0.0) ? ((ceil((v) / (m) - 0.5)) * (m)) : ((floor((v) / (m) + 0.5)) * (m)))
 
diff --git a/src/ui/previewholder.cpp b/src/ui/previewholder.cpp
index ac1369ced..5e75179a3 100644
--- a/src/ui/previewholder.cpp
+++ b/src/ui/previewholder.cpp
@@ -12,6 +12,7 @@
 
 
 #include "previewholder.h"
+#include "preferences.h"
 
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/sizegroup.h>
diff --git a/src/ui/selected-color.cpp b/src/ui/selected-color.cpp
index 08f4bd979..846d50a5b 100644
--- a/src/ui/selected-color.cpp
+++ b/src/ui/selected-color.cpp
@@ -11,7 +11,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <glibmm/ustring.h>
diff --git a/src/ui/shape-editor.cpp b/src/ui/shape-editor.cpp
index 98320ed8c..aec5cde27 100644
--- a/src/ui/shape-editor.cpp
+++ b/src/ui/shape-editor.cpp
@@ -8,7 +8,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include <string.h>
@@ -16,8 +16,11 @@
 
 #include "desktop.h"
 #include "document.h"
+#include "gc-anchored.h"
 #include "knotholder.h"
 #include "ui/object-edit.h"
+#include "sp-item.h"
+#include "sp-object.h"
 #include "ui/shape-editor.h"
 #include "xml/node-event-vector.h"
 
diff --git a/src/ui/tool-factory.cpp b/src/ui/tool-factory.cpp
index f101e5a24..c6c579c9e 100644
--- a/src/ui/tool-factory.cpp
+++ b/src/ui/tool-factory.cpp
@@ -27,12 +27,14 @@
 #include "ui/tools/mesh-tool.h"
 #include "ui/tools/node-tool.h"
 #include "ui/tools/pencil-tool.h"
+#include "ui/tools/pen-tool.h"
 #include "ui/tools/rect-tool.h"
 #include "ui/tools/select-tool.h"
 #include "ui/tools/spiral-tool.h"
 #include "ui/tools/spray-tool.h"
 #include "ui/tools/star-tool.h"
 #include "ui/tools/text-tool.h"
+#include "ui/tools/tool-base.h"
 #include "ui/tools/tweak-tool.h"
 #include "ui/tools/zoom-tool.h"
 
diff --git a/src/ui/tool/control-point-selection.cpp b/src/ui/tool/control-point-selection.cpp
index a5611addc..f36ad7374 100644
--- a/src/ui/tool/control-point-selection.cpp
+++ b/src/ui/tool/control-point-selection.cpp
@@ -13,6 +13,7 @@
 #include "ui/tool/selectable-control-point.h"
 #include <2geom/transforms.h>
 #include "desktop.h"
+#include "preferences.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/event-utils.h"
 #include "ui/tool/transform-handle-set.h"
diff --git a/src/ui/tool/control-point.cpp b/src/ui/tool/control-point.cpp
index d9374c790..636595016 100644
--- a/src/ui/tool/control-point.cpp
+++ b/src/ui/tool/control-point.cpp
@@ -16,6 +16,8 @@
 #include "display/snap-indicator.h"
 #include "ui/tools/tool-base.h"
 #include "message-context.h"
+#include "preferences.h"
+#include "snap-preferences.h"
 #include "sp-namedview.h"
 #include "ui/control-manager.h"
 #include "ui/tool/control-point.h"
diff --git a/src/ui/tool/curve-drag-point.cpp b/src/ui/tool/curve-drag-point.cpp
index 908e18474..e460b0fb7 100644
--- a/src/ui/tool/curve-drag-point.cpp
+++ b/src/ui/tool/curve-drag-point.cpp
@@ -8,12 +8,15 @@
 
 #include "ui/tool/curve-drag-point.h"
 #include <glib/gi18n.h>
+#include <2geom/bezier-curve.h>
 #include "desktop.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/event-utils.h"
 #include "ui/tool/multi-path-manipulator.h"
 #include "ui/tool/path-manipulator.h"
+#include "ui/tool/node.h"
 #include "sp-namedview.h"
+#include "snap.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tool/manipulator.cpp b/src/ui/tool/manipulator.cpp
index 82ff014e4..11dd220f4 100644
--- a/src/ui/tool/manipulator.cpp
+++ b/src/ui/tool/manipulator.cpp
@@ -8,8 +8,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-//#include "ui/tool/node.h"
-//#include "ui/tool/manipulator.h"
+#include "ui/tool/node.h"
+#include "ui/tool/manipulator.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tool/modifier-tracker.cpp b/src/ui/tool/modifier-tracker.cpp
index f502acab2..cc4e4d0b2 100644
--- a/src/ui/tool/modifier-tracker.cpp
+++ b/src/ui/tool/modifier-tracker.cpp
@@ -12,6 +12,7 @@
 #include <gdk/gdkkeysyms.h>
 #include "ui/tool/event-utils.h"
 #include "ui/tool/modifier-tracker.h"
+#include <gtk/gtk.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tool/multi-path-manipulator.cpp b/src/ui/tool/multi-path-manipulator.cpp
index f30c7e349..9ec6f733f 100644
--- a/src/ui/tool/multi-path-manipulator.cpp
+++ b/src/ui/tool/multi-path-manipulator.cpp
@@ -19,11 +19,13 @@
 #include "document-undo.h"
 #include "live_effects/lpeobject.h"
 #include "message-stack.h"
+#include "preferences.h"
 #include "sp-path.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/event-utils.h"
 #include "ui/tool/multi-path-manipulator.h"
 #include "ui/tool/path-manipulator.h"
+#include "util/unordered-containers.h"
 #include "verbs.h"
 
 #include <gdk/gdkkeysyms.h>
diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
index 0e5a9279d..9268d9730 100644
--- a/src/ui/tool/node.cpp
+++ b/src/ui/tool/node.cpp
@@ -12,20 +12,25 @@
 #include "multi-path-manipulator.h"
 #include <glib/gi18n.h>
 #include <2geom/bezier-utils.h>
+#include <2geom/transforms.h>
 #include "display/sp-ctrlline.h"
 #include "display/sp-canvas.h"
 #include "display/sp-canvas-util.h"
 #include "desktop.h"
 
+#include "preferences.h"
 #include "snap.h"
+#include "snap-preferences.h"
 #include "sp-namedview.h"
 #include "ui/control-manager.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/event-utils.h"
+#include "ui/tool/node.h"
 #include "ui/tool/path-manipulator.h"
 #include "ui/tools/node-tool.h"
 #include "ui/tools-switch.h"
 #include <gdk/gdkkeysyms.h>
+#include <cmath>
 
 namespace {
 
diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp
index f316bea38..de071dad3 100644
--- a/src/ui/tool/path-manipulator.cpp
+++ b/src/ui/tool/path-manipulator.cpp
@@ -13,23 +13,36 @@
 #include "live_effects/lpe-powerstroke.h"
 #include "live_effects/lpe-bspline.h"
 #include "live_effects/lpe-fillet-chamfer.h"
+#include <string>
+#include <sstream>
+#include <deque>
+#include <stdexcept>
+#include <boost/shared_ptr.hpp>
+#include <2geom/bezier-curve.h>
 #include <2geom/bezier-utils.h>
 #include <2geom/path-sink.h>
+#include <glibmm/i18n.h>
 #include "ui/tool/path-manipulator.h"
+#include "desktop.h"
 
 #include "display/sp-canvas.h"
 #include "display/sp-canvas-util.h"
 #include "display/curve.h"
 #include "display/canvas-bpath.h"
+#include "document.h"
+#include "live_effects/effect.h"
 #include "live_effects/lpeobject.h"
 #include "live_effects/lpeobject-reference.h"
 #include "live_effects/parameter/path.h"
+#include "sp-path.h"
 #include "helper/geom.h"
+#include "preferences.h"
 #include "style.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/curve-drag-point.h"
 #include "ui/tool/event-utils.h"
 #include "ui/tool/multi-path-manipulator.h"
+#include "xml/node.h"
 #include "xml/node-observer.h"
 
 namespace Inkscape {
diff --git a/src/ui/tool/selector.cpp b/src/ui/tool/selector.cpp
index 84e96173d..9acf7de88 100644
--- a/src/ui/tool/selector.cpp
+++ b/src/ui/tool/selector.cpp
@@ -14,6 +14,7 @@
 
 #include "display/sodipodi-ctrlrect.h"
 #include "ui/tools/tool-base.h"
+#include "preferences.h"
 #include "ui/tool/event-utils.h"
 #include "ui/tool/selector.h"
 
diff --git a/src/ui/tool/transform-handle-set.cpp b/src/ui/tool/transform-handle-set.cpp
index 33015fe11..748b9d4cc 100644
--- a/src/ui/tool/transform-handle-set.cpp
+++ b/src/ui/tool/transform-handle-set.cpp
@@ -18,7 +18,11 @@
 #include "sp-namedview.h"
 
 #include "display/sodipodi-ctrlrect.h"
+#include "preferences.h"
 #include "pure-transform.h"
+#include "snap.h"
+#include "snap-candidate.h"
+#include "sp-namedview.h"
 #include "ui/tool/commit-events.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/selectable-control-point.h"
diff --git a/src/ui/tools-switch.cpp b/src/ui/tools-switch.cpp
index d87bcc51d..ea0431b0a 100644
--- a/src/ui/tools-switch.cpp
+++ b/src/ui/tools-switch.cpp
@@ -13,11 +13,16 @@
 
 #include <gtkmm.h> // prevents deprecation warnings
 
+#include <cstring>
+#include <string>
+
 #include "inkscape.h"
 #include "desktop.h"
 
 #include <glibmm/i18n.h>
 
+#include <xml/repr.h>
+
 #include "ui/tools-switch.h"
 
 #include "box3d.h"
@@ -47,6 +52,7 @@
 #include "ui/tools/measure-tool.h"
 #include "ui/tools/mesh-tool.h"
 #include "ui/tools/node-tool.h"
+#include "ui/tools/pen-tool.h"
 #include "ui/tools/pencil-tool.h"
 #include "ui/tools/rect-tool.h"
 #include "ui/tools/select-tool.h"
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"
diff --git a/src/ui/uxmanager.cpp b/src/ui/uxmanager.cpp
index cbce86cdb..036659661 100644
--- a/src/ui/uxmanager.cpp
+++ b/src/ui/uxmanager.cpp
@@ -10,15 +10,18 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include "widgets/desktop-widget.h"
+#include <algorithm>
 
 #include "uxmanager.h"
 #include "desktop.h"
 #include "util/ege-tags.h"
 #include "widgets/toolbox.h"
+#include "preferences.h"
+#include "gdkmm/screen.h"
 
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
diff --git a/src/ui/view/view.h b/src/ui/view/view.h
index 7ff14afd9..21a5d0dfc 100644
--- a/src/ui/view/view.h
+++ b/src/ui/view/view.h
@@ -11,13 +11,14 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <gdk/gdk.h>
+#include <stddef.h>
 #include <sigc++/connection.h>
 #include "message.h"
 #include "inkgc/gc-managed.h"
 #include "gc-finalized.h"
 #include "gc-anchored.h"
 #include <2geom/forward.h>
-#include <glib.h>
 
 /**
  * Iterates until true or returns false.
diff --git a/src/ui/widget/addtoicon.cpp b/src/ui/widget/addtoicon.cpp
index 465423fc2..10294125d 100644
--- a/src/ui/widget/addtoicon.cpp
+++ b/src/ui/widget/addtoicon.cpp
@@ -9,7 +9,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include "ui/widget/addtoicon.h"
@@ -19,7 +19,9 @@
 #include "widgets/icon.h"
 #include "widgets/toolbox.h"
 #include "ui/icon-names.h"
+#include "preferences.h"
 #include "layertypeicon.h"
+#include "addtoicon.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/anchor-selector.cpp b/src/ui/widget/anchor-selector.cpp
index acf8aff79..df00b786a 100644
--- a/src/ui/widget/anchor-selector.cpp
+++ b/src/ui/widget/anchor-selector.cpp
@@ -8,6 +8,7 @@
  */
 
 #include "ui/widget/anchor-selector.h"
+#include <iostream>
 #include "widgets/icon.h"
 #include "ui/icon-names.h"
 
diff --git a/src/ui/widget/clipmaskicon.cpp b/src/ui/widget/clipmaskicon.cpp
index 8715fdede..421f1df1e 100644
--- a/src/ui/widget/clipmaskicon.cpp
+++ b/src/ui/widget/clipmaskicon.cpp
@@ -8,7 +8,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include "ui/widget/clipmaskicon.h"
diff --git a/src/ui/widget/color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp
index 52c6ed2e3..e4f58fe8a 100644
--- a/src/ui/widget/color-icc-selector.cpp
+++ b/src/ui/widget/color-icc-selector.cpp
@@ -2,11 +2,14 @@
 #include "config.h"
 #endif
 
+#include <math.h>
 #include <gtkmm/adjustment.h>
 #include <glibmm/i18n.h>
 
 #include <gtk/gtk.h>
+#include <map>
 #include <set>
+#include <vector>
 
 #include "ui/dialog-events.h"
 #include "ui/widget/color-icc-selector.h"
diff --git a/src/ui/widget/color-notebook.cpp b/src/ui/widget/color-notebook.cpp
index 6634d8dad..6d7ada734 100644
--- a/src/ui/widget/color-notebook.cpp
+++ b/src/ui/widget/color-notebook.cpp
@@ -20,6 +20,10 @@
 #endif
 
 #include "widgets/icon.h"
+#include <cstring>
+#include <string>
+#include <cstdlib>
+#include <cstddef>
 #include <glibmm/i18n.h>
 #include <gtkmm/label.h>
 #include <gtkmm/notebook.h>
diff --git a/src/ui/widget/color-scales.cpp b/src/ui/widget/color-scales.cpp
index 832bc3a62..48a2693bc 100644
--- a/src/ui/widget/color-scales.cpp
+++ b/src/ui/widget/color-scales.cpp
@@ -3,13 +3,15 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
+#include <math.h>
 #include <gtkmm/adjustment.h>
 #include <glibmm/i18n.h>
 #include <gtk/gtk.h>
 
+#include "svg/svg-icc-color.h"
 #include "ui/dialog-events.h"
 #include "ui/widget/color-scales.h"
 #include "ui/widget/color-slider.h"
diff --git a/src/ui/widget/color-slider.cpp b/src/ui/widget/color-slider.cpp
index bf2156628..0c9586a67 100644
--- a/src/ui/widget/color-slider.cpp
+++ b/src/ui/widget/color-slider.cpp
@@ -12,10 +12,11 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include <gdkmm/cursor.h>
+#include <gdkmm/screen.h>
 #include <gdkmm/general.h>
 #include <gtkmm/adjustment.h>
 #if WITH_GTKMM_3_0
diff --git a/src/ui/widget/color-wheel-selector.cpp b/src/ui/widget/color-wheel-selector.cpp
index decb02b4f..22c616325 100644
--- a/src/ui/widget/color-wheel-selector.cpp
+++ b/src/ui/widget/color-wheel-selector.cpp
@@ -1,14 +1,18 @@
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include "color-wheel-selector.h"
 
+#include <math.h>
+#include <gtk/gtk.h>
 #include <glibmm/i18n.h>
 #include <gtkmm/adjustment.h>
 #include <gtkmm/label.h>
 #include <gtkmm/spinbutton.h>
+#include "svg/svg-icc-color.h"
 #include "ui/dialog-events.h"
+#include "ui/selected-color.h"
 #include "ui/widget/color-scales.h"
 #include "ui/widget/color-slider.h"
 #include "ui/widget/gimpcolorwheel.h"
diff --git a/src/ui/widget/dock-item.cpp b/src/ui/widget/dock-item.cpp
index 910135fc1..8d960ddc3 100644
--- a/src/ui/widget/dock-item.cpp
+++ b/src/ui/widget/dock-item.cpp
@@ -9,13 +9,16 @@
 
 #include "ui/widget/dock.h"
 
+#include "dock-item.h"
 #include "desktop.h"
 #include "inkscape.h"
+#include "preferences.h"
 #include "ui/icon-names.h"
 #include "widgets/icon.h"
 
 #include <gtkmm/icontheme.h>
 #include <gtkmm/stockitem.h>
+#include <glibmm/exceptionhandler.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/entity-entry.cpp b/src/ui/widget/entity-entry.cpp
index 381f0a2e1..a8de2f384 100644
--- a/src/ui/widget/entity-entry.cpp
+++ b/src/ui/widget/entity-entry.cpp
@@ -14,13 +14,14 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/entry.h>
 
 #include "inkscape.h"
+#include "sp-object.h"
 #include "rdf.h"
 #include "ui/widget/registry.h"
 #include "sp-root.h"
diff --git a/src/ui/widget/entry.cpp b/src/ui/widget/entry.cpp
index b1dd9ae8e..64d28119a 100644
--- a/src/ui/widget/entry.cpp
+++ b/src/ui/widget/entry.cpp
@@ -8,7 +8,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include "entry.h"
diff --git a/src/ui/widget/filter-effect-chooser.cpp b/src/ui/widget/filter-effect-chooser.cpp
index ae2f3e7c2..242a99073 100644
--- a/src/ui/widget/filter-effect-chooser.cpp
+++ b/src/ui/widget/filter-effect-chooser.cpp
@@ -10,8 +10,12 @@
  */
 
 #include "filter-effect-chooser.h"
+#include <glibmm/i18n.h>
+
+#include "desktop.h"
 
 #include "document.h"
+#include "inkscape.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/font-variants.cpp b/src/ui/widget/font-variants.cpp
index aca85f246..62598dead 100644
--- a/src/ui/widget/font-variants.cpp
+++ b/src/ui/widget/font-variants.cpp
@@ -8,18 +8,26 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <gtkmm.h>
 #include <glibmm/i18n.h>
 #include <libnrtype/font-instance.h>
+#include <iostream>
 
 #include "font-variants.h"
 
 // For updating from selection
 #include "desktop.h"
+#include "selection.h"
+#include "style.h"
 #include "sp-text.h"
+#include "sp-tspan.h"
+#include "sp-tref.h"
+#include "sp-textpath.h"
+#include "sp-item-group.h"
+#include "xml/repr.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/frame.cpp b/src/ui/widget/frame.cpp
index 65d10dcc4..eaa4336bb 100644
--- a/src/ui/widget/frame.cpp
+++ b/src/ui/widget/frame.cpp
@@ -8,7 +8,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include "frame.h"
diff --git a/src/ui/widget/highlight-picker.cpp b/src/ui/widget/highlight-picker.cpp
index c1068c9b2..09999b52d 100644
--- a/src/ui/widget/highlight-picker.cpp
+++ b/src/ui/widget/highlight-picker.cpp
@@ -14,6 +14,9 @@
 
 #include "highlight-picker.h"
 #include "widgets/icon.h"
+#include "widgets/toolbox.h"
+#include "ui/icon-names.h"
+#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/imageicon.cpp b/src/ui/widget/imageicon.cpp
index 7d7fb2d3b..df261b69a 100644
--- a/src/ui/widget/imageicon.cpp
+++ b/src/ui/widget/imageicon.cpp
@@ -15,9 +15,12 @@
 
 
 #include "imageicon.h"
+#include <sys/stat.h>
 #include "svg-view-widget.h"
 #include "document.h"
 #include "inkscape.h"
+#include <glibmm/convert.h>
+#include <glibmm/fileutils.h>
 
 
 namespace Inkscape
diff --git a/src/ui/widget/layer-selector.cpp b/src/ui/widget/layer-selector.cpp
index 7ee34f3b3..1a9ce617f 100644
--- a/src/ui/widget/layer-selector.cpp
+++ b/src/ui/widget/layer-selector.cpp
@@ -11,7 +11,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <cstring>
@@ -25,7 +25,9 @@
 #include "document.h"
 #include "document-undo.h"
 #include "layer-manager.h"
+#include "sp-item.h"
 #include "ui/icon-names.h"
+#include "ui/widget/layer-selector.h"
 #include "util/filter-list.h"
 #include "util/reverse-list.h"
 #include "verbs.h"
diff --git a/src/ui/widget/layertypeicon.cpp b/src/ui/widget/layertypeicon.cpp
index e281d982a..672c607e5 100644
--- a/src/ui/widget/layertypeicon.cpp
+++ b/src/ui/widget/layertypeicon.cpp
@@ -8,7 +8,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include "ui/widget/layertypeicon.h"
@@ -18,6 +18,7 @@
 #include "widgets/icon.h"
 #include "widgets/toolbox.h"
 #include "ui/icon-names.h"
+#include "layertypeicon.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/licensor.cpp b/src/ui/widget/licensor.cpp
index 6acb5a4c7..d21e848f2 100644
--- a/src/ui/widget/licensor.cpp
+++ b/src/ui/widget/licensor.cpp
@@ -13,6 +13,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
+# include <config.h>
 #endif
 
 #include "licensor.h"
@@ -26,6 +27,7 @@
 #include "document-undo.h"
 #include "document-private.h"
 #include "verbs.h"
+#include <gtkmm/radiobutton.h>
 
 
 namespace Inkscape {
diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp
index c8ac20c54..8acf083d0 100644
--- a/src/ui/widget/object-composite-settings.cpp
+++ b/src/ui/widget/object-composite-settings.cpp
@@ -14,6 +14,8 @@
 
 #include "ui/widget/object-composite-settings.h"
 
+#include <glibmm/i18n.h>
+
 #include "desktop.h"
 
 #include "desktop-style.h"
@@ -21,12 +23,17 @@
 #include "document-undo.h"
 #include "filter-chemistry.h"
 #include "inkscape.h"
+#include "selection.h"
 #include "style.h"
+#include "sp-item.h"
 #include "svg/css-ostringstream.h"
 #include "verbs.h"
+#include "xml/repr.h"
 #include "widgets/icon.h"
+#include "ui/icon-names.h"
 #include "display/sp-canvas.h"
 #include "ui/widget/style-subject.h"
+#include "ui/widget/gimpspinscale.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index 4a1fe9ac6..19ab1a280 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -18,18 +18,35 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include "page-sizer.h"
 
+#include <cmath>
+#include <string>
+#include <string.h>
+#include <sstream>
+#include <vector>
+
 #include <glibmm/i18n.h>
 
+#include <2geom/transforms.h>
+
 
+#include "document.h"
+#include "desktop.h"
 #include "helper/action.h"
+#include "helper/action-context.h"
+#include "util/units.h"
+#include "inkscape.h"
+#include "sp-namedview.h"
 #include "sp-root.h"
 #include "ui/widget/button.h"
+#include "ui/widget/scalar-unit.h"
 #include "verbs.h"
+#include "xml/node.h"
+#include "xml/repr.h"
 
 using std::pair;
 using Inkscape::Util::unit_table;
diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index 6ccd8b81a..ab13577d7 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -12,15 +12,20 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <gtkmm/dialog.h> // for Gtk::RESPONSE_*
 #include <gtkmm/menu.h>
 #include <gtkmm/stock.h>
+#include <gtkmm/radiobutton.h>
+#include <gtkmm/radiomenuitem.h>
+#include <gtkmm/separatormenuitem.h>
 
 #include <glibmm/i18n.h>
 
+#include <gtk/gtk.h>
+
 #include "panel.h"
 #include "icon-size.h"
 #include "preferences.h"
diff --git a/src/ui/widget/point.cpp b/src/ui/widget/point.cpp
index 2c2eb5e8a..6aa6196bb 100644
--- a/src/ui/widget/point.cpp
+++ b/src/ui/widget/point.cpp
@@ -12,11 +12,14 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 
 #include "ui/widget/point.h"
+#include "ui/widget/labelled.h"
+#include "ui/widget/scalar.h"
+#include <gtkmm/box.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp
index b4c09cc0f..d56506d62 100644
--- a/src/ui/widget/preferences-widget.cpp
+++ b/src/ui/widget/preferences-widget.cpp
@@ -11,7 +11,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <gtkmm/box.h>
@@ -26,14 +26,19 @@
 #include "verbs.h"
 #include "selcue.h"
 #include "io/sys.h"
+#include <iostream>
 #include "desktop.h"
+#include "enums.h"
 #include "inkscape.h"
 
 #include "message-stack.h"
 #include "style.h"
+#include "selection.h"
 #include "selection-chemistry.h"
 #include "ui/dialog/filedialog.h"
+#include "xml/repr.h"
 
+#include <glibmm/convert.h>
 #include <glibmm/i18n.h>
 
 #ifdef WIN32
diff --git a/src/ui/widget/preferences-widget.h b/src/ui/widget/preferences-widget.h
index cb192bf58..1d2d77699 100644
--- a/src/ui/widget/preferences-widget.h
+++ b/src/ui/widget/preferences-widget.h
@@ -19,6 +19,7 @@
 # include <config.h>
 #endif
 
+#include <iostream>
 #include <vector>
 
 #include <gtkmm/filechooserbutton.h>
diff --git a/src/ui/widget/random.cpp b/src/ui/widget/random.cpp
index b6ea16b89..0a646b6fb 100644
--- a/src/ui/widget/random.cpp
+++ b/src/ui/widget/random.cpp
@@ -10,7 +10,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 
diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp
index af59fe1a0..572845668 100644
--- a/src/ui/widget/registered-widget.cpp
+++ b/src/ui/widget/registered-widget.cpp
@@ -14,19 +14,29 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include "registered-widget.h"
+#include <gtkmm/radiobutton.h>
 
+#include "ui/widget/color-picker.h"
+#include "ui/widget/registry.h"
+#include "ui/widget/scalar-unit.h"
+#include "ui/widget/point.h"
+#include "ui/widget/random.h"
 #include "widgets/spinbutton-events.h"
 
+#include "xml/repr.h"
 #include "svg/svg-color.h"
 #include "svg/stringstream.h"
 
 #include "verbs.h"
 
 // for interruptability bug:
+#include "display/sp-canvas.h"
+
+#include "desktop.h"
 
 
 #include "sp-root.h"
diff --git a/src/ui/widget/rendering-options.cpp b/src/ui/widget/rendering-options.cpp
index 220731b7e..837387f7b 100644
--- a/src/ui/widget/rendering-options.cpp
+++ b/src/ui/widget/rendering-options.cpp
@@ -9,7 +9,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <gtkmm.h>
diff --git a/src/ui/widget/rotateable.cpp b/src/ui/widget/rotateable.cpp
index e0de22335..5e938dee6 100644
--- a/src/ui/widget/rotateable.cpp
+++ b/src/ui/widget/rotateable.cpp
@@ -8,11 +8,12 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <gtkmm/box.h>
 #include <gtkmm/eventbox.h>
+#include <glibmm/i18n.h>
 #include <2geom/point.h>
 #include "ui/tools/tool-base.h"
 #include "rotateable.h"
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index 299b904c6..f7fd63f51 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -10,10 +10,11 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include "selected-style.h"
+#include <gtkmm/separatormenuitem.h>
 
 #include "widgets/spw-utilities.h"
 #include "ui/widget/color-preview.h"
@@ -30,14 +31,19 @@
 #include "ui/dialog/dialog-manager.h"
 #include "ui/dialog/fill-and-stroke.h"
 #include "ui/dialog/panel-dialog.h"
+#include "xml/repr.h"
+#include "document.h"
 #include "document-undo.h"
 #include "widgets/widget-sizes.h"
 #include "widgets/spinbutton-events.h"
 #include "widgets/gradient-image.h"
+#include "sp-gradient.h"
 #include "svg/svg-color.h"
 #include "svg/css-ostringstream.h"
 #include "ui/tools/tool-base.h"
 #include "message-context.h"
+#include "verbs.h"
+#include "color.h"
 #include <display/sp-canvas.h>
 #include "pixmaps/cursor-adj-h.xpm"
 #include "pixmaps/cursor-adj-s.xpm"
@@ -45,6 +51,7 @@
 #include "pixmaps/cursor-adj-a.xpm"
 #include "sp-cursor.h"
 #include "gradient-chemistry.h"
+#include "util/units.h"
 
 using Inkscape::Util::unit_table;
 
diff --git a/src/ui/widget/spin-scale.cpp b/src/ui/widget/spin-scale.cpp
index cb95e7405..bb08d67df 100644
--- a/src/ui/widget/spin-scale.cpp
+++ b/src/ui/widget/spin-scale.cpp
@@ -8,7 +8,9 @@
 
 #include "spin-scale.h"
 
+#include <gtkmm/adjustment.h>
 #include <glibmm/i18n.h>
+#include <glibmm/stringutils.h>
 
 #include "ui/widget/gimpspinscale.h"
 
diff --git a/src/ui/widget/spin-slider.cpp b/src/ui/widget/spin-slider.cpp
index 4242d8c7d..9b361ae78 100644
--- a/src/ui/widget/spin-slider.cpp
+++ b/src/ui/widget/spin-slider.cpp
@@ -11,6 +11,7 @@
 #include "spin-slider.h"
 
 #include <glibmm/i18n.h>
+#include <glibmm/stringutils.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/spinbutton.cpp b/src/ui/widget/spinbutton.cpp
index d1776e630..d7669d4e5 100644
--- a/src/ui/widget/spinbutton.cpp
+++ b/src/ui/widget/spinbutton.cpp
@@ -8,7 +8,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include "spinbutton.h"
diff --git a/src/ui/widget/style-subject.cpp b/src/ui/widget/style-subject.cpp
index 811ed2221..da3bbcd20 100644
--- a/src/ui/widget/style-subject.cpp
+++ b/src/ui/widget/style-subject.cpp
@@ -8,6 +8,7 @@
 #include "ui/widget/style-subject.h"
 
 #include "desktop.h"
+#include "sp-object.h"
 #include "xml/sp-css-attr.h"
 #include "desktop-style.h"
 
diff --git a/src/ui/widget/style-swatch.cpp b/src/ui/widget/style-swatch.cpp
index 2952a3f97..188be705d 100644
--- a/src/ui/widget/style-swatch.cpp
+++ b/src/ui/widget/style-swatch.cpp
@@ -13,6 +13,9 @@
 
 #include "style-swatch.h"
 
+#include <cstring>
+#include <string>
+
 #include "widgets/spw-utilities.h"
 #include "ui/widget/color-preview.h"
 
@@ -20,10 +23,13 @@
 #include "sp-linear-gradient.h"
 #include "sp-radial-gradient.h"
 #include "sp-pattern.h"
+#include "xml/repr.h"
 #include "xml/sp-css-attr.h"
 #include "widgets/widget-sizes.h"
 #include "util/units.h"
 #include "helper/action.h"
+#include "helper/action-context.h"
+#include "preferences.h"
 #include "inkscape.h"
 #include "verbs.h"
 #include <glibmm/i18n.h>
diff --git a/src/ui/widget/tolerance-slider.cpp b/src/ui/widget/tolerance-slider.cpp
index e904666cc..ced811c57 100644
--- a/src/ui/widget/tolerance-slider.cpp
+++ b/src/ui/widget/tolerance-slider.cpp
@@ -9,7 +9,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <gtkmm/adjustment.h>
diff --git a/src/uri-references.cpp b/src/uri-references.cpp
index d626d0e41..db46a156f 100644
--- a/src/uri-references.cpp
+++ b/src/uri-references.cpp
@@ -12,6 +12,7 @@
 
 #include <iostream>
 #include <cstring>
+#include <string>
 
 #include "document.h"
 #include "sp-object.h"
@@ -20,6 +21,7 @@
 #include "extract-uri.h"
 #include "sp-tag-use.h"
 #include <glibmm/miscutils.h>
+#include <sigc++/functors/mem_fun.h>
 
 namespace Inkscape {
 
diff --git a/src/uri.cpp b/src/uri.cpp
index f2578b989..49bdab63c 100644
--- a/src/uri.cpp
+++ b/src/uri.cpp
@@ -10,6 +10,7 @@
 
 #include <glib.h>
 #include "uri.h"
+#include <string>
 #include <glibmm/ustring.h>
 #include <glibmm/miscutils.h>
 
diff --git a/src/vanishing-point.cpp b/src/vanishing-point.cpp
index 987211edc..32ccbad93 100644
--- a/src/vanishing-point.cpp
+++ b/src/vanishing-point.cpp
@@ -21,10 +21,12 @@
 #include "display/sp-canvas-item.h"
 #include "display/sp-ctrlline.h"
 #include "ui/tools/tool-base.h"
+#include "xml/repr.h"
 #include "perspective-line.h"
 #include "ui/shape-editor.h"
 #include "snap.h"
 #include "sp-namedview.h"
+#include "ui/control-manager.h"
 #include "document-undo.h"
 #include "verbs.h"
 
diff --git a/src/verbs.cpp b/src/verbs.cpp
index b6293b3a2..299cfe8e7 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -26,7 +26,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <cstring>
@@ -45,9 +45,11 @@
 #include "document.h"
 #include "ui/tools/freehand-base.h"
 #include "extension/effect.h"
+#include "ui/tools/tool-base.h"
 #include "file.h"
 #include "gradient-drag.h"
 #include "helper/action.h"
+#include "helper/action-context.h"
 #include "help.h"
 #include "inkscape.h"
 #include "ui/interface.h"
@@ -55,6 +57,7 @@
 #include "layer-manager.h"
 #include "message-stack.h"
 #include "path-chemistry.h"
+#include "preferences.h"
 #include "ui/tools/select-tool.h"
 #include "selection-chemistry.h"
 #include "seltrans.h"
@@ -84,6 +87,9 @@
 #include "ui/dialog/spellcheck.h"
 #include "ui/icon-names.h"
 #include "ui/tools/node-tool.h"
+#include "selection.h"
+
+#include <gtk/gtk.h>
 
 using Inkscape::DocumentUndo;
 using Inkscape::UI::Dialog::ActionAlign;
diff --git a/src/verbs.h b/src/verbs.h
index 83b9a5bd2..ffb9b23d8 100644
--- a/src/verbs.h
+++ b/src/verbs.h
@@ -18,6 +18,7 @@
 #endif
 
 #include <cstring>
+#include <string>
 #include <glibmm/ustring.h>
 
 struct SPAction;
diff --git a/src/viewbox.cpp b/src/viewbox.cpp
index 1b50fe71c..e1da23efa 100644
--- a/src/viewbox.cpp
+++ b/src/viewbox.cpp
@@ -15,6 +15,7 @@
 #include <2geom/transforms.h>
 
 #include "viewbox.h"
+#include "attributes.h"
 #include "enums.h"
 #include "sp-item.h"
 
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"
diff --git a/src/xml/node-fns.cpp b/src/xml/node-fns.cpp
index e1506e3f2..eb3870978 100644
--- a/src/xml/node-fns.cpp
+++ b/src/xml/node-fns.cpp
@@ -1,4 +1,5 @@
 #ifdef HAVE_CONFIG_H
+# include "config.h"
 #endif
 
 #include <map>
diff --git a/src/xml/rebase-hrefs.cpp b/src/xml/rebase-hrefs.cpp
index 7e3d4fa7e..a8ac3b4cc 100644
--- a/src/xml/rebase-hrefs.cpp
+++ b/src/xml/rebase-hrefs.cpp
@@ -4,7 +4,10 @@
 #include "io/sys.h"
 #include "sp-object.h"
 #include "streq.h"
+#include "util/share.h"
+#include "xml/attribute-record.h"
 #include "xml/node.h"
+#include <glib.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/convert.h>
 #include <glibmm/uriutils.h>
diff --git a/src/xml/repr-css.cpp b/src/xml/repr-css.cpp
index 9590fa97f..c043904a7 100644
--- a/src/xml/repr-css.cpp
+++ b/src/xml/repr-css.cpp
@@ -26,8 +26,10 @@
 
 #include "xml/repr.h"
 #include "xml/simple-document.h"
+#include "xml/simple-node.h"
 #include "xml/sp-css-attr.h"
 #include "style.h"
+#include "libcroco/cr-sel-eng.h"
 
 using Inkscape::Util::List;
 using Inkscape::XML::AttributeRecord;
diff --git a/src/xml/repr-io.cpp b/src/xml/repr-io.cpp
index 5f576d00f..6977bc1e2 100644
--- a/src/xml/repr-io.cpp
+++ b/src/xml/repr-io.cpp
@@ -11,7 +11,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <cstring>
@@ -39,6 +39,7 @@
 #include "preferences.h"
 
 #include <glibmm/miscutils.h>
+#include <map>
 
 using Inkscape::IO::Writer;
 using Inkscape::Util::List;
diff --git a/src/xml/repr-util.cpp b/src/xml/repr-util.cpp
index 4d093a4ea..ce93bccab 100644
--- a/src/xml/repr-util.cpp
+++ b/src/xml/repr-util.cpp
@@ -17,6 +17,8 @@
 
 #include "config.h"
 
+#include <math.h>
+
 #if HAVE_STRING_H
 # include <cstring>
 #endif
diff --git a/src/xml/repr.cpp b/src/xml/repr.cpp
index 8ad1ac06b..0a384c9c1 100644
--- a/src/xml/repr.cpp
+++ b/src/xml/repr.cpp
@@ -17,7 +17,7 @@
 #define noREPR_VERBOSE
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <cstring>
diff --git a/src/xml/simple-node.cpp b/src/xml/simple-node.cpp
index 49057a54b..3cbedc80b 100644
--- a/src/xml/simple-node.cpp
+++ b/src/xml/simple-node.cpp
@@ -16,17 +16,19 @@
 
 #include <cstring>
 #include <string>
-#include <iostream>
 
 #include <glib.h>
 
 #include "preferences.h"
 
+#include "xml/node.h"
 #include "xml/simple-node.h"
 #include "xml/node-event-vector.h"
 #include "xml/node-fns.h"
+#include "xml/repr.h"
 #include "debug/event-tracker.h"
 #include "debug/simple-event.h"
+#include "util/share.h"
 #include "util/format.h"
 
 #include "attribute-rel-util.h"
diff --git a/src/xml/simple-node.h b/src/xml/simple-node.h
index 2aecdffda..d09392249 100644
--- a/src/xml/simple-node.h
+++ b/src/xml/simple-node.h
@@ -19,6 +19,7 @@
 #define SEEN_INKSCAPE_XML_SIMPLE_NODE_H
 
 #include <cassert>
+#include <iostream>
 
 #include "xml/node.h"
 #include "xml/attribute-record.h"