Fix include order with clang-tidy check llvm-include-order

519 files changed, 1785 insertions, 1781 deletions

diff --git a/src/attribute-rel-css.cpp b/src/attribute-rel-css.cpp
index f8483d538..24e3ca0d9 100644
--- a/src/attribute-rel-css.cpp
+++ b/src/attribute-rel-css.cpp
@@ -17,8 +17,8 @@
 #endif
 
 #include <fstream>
-#include <sstream>
 #include <iostream>
+#include <sstream>
 
 #include "attribute-rel-css.h"
 
diff --git a/src/attribute-rel-util.cpp b/src/attribute-rel-util.cpp
index 42b6bebf2..fb2d6d141 100644
--- a/src/attribute-rel-util.cpp
+++ b/src/attribute-rel-util.cpp
@@ -10,8 +10,8 @@
  */
 
 #include <fstream>
-#include <sstream>
 #include <iostream>
+#include <sstream>
 
 #include "preferences.h"
 
diff --git a/src/attribute-sort-util.cpp b/src/attribute-sort-util.cpp
index 7aa8d8357..8c6930ebf 100644
--- a/src/attribute-sort-util.cpp
+++ b/src/attribute-sort-util.cpp
@@ -9,17 +9,17 @@
  * Utility functions for sorting attributes by name.
  */
 
+#include <algorithm>    // std::sort
 #include <fstream>
-#include <sstream>
 #include <iostream>
-#include <vector>
+#include <sstream>
 #include <utility>      // std::pair
-#include <algorithm>    // std::sort
+#include <vector>
 
 #include "attribute-sort-util.h"
 
-#include "xml/repr.h"
 #include "xml/attribute-record.h"
+#include "xml/repr.h"
 
 #include "attributes.h"
 
diff --git a/src/attributes.cpp b/src/attributes.cpp
index 7a3916f6d..c0af4b3ca 100644
--- a/src/attributes.cpp
+++ b/src/attributes.cpp
@@ -12,8 +12,8 @@
 # include "config.h"
 #endif
 
-#include <glib.h> // g_assert()
 #include "attributes.h"
+#include <glib.h> // g_assert()
 
 typedef struct {
     gint code;
diff --git a/src/axis-manip.cpp b/src/axis-manip.cpp
index 2332bc0a3..59ce49125 100644
--- a/src/axis-manip.cpp
+++ b/src/axis-manip.cpp
@@ -9,8 +9,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib.h>
 #include "axis-manip.h"
+#include <glib.h>
 
 namespace Proj {
 
diff --git a/src/color.cpp b/src/color.cpp
index d7e8d25dd..b2be32b8e 100644
--- a/src/color.cpp
+++ b/src/color.cpp
@@ -19,8 +19,8 @@
 #define MAX(X,Y) ((X) > (Y) ? (X) : (Y))
 
 #include "color.h"
-#include "svg/svg-icc-color.h"
 #include "svg/svg-color.h"
+#include "svg/svg-icc-color.h"
 
 #include "svg/css-ostringstream.h"
 
diff --git a/src/conn-avoid-ref.cpp b/src/conn-avoid-ref.cpp
index c7254a449..297ee1188 100644
--- a/src/conn-avoid-ref.cpp
+++ b/src/conn-avoid-ref.cpp
@@ -12,8 +12,8 @@
 
 
 #include <cstring>
-#include <string>
 #include <iostream>
+#include <string>
 
 #include "2geom/convex-hull.h"
 #include "2geom/line.h"
diff --git a/src/debug/demangle.cpp b/src/debug/demangle.cpp
index 04fe80d9b..9c7cf078b 100644
--- a/src/debug/demangle.cpp
+++ b/src/debug/demangle.cpp
@@ -9,12 +9,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <map>
 #include "debug/demangle.h"
-#include "util/format.h"
 #include "inkgc/gc-alloc.h"
+#include "util/format.h"
+#include <map>
+#include <stdio.h>
+#include <string.h>
 
 namespace Inkscape {
 
diff --git a/src/debug/heap.cpp b/src/debug/heap.cpp
index 0135a9ceb..abc687aaf 100644
--- a/src/debug/heap.cpp
+++ b/src/debug/heap.cpp
@@ -13,9 +13,9 @@
 # include "config.h"
 #endif
 
-#include "inkgc/gc-alloc.h"
 #include "debug/gc-heap.h"
 #include "debug/sysv-heap.h"
+#include "inkgc/gc-alloc.h"
 #include <vector>
 
 namespace Inkscape {
diff --git a/src/debug/log-display-config.cpp b/src/debug/log-display-config.cpp
index 1f436a708..a70bf10da 100644
--- a/src/debug/log-display-config.cpp
+++ b/src/debug/log-display-config.cpp
@@ -9,13 +9,13 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <iostream>
-#include <gtk/gtk.h>
-#include <gdk/gdk.h>
 #include "debug/event-tracker.h"
+#include "debug/log-display-config.h"
 #include "debug/logger.h"
 #include "debug/simple-event.h"
-#include "debug/log-display-config.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include <iostream>
 
 namespace Inkscape {
 
diff --git a/src/debug/logger.cpp b/src/debug/logger.cpp
index d422b8e72..22481254a 100644
--- a/src/debug/logger.cpp
+++ b/src/debug/logger.cpp
@@ -9,13 +9,13 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <fstream>
-#include <vector>
-#include <glib.h>
-#include "inkscape-version.h"
 #include "debug/logger.h"
 #include "debug/simple-event.h"
 #include "inkgc/gc-alloc.h"
+#include "inkscape-version.h"
+#include <fstream>
+#include <glib.h>
+#include <vector>
 
 namespace Inkscape {
 
diff --git a/src/debug/timestamp.cpp b/src/debug/timestamp.cpp
index cdd47e881..2681dee51 100644
--- a/src/debug/timestamp.cpp
+++ b/src/debug/timestamp.cpp
@@ -10,10 +10,10 @@
  */
 
 
-#include <glib.h>
-#include <glibmm/ustring.h>
 #include "debug/simple-event.h"
 #include "timestamp.h"
+#include <glib.h>
+#include <glibmm/ustring.h>
 
 namespace Inkscape {
 
diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp
index c48b06a9c..98d79ed8c 100644
--- a/src/desktop-events.cpp
+++ b/src/desktop-events.cpp
@@ -31,8 +31,8 @@
 
 #include <glibmm/i18n.h>
 
-#include <2geom/line.h>
 #include <2geom/angle.h>
+#include <2geom/line.h>
 
 #include "desktop.h"
 #include "document-undo.h"
@@ -58,8 +58,8 @@
 #include "object/sp-root.h"
 
 #include "ui/dialog-events.h"
-#include "ui/tools-switch.h"
 #include "ui/dialog/guides.h"
+#include "ui/tools-switch.h"
 #include "ui/tools/tool-base.h"
 
 #include "widgets/desktop-widget.h"
diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index a5cc75d15..4ffdf54cb 100644
--- a/src/desktop-style.cpp
+++ b/src/desktop-style.cpp
@@ -12,8 +12,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <string>
 #include <cstring>
+#include <string>
 
 #include <glibmm.h>
 
@@ -25,6 +25,8 @@
 #include "selection.h"
 
 #include "object/box3d-side.h"
+#include "object/filters/blend.h"
+#include "object/filters/gaussian-blur.h"
 #include "object/sp-flowdiv.h"
 #include "object/sp-flowregion.h"
 #include "object/sp-flowtext.h"
@@ -37,8 +39,6 @@
 #include "object/sp-tspan.h"
 #include "object/sp-use.h"
 #include "style.h"
-#include "object/filters/blend.h"
-#include "object/filters/gaussian-blur.h"
 
 #include "svg/css-ostringstream.h"
 #include "svg/svg-color.h"
diff --git a/src/desktop.cpp b/src/desktop.cpp
index 262f1339b..b0064c556 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -26,8 +26,8 @@
 #include <config.h>
 #endif
 
-#include <glibmm/i18n.h>
 #include <2geom/transforms.h>
+#include <glibmm/i18n.h>
 
 #include <2geom/rect.h>
 
@@ -72,8 +72,8 @@
 #include "widgets/desktop-widget.h"
 
 // TODO those includes are only for node tool quick zoom. Remove them after fixing it.
-#include "ui/tools/node-tool.h"
 #include "ui/tool/control-point-selection.h"
+#include "ui/tools/node-tool.h"
 
 namespace Inkscape { namespace XML { class Node; }}
 
diff --git a/src/dir-util.cpp b/src/dir-util.cpp
index 64f7ab7e7..c355a29f1 100644
--- a/src/dir-util.cpp
+++ b/src/dir-util.cpp
@@ -3,11 +3,11 @@
  * Utility functions for filenames.
  */
 
-#include <errno.h>
-#include <string>
+#include "dir-util.h"
 #include <cstring>
+#include <errno.h>
 #include <glib.h>
-#include "dir-util.h"
+#include <string>
 
 std::string sp_relative_path_from_path( std::string const &path, std::string const &base)
 {
diff --git a/src/display/cairo-utils.cpp b/src/display/cairo-utils.cpp
index 82373c27c..1ae16c8a4 100644
--- a/src/display/cairo-utils.cpp
+++ b/src/display/cairo-utils.cpp
@@ -16,23 +16,23 @@
 
 #include <stdexcept>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <glib/gstdio.h>
 #include <glibmm/fileutils.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
 
-#include <2geom/pathvector.h>
-#include <2geom/curves.h>
 #include <2geom/affine.h>
-#include <2geom/point.h>
+#include <2geom/curves.h>
 #include <2geom/path.h>
-#include <2geom/transforms.h>
+#include <2geom/pathvector.h>
+#include <2geom/point.h>
 #include <2geom/sbasis-to-bezier.h>
+#include <2geom/transforms.h>
 
 #include <boost/operators.hpp>
 #include <boost/optional/optional.hpp>
 
-#include "color.h"
 #include "cairo-templates.h"
+#include "color.h"
 
 /**
  * Key for cairo_surface_t to keep track of current color interpolation value
diff --git a/src/display/canvas-arena.cpp b/src/display/canvas-arena.cpp
index 366b3c7d1..8c989a9b9 100644
--- a/src/display/canvas-arena.cpp
+++ b/src/display/canvas-arena.cpp
@@ -13,14 +13,14 @@
 
 #include <gtkmm.h>
 
-#include "display/sp-canvas-util.h"
-#include "helper/sp-marshal.h"
-#include "display/canvas-arena.h"
 #include "display/cairo-utils.h"
+#include "display/canvas-arena.h"
 #include "display/drawing-context.h"
-#include "display/drawing-item.h"
 #include "display/drawing-group.h"
+#include "display/drawing-item.h"
 #include "display/drawing-surface.h"
+#include "display/sp-canvas-util.h"
+#include "helper/sp-marshal.h"
 #include "preferences.h"
 
 using namespace Inkscape;
diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp
index 82ef69579..455c039c9 100644
--- a/src/display/canvas-axonomgrid.cpp
+++ b/src/display/canvas-axonomgrid.cpp
@@ -18,30 +18,30 @@
 #endif
 
 #include <gtkmm/box.h>
-#include <gtkmm/label.h>
 #include <gtkmm/grid.h>
+#include <gtkmm/label.h>
 
 #include <glibmm/i18n.h>
 
 #include "display/canvas-axonomgrid.h"
 
-#include "ui/widget/registered-widget.h"
 #include "desktop.h"
+#include "ui/widget/registered-widget.h"
 
+#include "2geom/angle.h"
+#include "2geom/line.h"
 #include "display/cairo-utils.h"
 #include "display/canvas-grid.h"
 #include "display/sp-canvas-util.h"
 #include "display/sp-canvas.h"
 #include "document.h"
+#include "helper/mathfns.h"
 #include "inkscape.h"
-#include "preferences.h"
 #include "object/sp-namedview.h"
 #include "object/sp-object.h"
 #include "object/sp-root.h"
+#include "preferences.h"
 #include "svg/svg-color.h"
-#include "2geom/line.h"
-#include "2geom/angle.h"
-#include "helper/mathfns.h"
 #include "util/units.h"
 
 using Inkscape::Util::unit_table;
diff --git a/src/display/canvas-bpath.cpp b/src/display/canvas-bpath.cpp
index fc6b79b43..dbb8ef8b1 100644
--- a/src/display/canvas-bpath.cpp
+++ b/src/display/canvas-bpath.cpp
@@ -11,18 +11,18 @@
  *
  */
 
+#include "desktop.h"
 #include <sstream>
 #include <string.h>
-#include "desktop.h"
 
 #include "color.h"
-#include "display/sp-canvas-group.h"
-#include "display/sp-canvas-util.h"
+#include "display/cairo-utils.h"
 #include "display/canvas-bpath.h"
 #include "display/curve.h"
-#include "display/cairo-utils.h"
-#include "helper/geom.h"
+#include "display/sp-canvas-group.h"
+#include "display/sp-canvas-util.h"
 #include "display/sp-canvas.h"
+#include "helper/geom.h"
 
 static void sp_canvas_bpath_destroy(SPCanvasItem *object);
 
diff --git a/src/display/canvas-debug.cpp b/src/display/canvas-debug.cpp
index 00a4f3fee..35c88c5bd 100644
--- a/src/display/canvas-debug.cpp
+++ b/src/display/canvas-debug.cpp
@@ -10,8 +10,8 @@
  */
 
 #include "canvas-debug.h"
-#include "sp-canvas.h"
 #include "cairo-utils.h"
+#include "sp-canvas.h"
 #include "ui/event-debug.h"
 
 namespace {
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp
index a5cbcdf39..5a1c0338d 100644
--- a/src/display/canvas-grid.cpp
+++ b/src/display/canvas-grid.cpp
@@ -19,32 +19,32 @@
 #endif
 
 #include <gtkmm/box.h>
-#include <gtkmm/label.h>
 #include <gtkmm/grid.h>
+#include <gtkmm/label.h>
 
 #include <glibmm/i18n.h>
 
 #include "desktop.h"
-#include "sp-canvas-util.h"
 #include "helper/mathfns.h"
+#include "sp-canvas-util.h"
 
 #include "display/cairo-utils.h"
 #include "display/canvas-axonomgrid.h"
 #include "display/canvas-grid.h"
 #include "display/sp-canvas-group.h"
+#include "display/sp-canvas.h"
 #include "document.h"
-#include "util/units.h"
+#include "helper/mathfns.h"
 #include "inkscape.h"
-#include "preferences.h"
 #include "object/sp-namedview.h"
 #include "object/sp-object.h"
 #include "object/sp-root.h"
-#include "svg/svg-color.h"
+#include "preferences.h"
 #include "svg/stringstream.h"
-#include "helper/mathfns.h"
-#include "xml/node-event-vector.h"
+#include "svg/svg-color.h"
+#include "util/units.h"
 #include "verbs.h"
-#include "display/sp-canvas.h"
+#include "xml/node-event-vector.h"
 
 using Inkscape::DocumentUndo;
 using Inkscape::Util::unit_table;
diff --git a/src/display/canvas-rotate.cpp b/src/display/canvas-rotate.cpp
index 1d917a677..95e8128e6 100644
--- a/src/display/canvas-rotate.cpp
+++ b/src/display/canvas-rotate.cpp
@@ -12,9 +12,9 @@
 #include "inkscape.h"
 #include "desktop.h"
 
+#include "cairo-utils.h"
 #include "canvas-rotate.h"
 #include "sp-canvas.h"
-#include "cairo-utils.h"
 #include "ui/event-debug.h"
 
 #include "2geom/point.h"
diff --git a/src/display/canvas-temporary-item.cpp b/src/display/canvas-temporary-item.cpp
index cb7145d61..d87d89528 100644
--- a/src/display/canvas-temporary-item.cpp
+++ b/src/display/canvas-temporary-item.cpp
@@ -16,8 +16,8 @@
 
 #include "display/canvas-temporary-item.h"
 
-#include <glib.h>
 #include "display/sp-canvas-item.h"
+#include <glib.h>
 
 namespace Inkscape {
 namespace Display {
diff --git a/src/display/canvas-text.cpp b/src/display/canvas-text.cpp
index 4117825e3..a2bfdb27f 100644
--- a/src/display/canvas-text.cpp
+++ b/src/display/canvas-text.cpp
@@ -15,11 +15,11 @@
 #include <sstream>
 #include <string.h>
 
-#include "sp-canvas-util.h"
 #include "canvas-text.h"
-#include "display/cairo-utils.h"
 #include "desktop.h"
+#include "display/cairo-utils.h"
 #include "display/sp-canvas.h"
+#include "sp-canvas-util.h"
 
 static void sp_canvastext_destroy(SPCanvasItem *object);
 
diff --git a/src/display/curve.cpp b/src/display/curve.cpp
index 1115978e9..f41057c36 100644
--- a/src/display/curve.cpp
+++ b/src/display/curve.cpp
@@ -13,11 +13,11 @@
 
 #include "display/curve.h"
 
-#include <glib.h>
 #include <2geom/pathvector.h>
+#include <2geom/point.h>
 #include <2geom/sbasis-geometric.h>
 #include <2geom/sbasis-to-bezier.h>
-#include <2geom/point.h>
+#include <glib.h>
 
 /**
  * Routines for SPCurve and for its Geom::PathVector
diff --git a/src/display/drawing-context.cpp b/src/display/drawing-context.cpp
index ffd60ef9f..138d5589b 100644
--- a/src/display/drawing-context.cpp
+++ b/src/display/drawing-context.cpp
@@ -10,8 +10,8 @@
  */
 
 #include "display/drawing-context.h"
-#include "display/drawing-surface.h"
 #include "display/cairo-utils.h"
+#include "display/drawing-surface.h"
 
 namespace Inkscape {
 
diff --git a/src/display/drawing-group.cpp b/src/display/drawing-group.cpp
index 6abce34a2..d6ba03b0f 100644
--- a/src/display/drawing-group.cpp
+++ b/src/display/drawing-group.cpp
@@ -10,8 +10,8 @@
  */
 
 #include "display/drawing.h"
-#include "display/drawing-item.h"
 #include "display/drawing-group.h"
+#include "display/drawing-item.h"
 
 
 namespace Inkscape {
diff --git a/src/display/drawing-image.cpp b/src/display/drawing-image.cpp
index 4be3099bf..d61e04eb5 100644
--- a/src/display/drawing-image.cpp
+++ b/src/display/drawing-image.cpp
@@ -11,9 +11,9 @@
 
 #include <2geom/bezier-curve.h>
 
-#include "display/drawing.h"
 #include "display/drawing-context.h"
 #include "display/drawing-image.h"
+#include "display/drawing.h"
 #include "preferences.h"
 
 #include "display/cairo-utils.h"
diff --git a/src/display/drawing-item.cpp b/src/display/drawing-item.cpp
index cc4673bc8..94a0e7c8f 100644
--- a/src/display/drawing-item.cpp
+++ b/src/display/drawing-item.cpp
@@ -13,16 +13,16 @@
 
 #include "display/drawing.h"
 #include "display/drawing-context.h"
-#include "display/drawing-item.h"
 #include "display/drawing-group.h"
+#include "display/drawing-item.h"
 #include "display/drawing-pattern.h"
 #include "display/drawing-surface.h"
 #include "nr-filter.h"
 #include "preferences.h"
 #include "style.h"
 
-#include "display/cairo-utils.h"
 #include "display/cairo-templates.h"
+#include "display/cairo-utils.h"
 
 namespace Inkscape {
 
diff --git a/src/display/drawing-shape.cpp b/src/display/drawing-shape.cpp
index d7329e670..ee828cf67 100644
--- a/src/display/drawing-shape.cpp
+++ b/src/display/drawing-shape.cpp
@@ -9,20 +9,20 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glibmm.h>
 #include <2geom/curves.h>
-#include <2geom/pathvector.h>
 #include <2geom/path-sink.h>
+#include <2geom/pathvector.h>
 #include <2geom/svg-path-parser.h>
+#include <glibmm.h>
 
 #include "display/cairo-utils.h"
 #include "display/canvas-arena.h"
 #include "display/canvas-bpath.h"
 #include "display/curve.h"
-#include "display/drawing.h"
 #include "display/drawing-context.h"
 #include "display/drawing-group.h"
 #include "display/drawing-shape.h"
+#include "display/drawing.h"
 #include "helper/geom-curves.h"
 #include "helper/geom.h"
 #include "preferences.h"
diff --git a/src/display/drawing-surface.cpp b/src/display/drawing-surface.cpp
index 2752789e2..6dc8623eb 100644
--- a/src/display/drawing-surface.cpp
+++ b/src/display/drawing-surface.cpp
@@ -11,8 +11,8 @@
 
 //#include <iostream>
 #include "display/drawing-surface.h"
-#include "display/drawing-context.h"
 #include "display/cairo-utils.h"
+#include "display/drawing-context.h"
 
 namespace Inkscape {
 
diff --git a/src/display/drawing-text.cpp b/src/display/drawing-text.cpp
index 3f6b5b34a..f32ca9dc9 100644
--- a/src/display/drawing-text.cpp
+++ b/src/display/drawing-text.cpp
@@ -12,13 +12,13 @@
 //#include "display/cairo-utils.h"
 //#include "display/canvas-bpath.h" // for SPWindRule (WTF!)
 #include "display/drawing.h"
+#include "2geom/pathvector.h"
 #include "display/drawing-context.h"
 #include "display/drawing-surface.h"
 #include "display/drawing-text.h"
 #include "helper/geom.h"
 #include "libnrtype/font-instance.h"
 #include "style.h"
-#include "2geom/pathvector.h"
 
 #include "display/cairo-utils.h"
 #include "display/canvas-bpath.h"
diff --git a/src/display/drawing.cpp b/src/display/drawing.cpp
index 71fb94be0..3b0a3a5b4 100644
--- a/src/display/drawing.cpp
+++ b/src/display/drawing.cpp
@@ -10,10 +10,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <algorithm>
 #include "display/drawing.h"
 #include "nr-filter-gaussian.h"
 #include "nr-filter-types.h"
+#include <algorithm>
 
 //grayscale colormode:
 #include "cairo-templates.h"
diff --git a/src/display/grayscale.cpp b/src/display/grayscale.cpp
index 5978dbf2a..6edb2f2f3 100644
--- a/src/display/grayscale.cpp
+++ b/src/display/grayscale.cpp
@@ -15,9 +15,9 @@
 #include "color.h"
 
 // for activeDesktopIsGrayscale:
+#include "desktop.h"
 #include "display/rendermode.h"
 #include "inkscape.h"
-#include "desktop.h"
 
 namespace Grayscale {
 
diff --git a/src/display/guideline.cpp b/src/display/guideline.cpp
index cde10f6c2..6b060f973 100644
--- a/src/display/guideline.cpp
+++ b/src/display/guideline.cpp
@@ -16,14 +16,14 @@
  */
 
 #include <2geom/coord.h>
-#include <2geom/transforms.h>
 #include <2geom/line.h>
+#include <2geom/transforms.h>
 
-#include "sp-canvas-util.h"
-#include "guideline.h"
 #include "display/cairo-utils.h"
-#include "display/sp-canvas.h"
 #include "display/sodipodi-ctrl.h"
+#include "display/sp-canvas.h"
+#include "guideline.h"
+#include "sp-canvas-util.h"
 
 static void sp_guideline_destroy(SPCanvasItem *object);
 
diff --git a/src/display/nr-3dutils.cpp b/src/display/nr-3dutils.cpp
index d2ac7d82b..2305ebcb5 100644
--- a/src/display/nr-3dutils.cpp
+++ b/src/display/nr-3dutils.cpp
@@ -12,9 +12,9 @@
 #include <glib.h>
 
 #include "display/nr-3dutils.h"
-#include <cmath>
-#include <2geom/point.h>
 #include <2geom/affine.h>
+#include <2geom/point.h>
+#include <cmath>
 
 namespace NR {
 
diff --git a/src/display/nr-filter-blend.cpp b/src/display/nr-filter-blend.cpp
index 49dfc7ec4..8fddeddd4 100644
--- a/src/display/nr-filter-blend.cpp
+++ b/src/display/nr-filter-blend.cpp
@@ -20,7 +20,6 @@
 #include "config.h"
 #endif
 
-#include <glibmm.h>
 #include "display/cairo-templates.h"
 #include "display/cairo-utils.h"
 #include "display/nr-filter-blend.h"
@@ -28,6 +27,7 @@
 #include "display/nr-filter-slot.h"
 #include "display/nr-filter-types.h"
 #include "preferences.h"
+#include <glibmm.h>
 
 namespace Inkscape {
 namespace Filters {
diff --git a/src/display/nr-filter-colormatrix.cpp b/src/display/nr-filter-colormatrix.cpp
index 77873d523..6be1d6640 100644
--- a/src/display/nr-filter-colormatrix.cpp
+++ b/src/display/nr-filter-colormatrix.cpp
@@ -10,13 +10,13 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <math.h>
-#include <algorithm>
 #include "display/cairo-templates.h"
 #include "display/cairo-utils.h"
 #include "display/nr-filter-colormatrix.h"
 #include "display/nr-filter-slot.h"
 #include <2geom/math-utils.h>
+#include <algorithm>
+#include <math.h>
 
 namespace Inkscape {
 namespace Filters {
diff --git a/src/display/nr-filter-component-transfer.cpp b/src/display/nr-filter-component-transfer.cpp
index b2545b76f..968f0c75c 100644
--- a/src/display/nr-filter-component-transfer.cpp
+++ b/src/display/nr-filter-component-transfer.cpp
@@ -10,11 +10,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <math.h>
 #include "display/cairo-templates.h"
 #include "display/cairo-utils.h"
 #include "display/nr-filter-component-transfer.h"
 #include "display/nr-filter-slot.h"
+#include <math.h>
 
 namespace Inkscape {
 namespace Filters {
diff --git a/src/display/nr-filter-convolve-matrix.cpp b/src/display/nr-filter-convolve-matrix.cpp
index 2aad528a6..03cddb9ae 100644
--- a/src/display/nr-filter-convolve-matrix.cpp
+++ b/src/display/nr-filter-convolve-matrix.cpp
@@ -10,13 +10,13 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <vector>
 #include "display/cairo-templates.h"
 #include "display/cairo-utils.h"
 #include "display/nr-filter-convolve-matrix.h"
 #include "display/nr-filter-slot.h"
 #include "display/nr-filter-units.h"
 #include "display/nr-filter-utils.h"
+#include <vector>
 
 namespace Inkscape {
 namespace Filters {
diff --git a/src/display/nr-filter-diffuselighting.cpp b/src/display/nr-filter-diffuselighting.cpp
index ed5afa82a..8fd8b9784 100644
--- a/src/display/nr-filter-diffuselighting.cpp
+++ b/src/display/nr-filter-diffuselighting.cpp
@@ -21,8 +21,8 @@
 #include "display/nr-filter-units.h"
 #include "display/nr-filter-utils.h"
 #include "display/nr-light.h"
-#include "svg/svg-icc-color.h"
 #include "svg/svg-color.h"
+#include "svg/svg-icc-color.h"
 
 namespace Inkscape {
 namespace Filters {
diff --git a/src/display/nr-filter-flood.cpp b/src/display/nr-filter-flood.cpp
index d1fe3e13f..da50daf8d 100644
--- a/src/display/nr-filter-flood.cpp
+++ b/src/display/nr-filter-flood.cpp
@@ -14,12 +14,12 @@
 # include "config.h"
 #endif
 
+#include "color.h"
 #include "display/cairo-utils.h"
 #include "display/nr-filter-flood.h"
 #include "display/nr-filter-slot.h"
-#include "svg/svg-icc-color.h"
 #include "svg/svg-color.h"
-#include "color.h"
+#include "svg/svg-icc-color.h"
 
 namespace Inkscape {
 namespace Filters {
diff --git a/src/display/nr-filter-gaussian.cpp b/src/display/nr-filter-gaussian.cpp
index 2227edfef..5e2d28d9a 100644
--- a/src/display/nr-filter-gaussian.cpp
+++ b/src/display/nr-filter-gaussian.cpp
@@ -24,14 +24,14 @@
 #endif //HAVE_OPENMP
 
 #include "display/cairo-utils.h"
-#include "display/nr-filter-primitive.h"
 #include "display/nr-filter-gaussian.h"
+#include "display/nr-filter-primitive.h"
+#include "display/nr-filter-slot.h"
 #include "display/nr-filter-types.h"
 #include "display/nr-filter-units.h"
-#include "display/nr-filter-slot.h"
-#include <2geom/affine.h>
-#include "util/fixed_point.h"
 #include "preferences.h"
+#include "util/fixed_point.h"
+#include <2geom/affine.h>
 
 #ifndef INK_UNUSED
 #define INK_UNUSED(x) ((void)(x))
diff --git a/src/display/nr-filter-image.cpp b/src/display/nr-filter-image.cpp
index 551a86cbf..27ebece8e 100644
--- a/src/display/nr-filter-image.cpp
+++ b/src/display/nr-filter-image.cpp
@@ -11,16 +11,16 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 #include "display/nr-filter-image.h"
-#include "document.h"
-#include "object/sp-item.h"
 #include "display/cairo-utils.h"
 #include "display/drawing-context.h"
-#include "display/drawing.h"
 #include "display/drawing-item.h"
-#include "display/nr-filter.h"
+#include "display/drawing.h"
 #include "display/nr-filter-slot.h"
 #include "display/nr-filter-units.h"
+#include "display/nr-filter.h"
+#include "document.h"
 #include "enums.h"
+#include "object/sp-item.h"
 #include <glibmm/fileutils.h>
 
 namespace Inkscape {
diff --git a/src/display/nr-filter-merge.cpp b/src/display/nr-filter-merge.cpp
index fc2ce408f..2862738ce 100644
--- a/src/display/nr-filter-merge.cpp
+++ b/src/display/nr-filter-merge.cpp
@@ -9,11 +9,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <vector>
 #include "display/cairo-utils.h"
 #include "display/nr-filter-merge.h"
 #include "display/nr-filter-slot.h"
 #include "display/nr-filter-utils.h"
+#include <vector>
 
 namespace Inkscape {
 namespace Filters {
diff --git a/src/display/nr-filter-morphology.cpp b/src/display/nr-filter-morphology.cpp
index a06033e80..4542cc3b2 100644
--- a/src/display/nr-filter-morphology.cpp
+++ b/src/display/nr-filter-morphology.cpp
@@ -9,15 +9,15 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <cmath>
-#include <algorithm>
-#include <deque>
-#include <functional>
 #include "display/cairo-templates.h"
 #include "display/cairo-utils.h"
 #include "display/nr-filter-morphology.h"
 #include "display/nr-filter-slot.h"
 #include "display/nr-filter-units.h"
+#include <algorithm>
+#include <cmath>
+#include <deque>
+#include <functional>
 
 namespace Inkscape {
 namespace Filters {
diff --git a/src/display/nr-filter-primitive.cpp b/src/display/nr-filter-primitive.cpp
index ec392ea06..ed09a608c 100644
--- a/src/display/nr-filter-primitive.cpp
+++ b/src/display/nr-filter-primitive.cpp
@@ -15,8 +15,8 @@
 #include "display/nr-filter-types.h"
 #include "svg/svg-length.h"
 
-#include "inkscape.h"
 #include "desktop.h"
+#include "inkscape.h"
 
 #include "document.h"
 #include "style.h"
diff --git a/src/display/nr-filter-slot.cpp b/src/display/nr-filter-slot.cpp
index 9d76462c0..3dc75e801 100644
--- a/src/display/nr-filter-slot.cpp
+++ b/src/display/nr-filter-slot.cpp
@@ -14,13 +14,13 @@
 #include <assert.h>
 #include <string.h>
 
-#include <2geom/transforms.h>
 #include "display/cairo-utils.h"
 #include "display/drawing-context.h"
-#include "display/nr-filter-types.h"
 #include "display/nr-filter-gaussian.h"
 #include "display/nr-filter-slot.h"
+#include "display/nr-filter-types.h"
 #include "display/nr-filter-units.h"
+#include <2geom/transforms.h>
 
 namespace Inkscape {
 namespace Filters {
diff --git a/src/display/nr-filter-specularlighting.cpp b/src/display/nr-filter-specularlighting.cpp
index e8d03d42e..f51699b24 100644
--- a/src/display/nr-filter-specularlighting.cpp
+++ b/src/display/nr-filter-specularlighting.cpp
@@ -10,19 +10,19 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib.h>
 #include <cmath>
+#include <glib.h>
 
 #include "display/cairo-templates.h"
 #include "display/cairo-utils.h"
 #include "display/nr-3dutils.h"
-#include "display/nr-filter-specularlighting.h"
 #include "display/nr-filter-slot.h"
+#include "display/nr-filter-specularlighting.h"
 #include "display/nr-filter-units.h"
 #include "display/nr-filter-utils.h"
 #include "display/nr-light.h"
-#include "svg/svg-icc-color.h"
 #include "svg/svg-color.h"
+#include "svg/svg-icc-color.h"
 
 namespace Inkscape {
 namespace Filters {
diff --git a/src/display/nr-filter-tile.cpp b/src/display/nr-filter-tile.cpp
index ad4e64768..80ea91914 100644
--- a/src/display/nr-filter-tile.cpp
+++ b/src/display/nr-filter-tile.cpp
@@ -12,8 +12,8 @@
 #include <glib.h>
 
 #include "display/cairo-utils.h"
-#include "display/nr-filter-tile.h"
 #include "display/nr-filter-slot.h"
+#include "display/nr-filter-tile.h"
 #include "display/nr-filter-units.h"
 
 namespace Inkscape {
diff --git a/src/display/nr-filter-turbulence.cpp b/src/display/nr-filter-turbulence.cpp
index 349bcc242..524557450 100644
--- a/src/display/nr-filter-turbulence.cpp
+++ b/src/display/nr-filter-turbulence.cpp
@@ -19,10 +19,10 @@
 
 #include "display/cairo-templates.h"
 #include "display/cairo-utils.h"
-#include "display/nr-filter.h"
 #include "display/nr-filter-turbulence.h"
 #include "display/nr-filter-units.h"
 #include "display/nr-filter-utils.h"
+#include "display/nr-filter.h"
 #include <math.h>
 
 namespace Inkscape {
diff --git a/src/display/nr-filter.cpp b/src/display/nr-filter.cpp
index 4782f3f54..26961d5b9 100644
--- a/src/display/nr-filter.cpp
+++ b/src/display/nr-filter.cpp
@@ -9,28 +9,28 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib.h>
+#include <cairo.h>
 #include <cmath>
 #include <cstring>
+#include <glib.h>
 #include <string>
-#include <cairo.h>
 
-#include "display/nr-filter.h"
 #include "display/nr-filter-primitive.h"
 #include "display/nr-filter-slot.h"
 #include "display/nr-filter-types.h"
 #include "display/nr-filter-units.h"
+#include "display/nr-filter.h"
 
 #include "display/nr-filter-blend.h"
-#include "display/nr-filter-composite.h"
-#include "display/nr-filter-convolve-matrix.h"
 #include "display/nr-filter-colormatrix.h"
 #include "display/nr-filter-component-transfer.h"
+#include "display/nr-filter-composite.h"
+#include "display/nr-filter-convolve-matrix.h"
 #include "display/nr-filter-diffuselighting.h"
 #include "display/nr-filter-displacement-map.h"
-#include "display/nr-filter-image.h"
 #include "display/nr-filter-flood.h"
 #include "display/nr-filter-gaussian.h"
+#include "display/nr-filter-image.h"
 #include "display/nr-filter-merge.h"
 #include "display/nr-filter-morphology.h"
 #include "display/nr-filter-offset.h"
@@ -39,13 +39,13 @@
 #include "display/nr-filter-turbulence.h"
 
 #include "display/cairo-utils.h"
-#include "display/drawing.h"
-#include "display/drawing-item.h"
 #include "display/drawing-context.h"
+#include "display/drawing-item.h"
 #include "display/drawing-surface.h"
+#include "display/drawing.h"
+#include "svg/svg-length.h"
 #include <2geom/affine.h>
 #include <2geom/rect.h>
-#include "svg/svg-length.h"
 //#include "sp-filter-units.h"
 #include "preferences.h"
 
diff --git a/src/display/nr-light.cpp b/src/display/nr-light.cpp
index 47938f00c..e74b94383 100644
--- a/src/display/nr-light.cpp
+++ b/src/display/nr-light.cpp
@@ -12,11 +12,11 @@
 #include <cmath>
 
 #include "display/nr-light.h"
+#include "color.h"
 #include "display/nr-3dutils.h"
 #include "object/filters/distantlight.h"
 #include "object/filters/pointlight.h"
 #include "object/filters/spotlight.h"
-#include "color.h"
 
 namespace Inkscape {
 namespace Filters {
diff --git a/src/display/nr-style.cpp b/src/display/nr-style.cpp
index 31bb27755..8038fe16f 100644
--- a/src/display/nr-style.cpp
+++ b/src/display/nr-style.cpp
@@ -10,11 +10,11 @@
  */
 
 #include "display/nr-style.h"
-#include "style.h"
-#include "object/sp-paint-server.h"
 #include "display/canvas-bpath.h" // contains SPStrokeJoinType, SPStrokeCapType etc. (WTF!)
 #include "display/drawing-context.h"
 #include "display/drawing-pattern.h"
+#include "object/sp-paint-server.h"
+#include "style.h"
 
 void NRStyle::Paint::clear()
 {
diff --git a/src/display/nr-svgfonts.cpp b/src/display/nr-svgfonts.cpp
index c3354bc0b..4797d3fa0 100644
--- a/src/display/nr-svgfonts.cpp
+++ b/src/display/nr-svgfonts.cpp
@@ -17,23 +17,23 @@
 #include <cairo.h>
 #include <vector>
 
-#include "svg/svg.h"
 #include "display/cairo-utils.h"
+#include "display/curve.h"
 #include "display/nr-svgfonts.h"
 #include "display/nr-svgfonts.h"
-#include "display/curve.h"
+#include "svg/svg.h"
 
 #include "xml/repr.h"
 
-#include "object/sp-path.h"
-#include "object/sp-object-group.h"
-#include "object/sp-use.h"
-#include "object/sp-use-reference.h"
 #include "object/sp-font-face.h"
-#include "object/sp-glyph.h"
-#include "object/sp-missing-glyph.h"
 #include "object/sp-font.h"
 #include "object/sp-glyph-kerning.h"
+#include "object/sp-glyph.h"
+#include "object/sp-missing-glyph.h"
+#include "object/sp-object-group.h"
+#include "object/sp-path.h"
+#include "object/sp-use-reference.h"
+#include "object/sp-use.h"
 
 // ************************//
 // UserFont Implementation //
diff --git a/src/display/snap-indicator.cpp b/src/display/snap-indicator.cpp
index f2271e0c6..0c3a79dbf 100644
--- a/src/display/snap-indicator.cpp
+++ b/src/display/snap-indicator.cpp
@@ -15,15 +15,15 @@
 
 #include "desktop.h"
 
+#include "display/canvas-text.h"
 #include "display/sodipodi-ctrl.h"
 #include "display/sodipodi-ctrlrect.h"
-#include "display/canvas-text.h"
 #include "display/sp-canvas-util.h"
+#include "enums.h"
 #include "knot.h"
 #include "preferences.h"
-#include <glibmm/i18n.h>
 #include "ui/tools-switch.h"
-#include "enums.h"
+#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace Display {
diff --git a/src/display/sodipodi-ctrl.cpp b/src/display/sodipodi-ctrl.cpp
index 04ec947f6..c01e91786 100644
--- a/src/display/sodipodi-ctrl.cpp
+++ b/src/display/sodipodi-ctrl.cpp
@@ -6,12 +6,12 @@
  *
  */
 
-#include <2geom/transforms.h>
-#include <2geom/line.h>
-#include "sp-canvas-util.h"
-#include "sodipodi-ctrl.h"
 #include "display/cairo-utils.h"
 #include "display/sp-canvas.h"
+#include "sodipodi-ctrl.h"
+#include "sp-canvas-util.h"
+#include <2geom/line.h>
+#include <2geom/transforms.h>
 
 enum {
     ARG_0,
diff --git a/src/display/sodipodi-ctrlrect.cpp b/src/display/sodipodi-ctrlrect.cpp
index a35f07c3d..e37db95ae 100644
--- a/src/display/sodipodi-ctrlrect.cpp
+++ b/src/display/sodipodi-ctrlrect.cpp
@@ -17,9 +17,9 @@
  */
 
 #include "sodipodi-ctrlrect.h"
-#include "sp-canvas-util.h"
 #include "display/cairo-utils.h"
 #include "display/sp-canvas.h"
+#include "sp-canvas-util.h"
 #include <2geom/transforms.h>
 
 /*
diff --git a/src/display/sp-canvas-util.cpp b/src/display/sp-canvas-util.cpp
index 25b70824b..bafe354b7 100644
--- a/src/display/sp-canvas-util.cpp
+++ b/src/display/sp-canvas-util.cpp
@@ -12,10 +12,10 @@
  */
 
 
-#include <2geom/affine.h>
-#include "sp-canvas-util.h"
 #include "sp-canvas-item.h"
+#include "sp-canvas-util.h"
 #include "sp-canvas.h"
+#include <2geom/affine.h>
 
 void sp_canvas_update_bbox(SPCanvasItem *item, int x1, int y1, int x2, int y2)
 {
diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index c717bc7ae..e930f4b37 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -21,25 +21,25 @@
 # include <config.h>
 #endif
 
+#include <cairomm/region.h>
 #include <gdkmm/devicemanager.h>
 #include <gdkmm/display.h>
 #include <gdkmm/rectangle.h>
-#include <cairomm/region.h>
 
-#include "helper/sp-marshal.h"
-#include <2geom/rect.h>
-#include <2geom/affine.h>
-#include "display/sp-canvas.h"
-#include "display/sp-canvas-group.h"
-#include "display/rendermode.h"
-#include "display/cairo-utils.h"
-#include "preferences.h"
-#include "inkscape.h"
-#include "sodipodi-ctrlrect.h"
 #include "cms-system.h"
+#include "color.h"
 #include "debug/gdk-event-latency-tracker.h"
 #include "desktop.h"
-#include "color.h"
+#include "display/cairo-utils.h"
+#include "display/rendermode.h"
+#include "display/sp-canvas-group.h"
+#include "display/sp-canvas.h"
+#include "helper/sp-marshal.h"
+#include "inkscape.h"
+#include "preferences.h"
+#include "sodipodi-ctrlrect.h"
+#include <2geom/affine.h>
+#include <2geom/rect.h>
 
 #if GTK_CHECK_VERSION(3,20,0)
 # include <gdkmm/seat.h>
diff --git a/src/display/sp-ctrlcurve.cpp b/src/display/sp-ctrlcurve.cpp
index 79ef20d6c..597484191 100644
--- a/src/display/sp-ctrlcurve.cpp
+++ b/src/display/sp-ctrlcurve.cpp
@@ -15,11 +15,11 @@
 # include "config.h"
 #endif
 
-#include "display/sp-ctrlcurve.h"
-#include "display/sp-canvas-util.h"
-#include "display/cairo-utils.h"
 #include "color.h"
+#include "display/cairo-utils.h"
+#include "display/sp-canvas-util.h"
 #include "display/sp-canvas.h"
+#include "display/sp-ctrlcurve.h"
 
 namespace {
 
diff --git a/src/display/sp-ctrlline.cpp b/src/display/sp-ctrlline.cpp
index c4ced2a33..934b7bae0 100644
--- a/src/display/sp-ctrlline.cpp
+++ b/src/display/sp-ctrlline.cpp
@@ -22,11 +22,11 @@
 # include "config.h"
 #endif
 
-#include "display/sp-ctrlline.h"
-#include "display/sp-canvas-util.h"
-#include "display/cairo-utils.h"
 #include "color.h"
+#include "display/cairo-utils.h"
+#include "display/sp-canvas-util.h"
 #include "display/sp-canvas.h"
+#include "display/sp-ctrlline.h"
 
 namespace {
 
diff --git a/src/display/sp-ctrlquadr.cpp b/src/display/sp-ctrlquadr.cpp
index 760e93a6d..d13861c02 100644
--- a/src/display/sp-ctrlquadr.cpp
+++ b/src/display/sp-ctrlquadr.cpp
@@ -14,12 +14,12 @@
 # include "config.h"
 #endif
 
+#include "color.h"
+#include "display/cairo-utils.h"
 #include "sp-canvas-item.h"
-#include "sp-canvas.h"
 #include "sp-canvas-util.h"
+#include "sp-canvas.h"
 #include "sp-ctrlquadr.h"
-#include "display/cairo-utils.h"
-#include "color.h"
 
 struct SPCtrlQuadr : public SPCanvasItem{
     guint32 rgba;
diff --git a/src/document-subset.cpp b/src/document-subset.cpp
index e0ec941f6..de785a419 100644
--- a/src/document-subset.cpp
+++ b/src/document-subset.cpp
@@ -10,9 +10,9 @@
 
 #include <map>
 
-#include "gc-finalized.h"
 #include "document-subset.h"
 #include "document.h"
+#include "gc-finalized.h"
 
 #include "object/sp-object.h"
 
diff --git a/src/document-undo.cpp b/src/document-undo.cpp
index a66fb0ee8..1bcb4866e 100644
--- a/src/document-undo.cpp
+++ b/src/document-undo.cpp
@@ -44,15 +44,15 @@
  * (Lauris Kaplinski)
  */
 
-#include <string>
-#include "xml/repr.h"
-#include "document-private.h"
-#include "inkscape.h"
-#include "document-undo.h"
 #include "debug/event-tracker.h"
 #include "debug/simple-event.h"
 #include "debug/timestamp.h"
+#include "document-private.h"
+#include "document-undo.h"
 #include "event.h"
+#include "inkscape.h"
+#include "xml/repr.h"
+#include <string>
 
 
 /*
diff --git a/src/document-undo.h b/src/document-undo.h
index 85b44d562..1c2b63587 100644
--- a/src/document-undo.h
+++ b/src/document-undo.h
@@ -1,6 +1,8 @@
 #ifndef SEEN_SP_DOCUMENT_UNDO_H
 #define SEEN_SP_DOCUMENT_UNDO_H
 
+#include <glib.h>
+
 namespace Glib {
     class ustring;
 }
diff --git a/src/document.cpp b/src/document.cpp
index d8b5ee38e..c33905d07 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -40,8 +40,8 @@
 #include <config.h>
 #endif
 
-#include <string>
 #include <cstring>
+#include <string>
 
 #include <2geom/transforms.h>
 
@@ -65,10 +65,10 @@
 #include "3rdparty/libcroco/cr-selector.h"
 
 #include "object/persp3d.h"
-#include "object/sp-factory.h"
 #include "object/sp-defs.h"
-#include "object/sp-root.h"
+#include "object/sp-factory.h"
 #include "object/sp-namedview.h"
+#include "object/sp-root.h"
 #include "object/sp-symbol.h"
 
 #include "widgets/desktop-widget.h"
diff --git a/src/ege-color-prof-tracker.cpp b/src/ege-color-prof-tracker.cpp
index 8401b2cc3..dd66712d4 100644
--- a/src/ege-color-prof-tracker.cpp
+++ b/src/ege-color-prof-tracker.cpp
@@ -39,9 +39,9 @@
 
 /* Note: this file should be kept compilable as both .cpp and .c */
 
+#include <algorithm>
 #include <string.h>
 #include <vector>
-#include <algorithm>
 
 #include <gtk/gtk.h>
 
diff --git a/src/event-log.cpp b/src/event-log.cpp
index 41ab2f2d0..8e616aec0 100644
--- a/src/event-log.cpp
+++ b/src/event-log.cpp
@@ -14,9 +14,9 @@
 #include <glibmm/i18n.h>
 
 #include "desktop.h"
+#include "document.h"
 #include "inkscape.h"
 #include "util/ucompose.hpp"
-#include "document.h"
 
 namespace
 {
diff --git a/src/extension/db.cpp b/src/extension/db.cpp
index e885d3531..c821cae67 100644
--- a/src/extension/db.cpp
+++ b/src/extension/db.cpp
@@ -16,9 +16,9 @@
 #include <config.h>
 #endif
 #include "db.h"
+#include "effect.h"
 #include "input.h"
 #include "output.h"
-#include "effect.h"
 
 /* Globals */
 
diff --git a/src/extension/dependency.cpp b/src/extension/dependency.cpp
index 5e843ee11..d9c270dc9 100644
--- a/src/extension/dependency.cpp
+++ b/src/extension/dependency.cpp
@@ -12,13 +12,13 @@
 #include <config.h>
 #endif
 
-#include <glibmm/i18n.h>
-#include <glibmm/fileutils.h>
-#include <glibmm/miscutils.h>
-#include "dependency.h"
 #include "db.h"
+#include "dependency.h"
 #include "extension.h"
 #include "io/resource.h"
+#include <glibmm/fileutils.h>
+#include <glibmm/i18n.h>
+#include <glibmm/miscutils.h>
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/effect.cpp b/src/extension/effect.cpp
index e475b58a0..d13444296 100644
--- a/src/extension/effect.cpp
+++ b/src/extension/effect.cpp
@@ -9,14 +9,14 @@
  */
 
 #include "prefdialog.h"
-#include "inkscape.h"
 #include "helper/action.h"
+#include "inkscape.h"
 #include "ui/view/view.h"
 
 #include "desktop.h"
-#include "implementation/implementation.h"
 #include "effect.h"
 #include "execution-env.h"
+#include "implementation/implementation.h"
 #include "timer.h"
 
 
diff --git a/src/extension/error-file.cpp b/src/extension/error-file.cpp
index 20dcc0f5f..fb84b6c0b 100644
--- a/src/extension/error-file.cpp
+++ b/src/extension/error-file.cpp
@@ -14,11 +14,11 @@
 
 #include "ui/dialog/extensions.h"
 
-#include <glibmm/i18n.h>
-#include "inkscape.h"
-#include "preferences.h"
 #include "extension/extension.h"
+#include "inkscape.h"
 #include "io/resource.h"
+#include "preferences.h"
+#include <glibmm/i18n.h>
 
 #include "error-file.h"
 
diff --git a/src/extension/execution-env.cpp b/src/extension/execution-env.cpp
index 7e233d215..5a36da1a9 100644
--- a/src/extension/execution-env.cpp
+++ b/src/extension/execution-env.cpp
@@ -16,15 +16,15 @@
 #include <gtkmm/messagedialog.h>
 
 #include "execution-env.h"
-#include "prefdialog.h"
 #include "implementation/implementation.h"
+#include "prefdialog.h"
 
-#include "selection.h"
-#include "effect.h"
-#include "document.h"
-#include "document-undo.h"
 #include "desktop.h"
+#include "document-undo.h"
+#include "document.h"
+#include "effect.h"
 #include "object/sp-namedview.h"
+#include "selection.h"
 
 #include "display/sp-canvas.h"
 
diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp
index f07d334af..9d8466233 100644
--- a/src/extension/extension.cpp
+++ b/src/extension/extension.cpp
@@ -20,20 +20,20 @@
 #endif
 
 #include <gtkmm/box.h>
-#include <gtkmm/label.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/grid.h>
+#include <gtkmm/label.h>
 
-#include <glibmm/i18n.h>
-#include "inkscape.h"
-#include "extension/implementation/implementation.h"
 #include "extension.h"
+#include "extension/implementation/implementation.h"
+#include "inkscape.h"
+#include <glibmm/i18n.h>
 
 #include "db.h"
 #include "dependency.h"
-#include "timer.h"
-#include "param/parameter.h"
 #include "io/resource.h"
+#include "param/parameter.h"
+#include "timer.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/implementation/implementation.cpp b/src/extension/implementation/implementation.cpp
index 6e6100d2b..006b45745 100644
--- a/src/extension/implementation/implementation.cpp
+++ b/src/extension/implementation/implementation.cpp
@@ -15,12 +15,12 @@
 #endif
 #include "implementation.h"
 
-#include <extension/output.h>
-#include <extension/input.h>
 #include <extension/effect.h>
+#include <extension/input.h>
+#include <extension/output.h>
 
-#include "selection.h"
 #include "desktop.h"
+#include "selection.h"
 
 
 namespace Inkscape {
diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp
index f25c8a5d6..f206a535d 100644
--- a/src/extension/implementation/script.cpp
+++ b/src/extension/implementation/script.cpp
@@ -13,12 +13,12 @@
  */
 
 #include <glibmm.h>
-#include <gtkmm/messagedialog.h>
+#include <glibmm/convert.h>
+#include <glibmm/miscutils.h>
 #include <gtkmm/main.h>
+#include <gtkmm/messagedialog.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/textview.h>
-#include <glibmm/miscutils.h>
-#include <glibmm/convert.h>
 #include <unistd.h>
 
 #include <errno.h>
@@ -26,27 +26,27 @@
 
 
 #include "desktop.h"
-#include "ui/dialog-events.h"
+#include "extension/db.h"
 #include "extension/effect.h"
 #include "extension/execution-env.h"
-#include "extension/output.h"
 #include "extension/input.h"
-#include "extension/db.h"
+#include "extension/output.h"
+#include "extension/system.h"
 #include "inkscape.h"
 #include "io/resource.h"
+#include "object/sp-namedview.h"
+#include "object/sp-path.h"
 #include "preferences.h"
 #include "script.h"
 #include "selection.h"
-#include "object/sp-namedview.h"
-#include "object/sp-path.h"
-#include "extension/system.h"
-#include "ui/view/view.h"
-#include "xml/node.h"
-#include "xml/attribute-record.h"
-#include "ui/tools/node-tool.h"
+#include "ui/dialog-events.h"
+#include "ui/tool/control-point-selection.h"
 #include "ui/tool/multi-path-manipulator.h"
 #include "ui/tool/path-manipulator.h"
-#include "ui/tool/control-point-selection.h"
+#include "ui/tools/node-tool.h"
+#include "ui/view/view.h"
+#include "xml/attribute-record.h"
+#include "xml/node.h"
 
 
 #include "path-prefix.h"
diff --git a/src/extension/implementation/xslt.cpp b/src/extension/implementation/xslt.cpp
index d11283db7..19ab5db6c 100644
--- a/src/extension/implementation/xslt.cpp
+++ b/src/extension/implementation/xslt.cpp
@@ -16,17 +16,17 @@
 #include <config.h>
 #endif
 
-#include <glibmm/fileutils.h>
-#include "file.h"
-#include "xslt.h"
 #include "../extension.h"
 #include "../output.h"
 #include "extension/input.h"
+#include "file.h"
+#include "xslt.h"
+#include <glibmm/fileutils.h>
 
+#include "document.h"
 #include "io/resource.h"
-#include <unistd.h>
 #include <cstring>
-#include "document.h"
+#include <unistd.h>
 
 #include <libxslt/transform.h>
 #include <libxslt/xsltutils.h>
diff --git a/src/extension/init.cpp b/src/extension/init.cpp
index 17c07ae1d..2edb8a087 100644
--- a/src/extension/init.cpp
+++ b/src/extension/init.cpp
@@ -28,27 +28,27 @@
 #include <glibmm/i18n.h>
 #include <glibmm/ustring.h>
 
-#include "system.h"
 #include "db.h"
-#include "internal/svgz.h"
-# include "internal/emf-inout.h"
-# include "internal/emf-print.h"
+#include "internal/emf-inout.h"
+#include "internal/emf-print.h"
+# include "internal/svgz.h"
 # include "internal/wmf-inout.h"
 # include "internal/wmf-print.h"
+# include "system.h"
 #ifdef HAVE_CAIRO_PDF
-# include "internal/cairo-renderer-pdf-out.h"
 # include "internal/cairo-png-out.h"
 # include "internal/cairo-ps-out.h"
+# include "internal/cairo-renderer-pdf-out.h"
 #endif
-#include "internal/pov-out.h"
-#include "internal/javafx-out.h"
-#include "internal/odf.h"
-#include "internal/latex-pstricks-out.h"
-#include "internal/latex-pstricks.h"
-#include "internal/gdkpixbuf-input.h"
 #include "internal/bluredge.h"
+#include "internal/gdkpixbuf-input.h"
 #include "internal/gimpgrad.h"
 #include "internal/grid.h"
+#include "internal/javafx-out.h"
+#include "internal/latex-pstricks-out.h"
+#include "internal/latex-pstricks.h"
+#include "internal/odf.h"
+#include "internal/pov-out.h"
 #ifdef WITH_LIBWPG
 #include "internal/wpg-input.h"
 #endif
@@ -58,15 +58,14 @@
 #ifdef WITH_LIBCDR
 #include "internal/cdr-input.h"
 #endif
-#include "preferences.h"
-#include "io/sys.h"
 #include "io/resource.h"
+#include "io/sys.h"
+#include "preferences.h"
 #ifdef WITH_DBUS
 #include "dbus/dbus-init.h"
 #endif
 
 #ifdef WITH_IMAGE_MAGICK
-#include <Magick++.h>
 #include "internal/bitmap/adaptiveThreshold.h"
 #include "internal/bitmap/addNoise.h"
 #include "internal/bitmap/blur.h"
@@ -99,6 +98,7 @@
 #include "internal/bitmap/solarize.h"
 #include "internal/bitmap/spread.h"
 #include "internal/bitmap/swirl.h"
+#include <Magick++.h>
 //#include "internal/bitmap/threshold.h"
 #include "internal/bitmap/unsharpmask.h"
 #include "internal/bitmap/wave.h"
diff --git a/src/extension/input.cpp b/src/extension/input.cpp
index 862d4a4d3..1d154496d 100644
--- a/src/extension/input.cpp
+++ b/src/extension/input.cpp
@@ -12,8 +12,8 @@
 
 #include "prefdialog.h"
 #include "implementation/implementation.h"
-#include "timer.h"
 #include "input.h"
+#include "timer.h"
 
 /* Inkscape::Extension::Input */
 
diff --git a/src/extension/internal/bitmap/colorize.cpp b/src/extension/internal/bitmap/colorize.cpp
index 1c4b8a696..e0db0ca71 100644
--- a/src/extension/internal/bitmap/colorize.cpp
+++ b/src/extension/internal/bitmap/colorize.cpp
@@ -15,8 +15,8 @@
 
 #include "color.h"
 
-#include <iostream>
 #include <Magick++.h>
+#include <iostream>
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/bitmap/crop.cpp b/src/extension/internal/bitmap/crop.cpp
index 99faef9d3..dee5f111b 100644
--- a/src/extension/internal/bitmap/crop.cpp
+++ b/src/extension/internal/bitmap/crop.cpp
@@ -10,9 +10,9 @@
 #include "extension/system.h"
 
 #include "crop.h"
-#include "selection-chemistry.h"
-#include "object/sp-item.h"
 #include "object/sp-item-transform.h"
+#include "object/sp-item.h"
+#include "selection-chemistry.h"
 #include <Magick++.h>
 
 namespace Inkscape {
diff --git a/src/extension/internal/bitmap/imagemagick.cpp b/src/extension/internal/bitmap/imagemagick.cpp
index 636b9d6a4..f32afa2e5 100644
--- a/src/extension/internal/bitmap/imagemagick.cpp
+++ b/src/extension/internal/bitmap/imagemagick.cpp
@@ -14,8 +14,8 @@
 
 #include <libintl.h>
 
-#include <gtkmm/box.h>
 #include <gtkmm/adjustment.h>
+#include <gtkmm/box.h>
 #include <gtkmm/spinbutton.h>
 
 #include <glib/gstdio.h>
diff --git a/src/extension/internal/bluredge.cpp b/src/extension/internal/bluredge.cpp
index f04007d00..f446227cc 100644
--- a/src/extension/internal/bluredge.cpp
+++ b/src/extension/internal/bluredge.cpp
@@ -12,15 +12,15 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <vector>
 #include "desktop.h"
 #include "document.h"
-#include "selection.h"
-#include "helper/action.h"
 #include "helper/action-context.h"
-#include "preferences.h"
-#include "path-chemistry.h"
+#include "helper/action.h"
 #include "object/sp-item.h"
+#include "path-chemistry.h"
+#include "preferences.h"
+#include "selection.h"
+#include <vector>
 
 #include "extension/effect.h"
 #include "extension/system.h"
diff --git a/src/extension/internal/cairo-png-out.cpp b/src/extension/internal/cairo-png-out.cpp
index 3cdbee8c1..c4d33252d 100644
--- a/src/extension/internal/cairo-png-out.cpp
+++ b/src/extension/internal/cairo-png-out.cpp
@@ -22,20 +22,20 @@
 #include "cairo-png-out.h"
 #include "cairo-render-context.h"
 #include "cairo-renderer.h"
-#include <print.h>
-#include "extension/system.h"
-#include "extension/print.h"
+#include "display/drawing.h"
 #include "extension/db.h"
 #include "extension/output.h"
-#include "display/drawing.h"
+#include "extension/print.h"
+#include "extension/system.h"
+#include <print.h>
 
-#include "display/curve.h"
 #include "display/canvas-bpath.h"
+#include "display/curve.h"
 #include "object/sp-item.h"
 #include "object/sp-root.h"
 
-#include "io/sys.h"
 #include "document.h"
+#include "io/sys.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp
index 287cf636f..08c748175 100644
--- a/src/extension/internal/cairo-ps-out.cpp
+++ b/src/extension/internal/cairo-ps-out.cpp
@@ -24,21 +24,21 @@
 #include "cairo-ps-out.h"
 #include "cairo-render-context.h"
 #include "cairo-renderer.h"
-#include "latex-text-renderer.h"
-#include <print.h>
-#include "extension/system.h"
-#include "extension/print.h"
+#include "display/drawing.h"
 #include "extension/db.h"
 #include "extension/output.h"
-#include "display/drawing.h"
+#include "extension/print.h"
+#include "extension/system.h"
+#include "latex-text-renderer.h"
+#include <print.h>
 
-#include "display/curve.h"
 #include "display/canvas-bpath.h"
+#include "display/curve.h"
 #include "object/sp-item.h"
 #include "object/sp-root.h"
 
-#include "io/sys.h"
 #include "document.h"
+#include "io/sys.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp
index 1878b2c89..8bdf25ee4 100644
--- a/src/extension/internal/cairo-render-context.cpp
+++ b/src/extension/internal/cairo-render-context.cpp
@@ -25,26 +25,26 @@
 #endif
 
 
-#include <signal.h>
-#include <errno.h>
 #include <2geom/pathvector.h>
+#include <errno.h>
+#include <signal.h>
 
 #include <glib.h>
 
-#include <glibmm/i18n.h>
-#include "display/drawing.h"
-#include "display/curve.h"
-#include "display/canvas-bpath.h"
 #include "display/cairo-utils.h"
-#include "object/sp-item.h"
-#include "object/sp-item-group.h"
+#include "display/canvas-bpath.h"
+#include "display/curve.h"
+#include "display/drawing.h"
+#include "object/sp-clippath.h"
 #include "object/sp-hatch.h"
+#include "object/sp-item-group.h"
+#include "object/sp-item.h"
 #include "object/sp-linear-gradient.h"
-#include "object/sp-radial-gradient.h"
+#include "object/sp-mask.h"
 #include "object/sp-mesh-gradient.h"
 #include "object/sp-pattern.h"
-#include "object/sp-mask.h"
-#include "object/sp-clippath.h"
+#include "object/sp-radial-gradient.h"
+#include <glibmm/i18n.h>
 
 #include "util/units.h"
 #ifdef WIN32
diff --git a/src/extension/internal/cairo-renderer-pdf-out.cpp b/src/extension/internal/cairo-renderer-pdf-out.cpp
index 5b9759c15..91e152706 100644
--- a/src/extension/internal/cairo-renderer-pdf-out.cpp
+++ b/src/extension/internal/cairo-renderer-pdf-out.cpp
@@ -23,21 +23,21 @@
 #include "cairo-renderer-pdf-out.h"
 #include "cairo-render-context.h"
 #include "cairo-renderer.h"
-#include "latex-text-renderer.h"
-#include <print.h>
-#include "extension/system.h"
-#include "extension/print.h"
+#include "display/drawing.h"
 #include "extension/db.h"
 #include "extension/output.h"
-#include "display/drawing.h"
+#include "extension/print.h"
+#include "extension/system.h"
+#include "latex-text-renderer.h"
+#include <print.h>
 
-#include "display/curve.h"
 #include "display/canvas-bpath.h"
+#include "display/curve.h"
 #include "object/sp-item.h"
 #include "object/sp-root.h"
 
-#include <2geom/affine.h>
 #include "document.h"
+#include <2geom/affine.h>
 
 #include "util/units.h"
 
diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp
index b48be2ed7..ecaeeb5d2 100644
--- a/src/extension/internal/cairo-renderer.cpp
+++ b/src/extension/internal/cairo-renderer.cpp
@@ -25,48 +25,48 @@
 #endif
 
 
-#include <signal.h>
 #include <errno.h>
+#include <signal.h>
 
 #include "libnrtype/Layout-TNG.h"
-#include <2geom/transforms.h>
 #include <2geom/pathvector.h>
+#include <2geom/transforms.h>
 
 #include <glib.h>
 
-#include <glibmm/i18n.h>
-#include "display/curve.h"
-#include "display/canvas-bpath.h"
 #include "display/cairo-utils.h"
-#include "object/sp-item.h"
+#include "display/canvas-bpath.h"
+#include "display/curve.h"
+#include "object/sp-clippath.h"
+#include "object/sp-flowtext.h"
+#include "object/sp-hatch-path.h"
+#include "object/sp-image.h"
 #include "object/sp-item-group.h"
-#include "object/sp-marker.h"
+#include "object/sp-item.h"
 #include "object/sp-linear-gradient.h"
+#include "object/sp-marker.h"
+#include "object/sp-mask.h"
+#include "object/sp-pattern.h"
 #include "object/sp-radial-gradient.h"
 #include "object/sp-root.h"
 #include "object/sp-shape.h"
-#include "object/sp-use.h"
-#include "object/sp-text.h"
-#include "object/sp-flowtext.h"
-#include "object/sp-hatch-path.h"
-#include "object/sp-image.h"
 #include "object/sp-symbol.h"
-#include "object/sp-pattern.h"
-#include "object/sp-mask.h"
-#include "object/sp-clippath.h"
+#include "object/sp-text.h"
+#include "object/sp-use.h"
+#include <glibmm/i18n.h>
 
-#include "util/units.h"
-#include "helper/png-write.h"
 #include "helper/pixbuf-ops.h"
+#include "helper/png-write.h"
+#include "util/units.h"
 
-#include "cairo-renderer.h"
 #include "cairo-render-context.h"
+#include "cairo-renderer.h"
 #include "extension/system.h"
 
 #include "io/sys.h"
 
-#include <cairo.h>
 #include "document.h"
+#include <cairo.h>
 
 // include support for only the compiled-in surface types
 #ifdef CAIRO_HAS_PDF_SURFACE
diff --git a/src/extension/internal/cdr-input.cpp b/src/extension/internal/cdr-input.cpp
index bfba67282..00165032d 100644
--- a/src/extension/internal/cdr-input.cpp
+++ b/src/extension/internal/cdr-input.cpp
@@ -13,15 +13,15 @@
  *
  */
 
-#include <stdio.h>
 #include "config.h"
+#include <stdio.h>
 
 #include "cdr-input.h"
 
 #ifdef WITH_LIBCDR
 
-#include <string>
 #include <cstring>
+#include <string>
 
 #include <libcdr/libcdr.h>
 
@@ -43,11 +43,11 @@
 #include <gtkmm/grid.h>
 #include <gtkmm/spinbutton.h>
 
-#include "extension/system.h"
 #include "extension/input.h"
+#include "extension/system.h"
 
-#include "document.h"
 #include "document-private.h"
+#include "document.h"
 #include "inkscape.h"
 
 #include "ui/dialog-events.h"
diff --git a/src/extension/internal/emf-inout.cpp b/src/extension/internal/emf-inout.cpp
index 54099271b..f5335eaf6 100644
--- a/src/extension/internal/emf-inout.cpp
+++ b/src/extension/internal/emf-inout.cpp
@@ -27,29 +27,29 @@
 # include "config.h"
 #endif
 
+#include <3rdparty/libuemf/symbol_convert.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdint.h>
-#include <3rdparty/libuemf/symbol_convert.h>
 
+#include "clear-n_.h"
+#include "display/drawing-item.h"
+#include "display/drawing.h"
 #include "document.h"
-#include "object/sp-root.h"
-#include "object/sp-path.h"
-#include "print.h"
-#include "extension/system.h"
-#include "extension/print.h"
 #include "extension/db.h"
 #include "extension/input.h"
 #include "extension/output.h"
-#include "display/drawing.h"
-#include "display/drawing-item.h"
-#include "clear-n_.h"
+#include "extension/print.h"
+#include "extension/system.h"
+#include "inkscape.h"   // even though it is included indirectly by emf-inout.h
+#include "object/sp-path.h"
+#include "object/sp-root.h"
+#include "print.h"
 #include "svg/svg.h"
 #include "util/units.h" // even though it is included indirectly by emf-inout.h
-#include "inkscape.h"   // even though it is included indirectly by emf-inout.h
 
-#include "emf-print.h"
 #include "emf-inout.h"
+#include "emf-print.h"
 
 #define PRINT_EMF "org.inkscape.print.emf"
 
diff --git a/src/extension/internal/emf-print.cpp b/src/extension/internal/emf-print.cpp
index 0b005f8da..dedd241a5 100644
--- a/src/extension/internal/emf-print.cpp
+++ b/src/extension/internal/emf-print.cpp
@@ -26,42 +26,42 @@
 # include "config.h"
 #endif
 
-#include <string.h>
-#include <glibmm/miscutils.h>
-#include <3rdparty/libuemf/symbol_convert.h>
-#include <2geom/sbasis-to-bezier.h>
+#include <2geom/curves.h>
 #include <2geom/path.h>
 #include <2geom/pathvector.h>
 #include <2geom/rect.h>
-#include <2geom/curves.h>
+#include <2geom/sbasis-to-bezier.h>
+#include <3rdparty/libuemf/symbol_convert.h>
+#include <glibmm/miscutils.h>
+#include <string.h>
 
-#include "helper/geom.h"
 #include "helper/geom-curves.h"
+#include "helper/geom.h"
 #include "util/units.h"
 
 #include "inkscape-version.h"
 
-#include "extension/system.h"
-#include "extension/print.h"
 #include "document.h"
+#include "extension/print.h"
+#include "extension/system.h"
 #include "path-prefix.h"
 
-#include "object/sp-pattern.h"
-#include "object/sp-image.h"
+#include "display/cairo-utils.h"
+#include "object/sp-clippath.h"
 #include "object/sp-gradient.h"
-#include "object/sp-radial-gradient.h"
-#include "object/sp-linear-gradient.h"
+#include "object/sp-image.h"
 #include "object/sp-item.h"
+#include "object/sp-linear-gradient.h"
+#include "object/sp-pattern.h"
+#include "object/sp-radial-gradient.h"
 #include "object/sp-root.h"
 #include "object/sp-shape.h"
-#include "object/sp-clippath.h"
 #include "style.h"
-#include "display/cairo-utils.h"
 
-#include "splivarot.h"             // pieces for union on shapes
 #include "2geom/svg-path-parser.h" // to get from SVG text to Geom::Path
-#include "display/canvas-bpath.h"  // for SPWindRule
 #include "display/cairo-utils.h"  // for Inkscape::Pixbuf::PF_CAIRO
+#include "display/canvas-bpath.h"  // for SPWindRule
+#include "splivarot.h"             // pieces for union on shapes
 
 #include "emf-print.h"
 
diff --git a/src/extension/internal/filter/filter-file.cpp b/src/extension/internal/filter/filter-file.cpp
index c18879430..962381da6 100644
--- a/src/extension/internal/filter/filter-file.cpp
+++ b/src/extension/internal/filter/filter-file.cpp
@@ -7,21 +7,21 @@
 
 #include "filter.h"
 
-#include "io/sys.h"
-#include "io/resource.h"
 #include "io/inkscapestream.h"
+#include "io/resource.h"
+#include "io/sys.h"
 
 /* Directory includes */
-#include "path-prefix.h"
 #include "inkscape.h"
+#include "path-prefix.h"
 
 /* Extension */
 #include "extension/extension.h"
 #include "extension/system.h"
 
 /* System includes */
-#include <glibmm/i18n.h>
 #include <glibmm/fileutils.h>
+#include <glibmm/i18n.h>
 
 using namespace Inkscape::IO::Resource;
 
diff --git a/src/extension/internal/filter/filter.cpp b/src/extension/internal/filter/filter.cpp
index 166e5406f..99dfffc6c 100644
--- a/src/extension/internal/filter/filter.cpp
+++ b/src/extension/internal/filter/filter.cpp
@@ -8,15 +8,15 @@
  */
 
 #include "desktop.h"
-#include "selection.h"
 #include "document-private.h"
-#include "extension/extension.h"
 #include "extension/effect.h"
+#include "extension/extension.h"
 #include "extension/system.h"
+#include "object/sp-defs.h"
+#include "selection.h"
+#include "xml/attribute-record.h"
 #include "xml/repr.h"
 #include "xml/simple-node.h"
-#include "xml/attribute-record.h"
-#include "object/sp-defs.h"
 
 #include "filter.h"
 
diff --git a/src/extension/internal/gdkpixbuf-input.cpp b/src/extension/internal/gdkpixbuf-input.cpp
index efac1a02e..7cfaded41 100644
--- a/src/extension/internal/gdkpixbuf-input.cpp
+++ b/src/extension/internal/gdkpixbuf-input.cpp
@@ -2,21 +2,21 @@
 #include <gdkmm/pixbuf.h>
 #include <gdkmm/pixbufformat.h>
 
-#include <glib/gprintf.h>
-#include <glibmm/i18n.h>
 #include "dir-util.h"
 #include "display/cairo-utils.h"
 #include "document-private.h"
 #include "document-undo.h"
 #include "extension/input.h"
 #include "extension/system.h"
-#include "image-resolution.h"
 #include "gdkpixbuf-input.h"
-#include "preferences.h"
-#include "selection-chemistry.h"
+#include "image-resolution.h"
 #include "object/sp-image.h"
 #include "object/sp-root.h"
+#include "preferences.h"
+#include "selection-chemistry.h"
 #include "util/units.h"
+#include <glib/gprintf.h>
+#include <glibmm/i18n.h>
 #include <set>
 
 namespace Inkscape {
diff --git a/src/extension/internal/gimpgrad.cpp b/src/extension/internal/gimpgrad.cpp
index e6a429d34..fbae04ca5 100644
--- a/src/extension/internal/gimpgrad.cpp
+++ b/src/extension/internal/gimpgrad.cpp
@@ -16,17 +16,17 @@
 # include <config.h>
 #endif
 
-#include <color-rgba.h>
 #include "io/sys.h"
 #include "extension/system.h"
 #include "svg/css-ostringstream.h"
 #include "svg/svg-color.h"
+#include <color-rgba.h>
 
+#include "document.h"
+#include "extension/extension.h"
 #include "gimpgrad.h"
 #include "streq.h"
 #include "strneq.h"
-#include "document.h"
-#include "extension/extension.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/grid.cpp b/src/extension/internal/grid.cpp
index c7ebf2494..e77525f1b 100644
--- a/src/extension/internal/grid.cpp
+++ b/src/extension/internal/grid.cpp
@@ -15,15 +15,15 @@
 # include <config.h>
 #endif
 
-#include <gtkmm/box.h>
 #include <gtkmm/adjustment.h>
+#include <gtkmm/box.h>
 #include <gtkmm/spinbutton.h>
 
 #include "desktop.h"
 
+#include "2geom/geom.h"
 #include "document.h"
 #include "selection.h"
-#include "2geom/geom.h"
 
 #include "svg/path-string.h"
 
diff --git a/src/extension/internal/javafx-out.cpp b/src/extension/internal/javafx-out.cpp
index d4666fcee..7608454e7 100644
--- a/src/extension/internal/javafx-out.cpp
+++ b/src/extension/internal/javafx-out.cpp
@@ -21,31 +21,31 @@
 # include <config.h>
 #endif
 
-#include <glibmm/miscutils.h>
+#include "helper/geom-curves.h"
+#include "helper/geom.h"
 #include "javafx-out.h"
-#include <inkscape.h>
-#include <inkscape-version.h>
-#include <display/curve.h>
-#include <display/canvas-bpath.h>
-#include <svg/svg.h>
-#include <extension/system.h>
+#include <2geom/curves.h>
 #include <2geom/pathvector.h>
 #include <2geom/rect.h>
-#include <2geom/curves.h>
-#include "helper/geom.h"
-#include "helper/geom-curves.h"
+#include <display/canvas-bpath.h>
+#include <display/curve.h>
+#include <extension/system.h>
+#include <glibmm/miscutils.h>
+#include <inkscape-version.h>
+#include <inkscape.h>
 #include <io/sys.h>
+#include <svg/svg.h>
 
-#include "object/sp-root.h"
-#include "object/sp-path.h"
 #include "object/sp-linear-gradient.h"
+#include "object/sp-path.h"
 #include "object/sp-radial-gradient.h"
+#include "object/sp-root.h"
 #include "style.h"
 
-#include <string>
-#include <stdio.h>
-#include <stdarg.h>
 #include "extension/extension.h"
+#include <stdarg.h>
+#include <stdio.h>
+#include <string>
 
 
 namespace Inkscape
diff --git a/src/extension/internal/latex-pstricks-out.cpp b/src/extension/internal/latex-pstricks-out.cpp
index 0581f8edd..8d2e67c43 100644
--- a/src/extension/internal/latex-pstricks-out.cpp
+++ b/src/extension/internal/latex-pstricks-out.cpp
@@ -13,12 +13,12 @@
 # include <config.h>
 #endif
 #include "latex-pstricks-out.h"
-#include <print.h>
-#include "extension/system.h"
-#include "extension/print.h"
-#include "extension/db.h"
 #include "display/drawing.h"
+#include "extension/db.h"
+#include "extension/print.h"
+#include "extension/system.h"
 #include "object/sp-root.h"
+#include <print.h>
 
 
 #include "document.h"
diff --git a/src/extension/internal/latex-pstricks.cpp b/src/extension/internal/latex-pstricks.cpp
index 83100d11e..23dcd002f 100644
--- a/src/extension/internal/latex-pstricks.cpp
+++ b/src/extension/internal/latex-pstricks.cpp
@@ -15,21 +15,21 @@
 #endif
 
 
+#include "helper/geom-curves.h"
+#include "util/units.h"
+#include <2geom/curves.h>
 #include <2geom/pathvector.h>
 #include <2geom/sbasis-to-bezier.h>
-#include <2geom/curves.h>
 #include <errno.h>
 #include <signal.h>
-#include "util/units.h"
-#include "helper/geom-curves.h"
 
+#include "document.h"
 #include "extension/print.h"
 #include "extension/system.h"
 #include "inkscape-version.h"
 #include "io/sys.h"
 #include "latex-pstricks.h"
 #include "style.h"
-#include "document.h"
 #include <cstring>
 
 namespace Inkscape {
diff --git a/src/extension/internal/latex-text-renderer.cpp b/src/extension/internal/latex-text-renderer.cpp
index 85426e376..b16c78826 100644
--- a/src/extension/internal/latex-text-renderer.cpp
+++ b/src/extension/internal/latex-text-renderer.cpp
@@ -21,21 +21,21 @@
 
 #include "latex-text-renderer.h"
 
-#include <signal.h>
 #include <errno.h>
+#include <signal.h>
 
 #include "libnrtype/Layout-TNG.h"
-#include <2geom/transforms.h>
 #include <2geom/rect.h>
+#include <2geom/transforms.h>
 #include <glibmm/i18n.h>
 
-#include "object/sp-item.h"
+#include "object/sp-flowtext.h"
 #include "object/sp-item-group.h"
+#include "object/sp-item.h"
+#include "object/sp-rect.h"
 #include "object/sp-root.h"
-#include "object/sp-use.h"
 #include "object/sp-text.h"
-#include "object/sp-flowtext.h"
-#include "object/sp-rect.h"
+#include "object/sp-use.h"
 #include "style.h"
 
 #include "text-editing.h"
@@ -45,9 +45,9 @@
 #include "extension/output.h"
 #include "extension/system.h"
 
+#include "document.h"
 #include "inkscape-version.h"
 #include "io/sys.h"
-#include "document.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/metafile-inout.cpp b/src/extension/internal/metafile-inout.cpp
index ae79c8a8a..2d8d17cfe 100644
--- a/src/extension/internal/metafile-inout.cpp
+++ b/src/extension/internal/metafile-inout.cpp
@@ -18,18 +18,18 @@
 #include <glibmm/miscutils.h>
 
 #include "display/curve.h"
+#include "document-undo.h"
+#include "document.h"
 #include "extension/internal/metafile-inout.h" // picks up PNG
 #include "extension/print.h"
-#include "path-prefix.h"
-#include "document.h"
-#include "util/units.h"
-#include "ui/shape-editor.h"
-#include "document-undo.h"
 #include "inkscape.h"
+#include "path-prefix.h"
 #include "preferences.h"
+#include "ui/shape-editor.h"
+#include "util/units.h"
 
-#include "object/sp-root.h"
 #include "object/sp-namedview.h"
+#include "object/sp-root.h"
 #include "svg/stringstream.h"
 
 namespace Inkscape {
diff --git a/src/extension/internal/metafile-print.cpp b/src/extension/internal/metafile-print.cpp
index fb44f8499..43e605491 100644
--- a/src/extension/internal/metafile-print.cpp
+++ b/src/extension/internal/metafile-print.cpp
@@ -12,22 +12,22 @@
 # include "config.h"
 #endif
 
+#include <2geom/curves.h>
+#include <2geom/rect.h>
+#include <2geom/svg-path-parser.h>
 #include <cstring>
 #include <fstream>
 #include <glib.h>
 #include <glibmm/miscutils.h>
-#include <2geom/rect.h>
-#include <2geom/curves.h>
-#include <2geom/svg-path-parser.h>
 
 #include "extension/internal/metafile-print.h"
 #include "extension/print.h"
-#include "path-prefix.h"
 #include "object/sp-gradient.h"
 #include "object/sp-image.h"
 #include "object/sp-linear-gradient.h"
 #include "object/sp-pattern.h"
 #include "object/sp-radial-gradient.h"
+#include "path-prefix.h"
 #include "style.h"
 
 namespace Inkscape {
diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp
index 42c2bbae3..689bd0101 100644
--- a/src/extension/internal/odf.cpp
+++ b/src/extension/internal/odf.cpp
@@ -44,48 +44,48 @@
 #include "odf.h"
 
 //# System includes
+#include <math.h>
 #include <stdio.h>
 #include <time.h>
 #include <vector>
-#include <math.h>
 
 //# Inkscape includes
 #include "clear-n_.h"
-#include "inkscape.h"
 #include "display/curve.h"
-#include <2geom/pathvector.h>
+#include "extension/system.h"
+#include "helper/geom-curves.h"
+#include "inkscape.h"
 #include <2geom/curves.h>
+#include <2geom/pathvector.h>
 #include <2geom/transforms.h>
 #include <helper/geom.h>
-#include "helper/geom-curves.h"
-#include "extension/system.h"
 
-#include "xml/repr.h"
-#include "xml/attribute-record.h"
-#include "object/sp-image.h"
+#include "object/sp-flowtext.h"
 #include "object/sp-gradient.h"
-#include "object/sp-stop.h"
+#include "object/sp-image.h"
 #include "object/sp-linear-gradient.h"
-#include "object/sp-radial-gradient.h"
 #include "object/sp-path.h"
+#include "object/sp-radial-gradient.h"
+#include "object/sp-stop.h"
 #include "object/sp-text.h"
-#include "object/sp-flowtext.h"
 #include "object/uri.h"
 #include "style.h"
+#include "xml/attribute-record.h"
+#include "xml/repr.h"
 
 #include "svg/svg.h"
 #include "text-editing.h"
 #include "util/units.h"
 
 
-#include "inkscape-version.h"
 #include "document.h"
 #include "extension/extension.h"
+#include "inkscape-version.h"
 
-#include "io/inkscapestream.h"
 #include "io/bufferstream.h"
-#include <util/ziptool.h>
+#include "io/inkscapestream.h"
 #include <iomanip>
+#include <util/ziptool.h>
 namespace Inkscape
 {
 namespace Extension
diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
index 552051eed..1f37befaa 100644
--- a/src/extension/internal/pdfinput/pdf-input.cpp
+++ b/src/extension/internal/pdfinput/pdf-input.cpp
@@ -18,17 +18,17 @@
 #include "pdf-input.h"
 
 #ifdef HAVE_POPPLER
-#include <poppler/goo/GooString.h>
+#include <poppler/Catalog.h>
 #include <poppler/ErrorCodes.h>
 #include <poppler/GlobalParams.h>
 #include <poppler/PDFDoc.h>
 #include <poppler/Page.h>
-#include <poppler/Catalog.h>
+#include <poppler/goo/GooString.h>
 
 #ifdef HAVE_POPPLER_CAIRO
-#include <poppler/glib/poppler.h>
 #include <poppler/glib/poppler-document.h>
 #include <poppler/glib/poppler-page.h>
+#include <poppler/glib/poppler.h>
 #endif
 
 #include <gtkmm/checkbutton.h>
@@ -39,18 +39,18 @@
 #include <gtkmm/scale.h>
 
 #include <glibmm/convert.h>
+#include <glibmm/i18n.h>
 #include <glibmm/miscutils.h>
 #include <gtk/gtk.h>
-#include <glibmm/i18n.h>
 
 #include "ui/dialog-events.h"
-#include "ui/widget/spinbutton.h"
 #include "ui/widget/frame.h"
+#include "ui/widget/spinbutton.h"
 
-#include "extension/system.h"
 #include "extension/input.h"
-#include "svg-builder.h"
+#include "extension/system.h"
 #include "pdf-parser.h"
+#include "svg-builder.h"
 
 #include "document-private.h"
 #include "document-undo.h"
diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
index 6c498f981..2bc7ada12 100644
--- a/src/extension/internal/pdfinput/pdf-parser.cpp
+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
@@ -23,36 +23,36 @@
 
 extern "C" {
         
-#include <stdlib.h>
-#include <stdio.h>
+#include <math.h>
 #include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <math.h>
 
 }
 
-#include "svg-builder.h"
 #include "Gfx.h"
 #include "pdf-parser.h"
+#include "svg-builder.h"
 #include "util/units.h"
 
-#include "goo/gmem.h"
-#include "goo/GooTimer.h"
-#include "goo/GooHash.h"
-#include "GlobalParams.h"
-#include "CharTypes.h"
-#include "Object.h"
+#include "Annot.h"
 #include "Array.h"
+#include "CharTypes.h"
 #include "Dict.h"
-#include "Stream.h"
-#include "Lexer.h"
-#include "Parser.h"
+#include "Error.h"
 #include "GfxFont.h"
 #include "GfxState.h"
+#include "GlobalParams.h"
+#include "Lexer.h"
+#include "Object.h"
 #include "OutputDev.h"
 #include "Page.h"
-#include "Annot.h"
-#include "Error.h"
+#include "Parser.h"
+#include "Stream.h"
+#include "goo/GooHash.h"
+#include "goo/GooTimer.h"
+#include "goo/gmem.h"
 
 // the MSVC math.h doesn't define this
 #ifndef M_PI
diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
index 8e5a5f639..1f3c76b3a 100644
--- a/src/extension/internal/pdfinput/svg-builder.cpp
+++ b/src/extension/internal/pdfinput/svg-builder.cpp
@@ -19,34 +19,34 @@
 
 #ifdef HAVE_POPPLER
 
-#include "svg-builder.h"
 #include "pdf-parser.h"
+#include "svg-builder.h"
 
 #include <png.h>
 
-#include "document-private.h"
-#include "xml/document.h"
-#include "xml/node.h"
-#include "xml/repr.h"
-#include "svg/svg.h"
-#include "svg/path-string.h"
-#include "svg/css-ostringstream.h"
-#include "svg/svg-color.h"
 #include "color.h"
-#include "util/units.h"
-#include "io/stringstream.h"
-#include "io/base64stream.h"
 #include "display/nr-filter-utils.h"
+#include "document-private.h"
+#include "io/base64stream.h"
+#include "io/stringstream.h"
 #include "libnrtype/font-instance.h"
 #include "object/sp-defs.h"
+#include "svg/css-ostringstream.h"
+#include "svg/path-string.h"
+#include "svg/svg-color.h"
+#include "svg/svg.h"
+#include "util/units.h"
+#include "xml/document.h"
+#include "xml/node.h"
+#include "xml/repr.h"
 
 #include "Function.h"
-#include "GfxState.h"
 #include "GfxFont.h"
-#include "Stream.h"
+#include "GfxState.h"
+#include "GlobalParams.h"
 #include "Page.h"
+#include "Stream.h"
 #include "UnicodeMap.h"
-#include "GlobalParams.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/pov-out.cpp b/src/extension/internal/pov-out.cpp
index 15acb97ec..a53133e8d 100644
--- a/src/extension/internal/pov-out.cpp
+++ b/src/extension/internal/pov-out.cpp
@@ -22,26 +22,26 @@
 # include <config.h>
 #endif
 #include "pov-out.h"
-#include <inkscape.h>
-#include <inkscape-version.h>
-#include <display/curve.h>
-#include <extension/system.h>
+#include "helper/geom-curves.h"
+#include "helper/geom.h"
+#include <2geom/curves.h>
 #include <2geom/pathvector.h>
 #include <2geom/rect.h>
-#include <2geom/curves.h>
-#include "helper/geom.h"
-#include "helper/geom-curves.h"
+#include <display/curve.h>
+#include <extension/system.h>
+#include <inkscape-version.h>
+#include <inkscape.h>
 #include <io/sys.h>
 
-#include "object/sp-root.h"
 #include "object/sp-path.h"
+#include "object/sp-root.h"
 #include "style.h"
 
-#include <string>
-#include <stdio.h>
-#include <stdarg.h>
 #include "document.h"
 #include "extension/extension.h"
+#include <stdarg.h>
+#include <stdio.h>
+#include <string>
 
 
 namespace Inkscape
diff --git a/src/extension/internal/svg.cpp b/src/extension/internal/svg.cpp
index 7bf4f34e6..780f8d6bc 100644
--- a/src/extension/internal/svg.cpp
+++ b/src/extension/internal/svg.cpp
@@ -18,17 +18,17 @@
 # include <config.h>
 #endif
 
-#include <vector>
 #include <giomm/file.h>
+#include <vector>
 
 
-#include "svg.h"
-#include "file.h"
-#include "extension/system.h"
+#include "document.h"
 #include "extension/output.h"
+#include "extension/system.h"
+#include "file.h"
+#include "svg.h"
 #include "xml/attribute-record.h"
 #include "xml/simple-document.h"
-#include "document.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/vsd-input.cpp b/src/extension/internal/vsd-input.cpp
index 7c92a895d..6069fc2af 100644
--- a/src/extension/internal/vsd-input.cpp
+++ b/src/extension/internal/vsd-input.cpp
@@ -13,15 +13,15 @@
  *
  */
 
-#include <stdio.h>
 #include "config.h"
+#include <stdio.h>
 
 #include "vsd-input.h"
 
 #ifdef WITH_LIBVISIO
 
-#include <string>
 #include <cstring>
+#include <string>
 
 #include <libvisio/libvisio.h>
 
@@ -42,11 +42,11 @@
 
 #include <gtkmm/spinbutton.h>
 
-#include "extension/system.h"
 #include "extension/input.h"
+#include "extension/system.h"
 
-#include "document.h"
 #include "document-private.h"
+#include "document.h"
 #include "inkscape.h"
 
 #include "ui/dialog-events.h"
diff --git a/src/extension/internal/wmf-inout.cpp b/src/extension/internal/wmf-inout.cpp
index 45f59ec03..7d810b456 100644
--- a/src/extension/internal/wmf-inout.cpp
+++ b/src/extension/internal/wmf-inout.cpp
@@ -28,26 +28,26 @@
 #endif
 
 //#include <png.h>   //This must precede text_reassemble.h or it blows up in pngconf.h when compiling
+#include <3rdparty/libuemf/symbol_convert.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdint.h>
-#include <3rdparty/libuemf/symbol_convert.h>
 
+#include "clear-n_.h"
+#include "display/drawing-item.h"
+#include "display/drawing.h"
 #include "document.h"
-#include "object/sp-root.h" // even though it is included indirectly by wmf-inout.h
-#include "object/sp-path.h"
-#include "print.h"
-#include "extension/system.h"
-#include "extension/print.h"
 #include "extension/db.h"
 #include "extension/input.h"
 #include "extension/output.h"
-#include "display/drawing.h"
-#include "display/drawing-item.h"
-#include "clear-n_.h"
+#include "extension/print.h"
+#include "extension/system.h"
+#include "inkscape.h" // even though it is included indirectly by wmf-inout.h
+#include "object/sp-path.h"
+#include "object/sp-root.h" // even though it is included indirectly by wmf-inout.h
+#include "print.h"
 #include "svg/svg.h"
 #include "util/units.h" // even though it is included indirectly by wmf-inout.h
-#include "inkscape.h" // even though it is included indirectly by wmf-inout.h
 
 
 #include "wmf-inout.h"
diff --git a/src/extension/internal/wmf-print.cpp b/src/extension/internal/wmf-print.cpp
index cdc59298b..feb6e78de 100644
--- a/src/extension/internal/wmf-print.cpp
+++ b/src/extension/internal/wmf-print.cpp
@@ -29,42 +29,42 @@
 #endif
 
 
-#include <2geom/sbasis-to-bezier.h>
 #include <2geom/elliptical-arc.h>
+#include <2geom/sbasis-to-bezier.h>
 
+#include "helper/geom-curves.h"
+#include "helper/geom.h"
+#include <2geom/curves.h>
 #include <2geom/path.h>
 #include <2geom/pathvector.h>
 #include <2geom/rect.h>
-#include <2geom/curves.h>
-#include "helper/geom.h"
-#include "helper/geom-curves.h"
 
 #include "inkscape-version.h"
 
 #include "util/units.h"
 
-#include "extension/system.h"
-#include "extension/print.h"
 #include "document.h"
+#include "extension/print.h"
+#include "extension/system.h"
 #include "path-prefix.h"
 
-#include "object/sp-pattern.h"
-#include "object/sp-image.h"
 #include "object/sp-gradient.h"
-#include "object/sp-radial-gradient.h"
+#include "object/sp-image.h"
+#include "object/sp-item.h"
 #include "object/sp-linear-gradient.h"
+#include "object/sp-pattern.h"
+#include "object/sp-radial-gradient.h"
 #include "object/sp-root.h"
-#include "object/sp-item.h"
 
+#include "display/cairo-utils.h"   // for Inkscape::Pixbuf::PF_CAIRO
+#include "display/canvas-bpath.h"  // for SPWindRule
 #include "splivarot.h"             // pieces for union on shapes
 #include <2geom/svg-path-parser.h> // to get from SVG text to Geom::Path
-#include "display/canvas-bpath.h"  // for SPWindRule
-#include "display/cairo-utils.h"   // for Inkscape::Pixbuf::PF_CAIRO
 
 #include "wmf-print.h"
 
-#include <string.h>
 #include <3rdparty/libuemf/symbol_convert.h>
+#include <string.h>
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/wpg-input.cpp b/src/extension/internal/wpg-input.cpp
index 2f3bfe27b..8a4f0d24c 100644
--- a/src/extension/internal/wpg-input.cpp
+++ b/src/extension/internal/wpg-input.cpp
@@ -39,17 +39,17 @@
  * Corel Corporation or Corel Corporation Limited."
  */
 
-#include <stdio.h>
 #include "config.h"
+#include <stdio.h>
 
 #ifdef WITH_LIBWPG
 
-#include "wpg-input.h"
-#include "extension/system.h"
-#include "extension/input.h"
 #include "document.h"
+#include "extension/input.h"
+#include "extension/system.h"
 #include "object/sp-root.h"
 #include "util/units.h"
+#include "wpg-input.h"
 #include <cstring>
 
 // Take a guess and fallback to 0.2.x if no configure has run
diff --git a/src/extension/loader.cpp b/src/extension/loader.cpp
index 164a5cecf..0343fe28b 100644
--- a/src/extension/loader.cpp
+++ b/src/extension/loader.cpp
@@ -13,10 +13,10 @@
 
 #include <gmodule.h>
 
-#include "system.h"
-#include <string.h>
 #include "dependency.h"
 #include "inkscape-version.h"
+#include "system.h"
+#include <string.h>
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/param/bool.cpp b/src/extension/param/bool.cpp
index 80bc89138..1fe5d9eeb 100644
--- a/src/extension/param/bool.cpp
+++ b/src/extension/param/bool.cpp
@@ -12,13 +12,13 @@
 
 #include <gtkmm/adjustment.h>
 #include <gtkmm/box.h>
-#include <gtkmm/spinbutton.h>
 #include <gtkmm/checkbutton.h>
+#include <gtkmm/spinbutton.h>
 
-#include "xml/node.h"
 #include "../extension.h"
 #include "bool.h"
 #include "preferences.h"
+#include "xml/node.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/param/color.cpp b/src/extension/param/color.cpp
index 035c43ba8..0db3955f3 100644
--- a/src/extension/param/color.cpp
+++ b/src/extension/param/color.cpp
@@ -23,9 +23,9 @@
 #include "../extension.h"
 #include "color.h"
 
-#include <color.h>
-#include "ui/widget/color-notebook.h"
 #include "preferences.h"
+#include "ui/widget/color-notebook.h"
+#include <color.h>
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/param/description.cpp b/src/extension/param/description.cpp
index cf94918f7..ed89baae3 100644
--- a/src/extension/param/description.cpp
+++ b/src/extension/param/description.cpp
@@ -13,15 +13,15 @@
 # include "config.h"
 #endif
 
-#include <gtkmm/box.h>
-#include <gtkmm/label.h>
 #include <glibmm/i18n.h>
 #include <glibmm/markup.h>
 #include <glibmm/regex.h>
+#include <gtkmm/box.h>
+#include <gtkmm/label.h>
 
-#include "xml/node.h"
-#include "extension/extension.h"
 #include "description.h"
+#include "extension/extension.h"
+#include "xml/node.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/param/enum.cpp b/src/extension/param/enum.cpp
index ddcbb358b..353960746 100644
--- a/src/extension/param/enum.cpp
+++ b/src/extension/param/enum.cpp
@@ -18,15 +18,15 @@
 # include "config.h"
 #endif
 
+#include <glibmm/i18n.h>
 #include <gtkmm/box.h>
 #include <gtkmm/comboboxtext.h>
-#include <glibmm/i18n.h>
 
-#include "xml/node.h"
-#include "extension/extension.h"
 #include "document-private.h"
 #include "enum.h"
+#include "extension/extension.h"
 #include "preferences.h"
+#include "xml/node.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/param/float.cpp b/src/extension/param/float.cpp
index 1dd3f073b..205c95097 100644
--- a/src/extension/param/float.cpp
+++ b/src/extension/param/float.cpp
@@ -10,16 +10,16 @@
 # include "config.h"
 #endif
 
+#include "ui/widget/spin-scale.h"
+#include "ui/widget/spinbutton.h"
 #include <gtkmm/adjustment.h>
 #include <gtkmm/box.h>
 #include <gtkmm/scale.h>
-#include "ui/widget/spinbutton.h"
-#include "ui/widget/spin-scale.h"
 
-#include "xml/node.h"
 #include "extension/extension.h"
-#include "preferences.h"
 #include "float.h"
+#include "preferences.h"
+#include "xml/node.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/param/int.cpp b/src/extension/param/int.cpp
index 9ad9b591c..d762399d0 100644
--- a/src/extension/param/int.cpp
+++ b/src/extension/param/int.cpp
@@ -10,16 +10,16 @@
 # include "config.h"
 #endif
 
+#include "ui/widget/spin-scale.h"
+#include "ui/widget/spinbutton.h"
 #include <gtkmm/adjustment.h>
 #include <gtkmm/box.h>
 #include <gtkmm/scale.h>
-#include "ui/widget/spinbutton.h"
-#include "ui/widget/spin-scale.h"
 
-#include "xml/node.h"
 #include "extension/extension.h"
-#include "preferences.h"
 #include "int.h"
+#include "preferences.h"
+#include "xml/node.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/param/notebook.cpp b/src/extension/param/notebook.cpp
index e47644f45..6b705877a 100644
--- a/src/extension/param/notebook.cpp
+++ b/src/extension/param/notebook.cpp
@@ -18,16 +18,16 @@
 
 #include <gtkmm/adjustment.h>
 #include <gtkmm/box.h>
-#include <gtkmm/spinbutton.h>
 #include <gtkmm/notebook.h>
+#include <gtkmm/spinbutton.h>
 
 #include <glibmm/i18n.h>
 
 #include <xml/node.h>
 
-#include <extension/extension.h>
-#include "preferences.h"
 #include "document-private.h"
+#include "preferences.h"
+#include <extension/extension.h>
 
 #include "notebook.h"
 
diff --git a/src/extension/param/parameter.cpp b/src/extension/param/parameter.cpp
index 7220045c4..aba31d1a4 100644
--- a/src/extension/param/parameter.cpp
+++ b/src/extension/param/parameter.cpp
@@ -24,12 +24,11 @@
 #include "ui/widget/color-notebook.h"
 #include <xml/node.h>
 
-#include <extension/extension.h>
 #include "document-private.h"
 #include "object/sp-defs.h"
 #include <color.h>
+#include <extension/extension.h>
 
-#include "parameter.h"
 #include "bool.h"
 #include "color.h"
 #include "description.h"
@@ -37,6 +36,7 @@
 #include "float.h"
 #include "int.h"
 #include "notebook.h"
+#include "parameter.h"
 #include "radiobutton.h"
 #include "string.h"
 
diff --git a/src/extension/param/radiobutton.cpp b/src/extension/param/radiobutton.cpp
index 890b92219..86fd528dd 100644
--- a/src/extension/param/radiobutton.cpp
+++ b/src/extension/param/radiobutton.cpp
@@ -18,15 +18,15 @@
 # include "config.h"
 #endif
 
+#include <glibmm/i18n.h>
 #include <gtkmm/box.h>
 #include <gtkmm/comboboxtext.h>
 #include <gtkmm/radiobutton.h>
-#include <glibmm/i18n.h>
 
-#include "xml/node.h"
+#include "document-private.h"
 #include "extension/extension.h"
 #include "preferences.h"
-#include "document-private.h"
+#include "xml/node.h"
 
 #include "radiobutton.h"
 
diff --git a/src/extension/param/string.cpp b/src/extension/param/string.cpp
index 51b5dfdf3..f16d7ccaf 100644
--- a/src/extension/param/string.cpp
+++ b/src/extension/param/string.cpp
@@ -16,10 +16,10 @@
 
 #include <glibmm/value.h>
 
-#include "xml/node.h"
 #include "extension/extension.h"
-#include "string.h"
 #include "preferences.h"
+#include "string.h"
+#include "xml/node.h"
 #include <glibmm/i18n.h>
 
 namespace Inkscape {
diff --git a/src/extension/patheffect.cpp b/src/extension/patheffect.cpp
index 1e9e093ef..634035043 100644
--- a/src/extension/patheffect.cpp
+++ b/src/extension/patheffect.cpp
@@ -9,8 +9,8 @@
 
 #include "document-private.h"
 
-#include "patheffect.h"
 #include "db.h"
+#include "patheffect.h"
 
 #include "object/sp-defs.h"
 
diff --git a/src/extension/prefdialog.cpp b/src/extension/prefdialog.cpp
index 0247e18e9..3ec08f7c5 100644
--- a/src/extension/prefdialog.cpp
+++ b/src/extension/prefdialog.cpp
@@ -8,16 +8,16 @@
  */
 
 #include "prefdialog.h"
+#include <glibmm/i18n.h>
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/separator.h>
-#include <glibmm/i18n.h>
 
 #include "ui/dialog-events.h"
 #include "xml/repr.h"
 
 // Used to get SP_ACTIVE_DESKTOP
-#include "inkscape.h"
 #include "desktop.h"
+#include "inkscape.h"
 
 #include "effect.h"
 #include "implementation/implementation.h"
diff --git a/src/extension/system.cpp b/src/extension/system.cpp
index f438d84b9..f35cd559c 100644
--- a/src/extension/system.cpp
+++ b/src/extension/system.cpp
@@ -22,22 +22,22 @@
 
 #include "ui/interface.h"
 
-#include "system.h"
-#include "preferences.h"
-#include "extension.h"
 #include "db.h"
-#include "input.h"
-#include "output.h"
+#include "document-undo.h"
 #include "effect.h"
-#include "patheffect.h"
-#include "print.h"
+#include "extension.h"
 #include "implementation/script.h"
 #include "implementation/xslt.h"
-#include "xml/rebase-hrefs.h"
-#include "io/sys.h"
 #include "inkscape.h"
-#include "document-undo.h"
+#include "input.h"
+#include "io/sys.h"
 #include "loader.h"
+#include "output.h"
+#include "patheffect.h"
+#include "preferences.h"
+#include "print.h"
+#include "system.h"
+#include "xml/rebase-hrefs.h"
 
 #include <glibmm/miscutils.h>
 
diff --git a/src/extract-uri.cpp b/src/extract-uri.cpp
index a25c8bb70..50ecfcd6a 100644
--- a/src/extract-uri.cpp
+++ b/src/extract-uri.cpp
@@ -1,5 +1,5 @@
-#include <string.h>
 #include <glib.h>
+#include <string.h>
 
 #include "extract-uri.h"
 
diff --git a/src/file-update.cpp b/src/file-update.cpp
index 0585fa875..fe78981f9 100644
--- a/src/file-update.cpp
+++ b/src/file-update.cpp
@@ -30,8 +30,8 @@
 
 #include "display/canvas-grid.h"
 
-#include "extension/effect.h"
 #include "extension/db.h"
+#include "extension/effect.h"
 #include "extension/input.h"
 #include "extension/output.h"
 #include "extension/system.h"
diff --git a/src/filter-chemistry.cpp b/src/filter-chemistry.cpp
index 2ab7aff48..700aff708 100644
--- a/src/filter-chemistry.cpp
+++ b/src/filter-chemistry.cpp
@@ -17,17 +17,17 @@
 #include <cstring>
 #include <glibmm.h>
 
-#include "document-private.h"
 #include "desktop-style.h"
+#include "document-private.h"
 
 #include "filter-chemistry.h"
 #include "filter-enums.h"
 
+#include "object/filters/blend.h"
+#include "object/filters/gaussian-blur.h"
 #include "object/sp-defs.h"
 #include "object/sp-item.h"
 #include "style.h"
-#include "object/filters/blend.h"
-#include "object/filters/gaussian-blur.h"
 
 /**
  * Count how many times the filter is used by the styles of o and its
diff --git a/src/gc-anchored.cpp b/src/gc-anchored.cpp
index 3ce6eff7b..aa7acd1a0 100644
--- a/src/gc-anchored.cpp
+++ b/src/gc-anchored.cpp
@@ -9,12 +9,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <typeinfo>
 #include "gc-anchored.h"
+#include "debug/demangle.h"
 #include "debug/event-tracker.h"
 #include "debug/simple-event.h"
-#include "debug/demangle.h"
 #include "util/format.h"
+#include <typeinfo>
 
 namespace Inkscape {
 
diff --git a/src/gc-finalized.cpp b/src/gc-finalized.cpp
index 1deadcb1f..fdbc2bd1a 100644
--- a/src/gc-finalized.cpp
+++ b/src/gc-finalized.cpp
@@ -13,11 +13,11 @@
  *
  */
 
-#include <typeinfo>
 #include "debug/simple-event.h"
 #include "debug/event-tracker.h"
-#include "util/format.h"
 #include "gc-finalized.h"
+#include "util/format.h"
+#include <typeinfo>
 
 namespace Inkscape {
 
diff --git a/src/gradient-chemistry.cpp b/src/gradient-chemistry.cpp
index 110aa8b38..cfea9fed8 100644
--- a/src/gradient-chemistry.cpp
+++ b/src/gradient-chemistry.cpp
@@ -20,10 +20,10 @@
 
 #include <glibmm/i18n.h>
 
-#include <2geom/transforms.h>
 #include <2geom/bezier-curve.h>
 #include <2geom/crossing.h>
 #include <2geom/line.h>
+#include <2geom/transforms.h>
 
 #include "desktop-style.h"
 #include "desktop.h"
@@ -44,9 +44,9 @@
 #include "object/sp-tspan.h"
 #include "style.h"
 
-#include "svg/svg.h"
-#include "svg/svg-color.h"
 #include "svg/css-ostringstream.h"
+#include "svg/svg-color.h"
+#include "svg/svg.h"
 
 #include "ui/tools/tool-base.h"
 
diff --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp
index a67d18e9f..f1ee7037a 100644
--- a/src/gradient-drag.cpp
+++ b/src/gradient-drag.cpp
@@ -2117,10 +2117,10 @@ void GrDrag::addCurve(SPItem *item, Geom::Point p0, Geom::Point p1, Geom::Point
     GrDragger* dragger1 = getDraggerFor(item, POINT_MG_CORNER, corner1, fill_or_stroke);
     GrDragger* dragger2 = getDraggerFor(item, POINT_MG_HANDLE, handle0, fill_or_stroke);
     GrDragger* dragger3 = getDraggerFor(item, POINT_MG_HANDLE, handle1, fill_or_stroke);
-    if (dragger0->knot && (dragger0->knot->flags & SP_KNOT_MOUSEOVER) ||
-        dragger1->knot && (dragger1->knot->flags & SP_KNOT_MOUSEOVER) ||
-        dragger2->knot && (dragger2->knot->flags & SP_KNOT_MOUSEOVER) ||
-        dragger3->knot && (dragger3->knot->flags & SP_KNOT_MOUSEOVER) ) {
+    if ((dragger0->knot && (dragger0->knot->flags & SP_KNOT_MOUSEOVER)) ||
+        (dragger1->knot && (dragger1->knot->flags & SP_KNOT_MOUSEOVER)) ||
+        (dragger2->knot && (dragger2->knot->flags & SP_KNOT_MOUSEOVER)) ||
+        (dragger3->knot && (dragger3->knot->flags & SP_KNOT_MOUSEOVER)) ) {
         highlight = true;
     }
 
@@ -2215,9 +2215,9 @@ void GrDrag::addDraggersMesh(SPMeshGradient *mg, SPItem *item, Inkscape::PaintTa
     // Show/hide mesh on fill/stroke. This doesn't work at the moment... and prevents node color updating.
     
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    bool show_handles = abs(prefs->getBool("/tools/mesh/show_handles", true));
-    bool edit_fill    = abs(prefs->getBool("/tools/mesh/edit_fill",    true));
-    bool edit_stroke  = abs(prefs->getBool("/tools/mesh/edit_stroke",  true));
+    bool show_handles = (prefs->getBool("/tools/mesh/show_handles", true));
+    bool edit_fill    = (prefs->getBool("/tools/mesh/edit_fill",    true));
+    bool edit_stroke  = (prefs->getBool("/tools/mesh/edit_stroke",  true));
 
     // Make sure we have at least one patch defined.
     if( mg->array.patch_rows() == 0 || mg->array.patch_columns() == 0 ) {
@@ -2301,7 +2301,7 @@ void GrDrag::refreshDraggersMesh(SPMeshGradient *mg, SPItem *item, Inkscape::Pai
     std::vector< std::vector< SPMeshNode* > > nodes = mg->array.nodes;
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    bool show_handles = abs(prefs->getBool("/tools/mesh/show_handles", true));
+    bool show_handles = (prefs->getBool("/tools/mesh/show_handles", true));
 
     // Make sure we have at least one patch defined.
     if( mg->array.patch_rows() == 0 || mg->array.patch_columns() == 0 ) {
@@ -2539,7 +2539,7 @@ void GrDrag::updateLines()
                 } else if ( SP_IS_MESHGRADIENT(server) ) {
 
                     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-                    bool edit_fill    = abs(prefs->getBool("/tools/mesh/edit_fill",    true));
+                    bool edit_fill    = (prefs->getBool("/tools/mesh/edit_fill",    true));
 
                     SPMeshGradient *mg = SP_MESHGRADIENT(server);
 
@@ -2621,7 +2621,7 @@ void GrDrag::updateLines()
                 } else if ( SP_IS_MESHGRADIENT(server) ) {
 
                     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-                    bool edit_stroke   = abs(prefs->getBool("/tools/mesh/edit_stroke",   true));
+                    bool edit_stroke   = (prefs->getBool("/tools/mesh/edit_stroke",   true));
 
                     if (edit_stroke) {
 
diff --git a/src/helper/action-context.cpp b/src/helper/action-context.cpp
index 1ea12776b..b8430902b 100644
--- a/src/helper/action-context.cpp
+++ b/src/helper/action-context.cpp
@@ -11,9 +11,9 @@
 
 #include "desktop.h"
 #include "document.h"
+#include "helper/action-context.h"
 #include "layer-model.h"
 #include "selection.h"
-#include "helper/action-context.h"
 
 namespace Inkscape {
 
diff --git a/src/helper/action.cpp b/src/helper/action.cpp
index e37575a9c..18e6433bf 100644
--- a/src/helper/action.cpp
+++ b/src/helper/action.cpp
@@ -10,13 +10,13 @@
  */
 
 #include "debug/logger.h"
-#include "debug/timestamp.h"
-#include "debug/simple-event.h"
 #include "debug/event-tracker.h"
-#include "ui/view/view.h"
+#include "debug/simple-event.h"
+#include "debug/timestamp.h"
 #include "desktop.h"
 #include "document.h"
 #include "helper/action.h"
+#include "ui/view/view.h"
 
 static void sp_action_finalize (GObject *object);
 
diff --git a/src/helper/geom-pathstroke.cpp b/src/helper/geom-pathstroke.cpp
index c3e4f8213..55014323d 100644
--- a/src/helper/geom-pathstroke.cpp
+++ b/src/helper/geom-pathstroke.cpp
@@ -8,11 +8,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <iomanip>
+#include <2geom/circle.h>
+#include <2geom/path-intersection.h>
 #include <2geom/path-sink.h>
 #include <2geom/sbasis-to-bezier.h> // cubicbezierpath_from_sbasis
-#include <2geom/path-intersection.h>
-#include <2geom/circle.h>
+#include <iomanip>
 
 #include "helper/geom-pathstroke.h"
 
diff --git a/src/helper/geom-pathvectorsatellites.cpp b/src/helper/geom-pathvectorsatellites.cpp
index 85192bd75..1ecd2e24c 100644
--- a/src/helper/geom-pathvectorsatellites.cpp
+++ b/src/helper/geom-pathvectorsatellites.cpp
@@ -14,8 +14,8 @@
     * This code is in public domain
     */
 
-#include <helper/geom-pathvectorsatellites.h>
 #include "util/units.h"
+#include <helper/geom-pathvectorsatellites.h>
 
 Geom::PathVector PathVectorSatellites::getPathVector() const
 {
diff --git a/src/helper/geom-satellite.cpp b/src/helper/geom-satellite.cpp
index b54738a38..f01b6c6e1 100644
--- a/src/helper/geom-satellite.cpp
+++ b/src/helper/geom-satellite.cpp
@@ -8,19 +8,19 @@
     * This code is in public domain
     */
 
-#include <helper/geom-satellite.h>
 #include <2geom/curve.h>
 #include <2geom/nearest-time.h>
 #include <2geom/path-intersection.h>
-#include <2geom/sbasis-to-bezier.h>
 #include <2geom/ray.h>
+#include <2geom/sbasis-to-bezier.h>
 #include <boost/optional.hpp>
+#include <helper/geom-satellite.h>
 //log cache
 #ifdef _WIN32
 #include <Windows.h>
 #else
-#include <sys/time.h>
 #include <ctime>
+#include <sys/time.h>
 #endif
 
 ///@brief Satellite a per node holder of data.
diff --git a/src/helper/geom.cpp b/src/helper/geom.cpp
index e1f05c3ce..8ac6236b8 100644
--- a/src/helper/geom.cpp
+++ b/src/helper/geom.cpp
@@ -9,11 +9,11 @@
  * Released under GNU GPL
  */
 
-#include <algorithm>
-#include "helper/geom.h"
 #include "helper/geom-curves.h"
+#include "helper/geom.h"
 #include <2geom/curves.h>
 #include <2geom/sbasis-to-bezier.h>
+#include <algorithm>
 
 using Geom::X;
 using Geom::Y;
diff --git a/src/helper/gettext.cpp b/src/helper/gettext.cpp
index 1942b373c..2be5df035 100644
--- a/src/helper/gettext.cpp
+++ b/src/helper/gettext.cpp
@@ -35,9 +35,9 @@
 #include "prefix.h"
 #endif
 
-#include <string>
 #include <glibmm.h>
 #include <glibmm/i18n.h>
+#include <string>
 
 namespace Inkscape {
 
diff --git a/src/helper/pixbuf-ops.cpp b/src/helper/pixbuf-ops.cpp
index 3b43735ad..3fe022b2f 100644
--- a/src/helper/pixbuf-ops.cpp
+++ b/src/helper/pixbuf-ops.cpp
@@ -17,15 +17,15 @@
 
 #include <2geom/transforms.h>
 
-#include "ui/interface.h"
-#include "helper/png-write.h"
 #include "display/cairo-utils.h"
-#include "display/drawing.h"
 #include "display/drawing-context.h"
+#include "display/drawing.h"
 #include "document.h"
-#include "object/sp-root.h"
+#include "helper/png-write.h"
 #include "object/sp-defs.h"
+#include "object/sp-root.h"
 #include "object/sp-use.h"
+#include "ui/interface.h"
 #include "util/units.h"
 
 #include "helper/pixbuf-ops.h"
diff --git a/src/helper/png-write.cpp b/src/helper/png-write.cpp
index 93b07d410..4b9fd9fae 100644
--- a/src/helper/png-write.cpp
+++ b/src/helper/png-write.cpp
@@ -17,23 +17,23 @@
 #include <config.h>
 #endif
 
-#include <png.h>
-#include "ui/interface.h"
-#include <2geom/rect.h>
-#include <2geom/transforms.h>
-#include "png-write.h"
-#include "io/sys.h"
-#include "display/drawing.h"
-#include "display/drawing-context.h"
 #include "display/cairo-utils.h"
+#include "display/drawing-context.h"
+#include "display/drawing.h"
 #include "document.h"
+#include "io/sys.h"
+#include "png-write.h"
 #include "preferences.h"
 #include "rdf.h"
+#include "ui/interface.h"
 #include "util/units.h"
+#include <2geom/rect.h>
+#include <2geom/transforms.h>
+#include <png.h>
 
+#include "object/sp-defs.h"
 #include "object/sp-item.h"
 #include "object/sp-root.h"
-#include "object/sp-defs.h"
 
 /* This is an example of how to use libpng to read and write PNG files.
  * The file libpng.txt is much more verbose then this.  If you have not
diff --git a/src/helper/stock-items.cpp b/src/helper/stock-items.cpp
index d33186344..c985d716a 100644
--- a/src/helper/stock-items.cpp
+++ b/src/helper/stock-items.cpp
@@ -24,18 +24,18 @@
 
 #include "path-prefix.h"
 
-#include <xml/repr.h>
-#include "document-private.h"
 #include "desktop.h"
+#include "document-private.h"
 #include "inkscape.h"
+#include <xml/repr.h>
 
 #include "io/sys.h"
 #include "stock-items.h"
 
+#include "object/sp-defs.h"
 #include "object/sp-gradient.h"
-#include "object/sp-pattern.h"
 #include "object/sp-marker.h"
-#include "object/sp-defs.h"
+#include "object/sp-pattern.h"
 
 static SPObject *sp_gradient_load_from_svg(gchar const *name, SPDocument *current_doc);
 static SPObject *sp_marker_load_from_svg(gchar const *name, SPDocument *current_doc);
diff --git a/src/inkgc/gc.cpp b/src/inkgc/gc.cpp
index b1bd07af6..e8b2642c3 100644
--- a/src/inkgc/gc.cpp
+++ b/src/inkgc/gc.cpp
@@ -10,13 +10,13 @@
  */
 
 #include "inkgc/gc-core.h"
-#include <stdexcept>
+#include <cstddef>
 #include <cstring>
-#include <string>
 #include <glib.h>
-#include <sigc++/functors/ptr_fun.h>
 #include <glibmm/main.h>
-#include <cstddef>
+#include <sigc++/functors/ptr_fun.h>
+#include <stdexcept>
+#include <string>
 
 namespace Inkscape {
 namespace GC {
diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index 52072de0b..0882b1147 100644
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
@@ -25,16 +25,16 @@
 #include <glibmm/fileutils.h>
 #include <glibmm/regex.h>
 
+#include "debug/event-tracker.h"
+#include "debug/simple-event.h"
 #include <gtkmm/cssprovider.h>
 #include <gtkmm/icontheme.h>
 #include <gtkmm/messagedialog.h>
-#include "debug/simple-event.h"
-#include "debug/event-tracker.h"
 
 #include <glib/gstdio.h>
+#include <glibmm/convert.h>
 #include <glibmm/i18n.h>
 #include <glibmm/miscutils.h>
-#include <glibmm/convert.h>
 
 #include "desktop.h"
 
@@ -46,14 +46,14 @@
 #include "extension/system.h"
 #include "helper/action-context.h"
 #include "inkscape.h"
-#include "io/sys.h"
 #include "io/resource.h"
+#include "io/sys.h"
 #include "libnrtype/FontFactory.h"
 #include "message-stack.h"
 #include "path-prefix.h"
 #include "resource-manager.h"
-#include "ui/tools/tool-base.h"
 #include "ui/dialog/debug.h"
+#include "ui/tools/tool-base.h"
 
 /* Backbones of configuration xml data */
 #include "menus-skeleton.h"
diff --git a/src/inkview.cpp b/src/inkview.cpp
index ce75f72f8..804ab8bdb 100644
--- a/src/inkview.cpp
+++ b/src/inkview.cpp
@@ -42,9 +42,9 @@
 #include "helper/gettext.h"
 #endif
 #include "inkgc/gc-core.h"
+#include "inkview-options-group.h"
 #include "io/sys.h"
 #include "svg-view-slideshow.h"
-#include "inkview-options-group.h"
 
 /**
  * @brief Get a list of valid SVG files from a list of strings
diff --git a/src/io/http.cpp b/src/io/http.cpp
index 883f6f56c..bb734ca44 100644
--- a/src/io/http.cpp
+++ b/src/io/http.cpp
@@ -37,9 +37,9 @@
 #include <string>
 #include <time.h>
 
-#include "io/sys.h"
 #include "io/http.h"
 #include "io/resource.h"
+#include "io/sys.h"
 
 typedef std::function<void(Glib::ustring)> callback;
 
diff --git a/src/io/inkscapestream.cpp b/src/io/inkscapestream.cpp
index dcfc662ca..daa514dc9 100644
--- a/src/io/inkscapestream.cpp
+++ b/src/io/inkscapestream.cpp
@@ -11,8 +11,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <cstdlib>
 #include "inkscapestream.h"
+#include <cstdlib>
 
 namespace Inkscape
 {
diff --git a/src/io/resource.cpp b/src/io/resource.cpp
index 0b242cc31..a2ba39a8c 100644
--- a/src/io/resource.cpp
+++ b/src/io/resource.cpp
@@ -24,13 +24,13 @@
 #include <shlobj.h> // for SHGetSpecialFolderLocation
 #endif
 
+#include <glibmm/fileutils.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/stringutils.h>
-#include <glibmm/fileutils.h>
 
-#include "path-prefix.h"
-#include "io/sys.h"
 #include "io/resource.h"
+#include "io/sys.h"
+#include "path-prefix.h"
 
 using Inkscape::IO::file_test;
 
diff --git a/src/io/uristream.cpp b/src/io/uristream.cpp
index 5d2eb59ee..9b7f37828 100644
--- a/src/io/uristream.cpp
+++ b/src/io/uristream.cpp
@@ -13,8 +13,8 @@
 
 #include "uristream.h"
 #include "sys.h"
-#include <string>
 #include <cstring>
+#include <string>
 
 
 namespace Inkscape
diff --git a/src/knot-ptr.cpp b/src/knot-ptr.cpp
index de8118ba7..2ff37af0c 100644
--- a/src/knot-ptr.cpp
+++ b/src/knot-ptr.cpp
@@ -1,7 +1,7 @@
+#include "knot-ptr.h"
 #include <algorithm>
 #include <glib.h>
 #include <list>
-#include "knot-ptr.h"
 
 static std::list<void*> deleted_knots;
 
diff --git a/src/knot.cpp b/src/knot.cpp
index 8296891f4..b4b9db750 100644
--- a/src/knot.cpp
+++ b/src/knot.cpp
@@ -14,17 +14,17 @@
 
 #ifdef HAVE_CONFIG_H
 #endif
+#include "desktop.h"
+#include "display/sodipodi-ctrl.h"
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
-#include "display/sodipodi-ctrl.h"
-#include "desktop.h"
 
-#include "knot.h"
-#include "knot-ptr.h"
-#include "document.h"
 #include "document-undo.h"
-#include "message-stack.h"
+#include "document.h"
+#include "knot-ptr.h"
+#include "knot.h"
 #include "message-context.h"
+#include "message-stack.h"
 #include "ui/tools/node-tool.h"
 #include <gtk/gtk.h>
 
diff --git a/src/layer-manager.cpp b/src/layer-manager.cpp
index a42f0d4cc..a2c2b7d78 100644
--- a/src/layer-manager.cpp
+++ b/src/layer-manager.cpp
@@ -10,8 +10,8 @@
 
 #include <set>
 
-#include <sigc++/functors/mem_fun.h>
 #include <sigc++/adaptors/hide.h>
+#include <sigc++/functors/mem_fun.h>
 
 
 #include "desktop.h"
diff --git a/src/layer-model.cpp b/src/layer-model.cpp
index 62f47966f..90478665e 100644
--- a/src/layer-model.cpp
+++ b/src/layer-model.cpp
@@ -32,8 +32,8 @@
 #include "object-hierarchy.h"
 
 #include "object/sp-defs.h"
-#include "object/sp-item.h"
 #include "object/sp-item-group.h"
+#include "object/sp-item.h"
 #include "object/sp-root.h"
 
 // Callbacks
diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp
index a354d8915..fb7a1cf8c 100644
--- a/src/libnrtype/FontFactory.cpp
+++ b/src/libnrtype/FontFactory.cpp
@@ -20,16 +20,16 @@
 
 #include <fontconfig/fontconfig.h>
 
+#include <pango/pango-ot.h>
 #include <pango/pangofc-fontmap.h>
 #include <pango/pangoft2.h>
-#include <pango/pango-ot.h>
 
 #include "io/sys.h"
 #include "util/unordered-containers.h"
 
 #include "libnrtype/FontFactory.h"
-#include "libnrtype/font-instance.h"
 #include "libnrtype/OpenTypeUtil.h"
+#include "libnrtype/font-instance.h"
 
 typedef INK_UNORDERED_MAP<PangoFontDescription*, font_instance*, font_descr_hash, font_descr_equal> FaceMapType;
 
diff --git a/src/libnrtype/FontInstance.cpp b/src/libnrtype/FontInstance.cpp
index d55f919f1..65cb619f3 100644
--- a/src/libnrtype/FontInstance.cpp
+++ b/src/libnrtype/FontInstance.cpp
@@ -28,11 +28,11 @@
 
 #include <glibmm/regex.h>
 
-#include <2geom/pathvector.h>
-#include <2geom/path-sink.h>
 #include "libnrtype/font-glyph.h"
 #include "libnrtype/font-instance.h"
 #include "util/unordered-containers.h"
+#include <2geom/path-sink.h>
+#include <2geom/pathvector.h>
 
 
 #ifndef USE_PANGO_WIN32
diff --git a/src/libnrtype/Layout-TNG-Compute.cpp b/src/libnrtype/Layout-TNG-Compute.cpp
index 20b07d84b..d3b49436e 100644
--- a/src/libnrtype/Layout-TNG-Compute.cpp
+++ b/src/libnrtype/Layout-TNG-Compute.cpp
@@ -9,11 +9,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 #include "Layout-TNG.h"
-#include "style.h"
+#include "Layout-TNG-Scanline-Maker.h"
 #include "font-instance.h"
-#include "svg/svg-length.h"
 #include "object/sp-object.h"
-#include "Layout-TNG-Scanline-Maker.h"
+#include "style.h"
+#include "svg/svg-length.h"
 #include <limits>
 
 namespace Inkscape {
diff --git a/src/libnrtype/Layout-TNG-Input.cpp b/src/libnrtype/Layout-TNG-Input.cpp
index 6100fa262..724fc2b17 100644
--- a/src/libnrtype/Layout-TNG-Input.cpp
+++ b/src/libnrtype/Layout-TNG-Input.cpp
@@ -17,11 +17,11 @@
 #define PANGO_ENABLE_ENGINE
 #endif
 
-#include <gtk/gtk.h>
+#include "FontFactory.h"
 #include "Layout-TNG.h"
 #include "style.h"
 #include "svg/svg-length.h"
-#include "FontFactory.h"
+#include <gtk/gtk.h>
 
 
 namespace Inkscape {
diff --git a/src/libnrtype/Layout-TNG-OutIter.cpp b/src/libnrtype/Layout-TNG-OutIter.cpp
index 8c29b7dbc..f649e5ddc 100644
--- a/src/libnrtype/Layout-TNG-OutIter.cpp
+++ b/src/libnrtype/Layout-TNG-OutIter.cpp
@@ -9,12 +9,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 #include "Layout-TNG.h"
-#include "livarot/Path.h"
 #include "font-instance.h"
+#include "livarot/Path.h"
+#include "style.h"
 #include "svg/svg-length.h"
-#include <2geom/transforms.h>
 #include <2geom/line.h>
-#include "style.h"
+#include <2geom/transforms.h>
 
 namespace Inkscape {
 namespace Text {
diff --git a/src/libnrtype/Layout-TNG-Output.cpp b/src/libnrtype/Layout-TNG-Output.cpp
index 884c1a319..717876317 100644
--- a/src/libnrtype/Layout-TNG-Output.cpp
+++ b/src/libnrtype/Layout-TNG-Output.cpp
@@ -8,19 +8,19 @@
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
-#include <glib.h>
 #include "Layout-TNG.h"
+#include "display/curve.h"
 #include "display/drawing-text.h"
-#include "style.h"
-#include "print.h"
+#include "extension/internal/cairo-render-context.h"
 #include "extension/print.h"
-#include "livarot/Path.h"
 #include "font-instance.h"
+#include "livarot/Path.h"
+#include "print.h"
+#include "style.h"
 #include "svg/svg-length.h"
-#include "extension/internal/cairo-render-context.h"
-#include "display/curve.h"
 #include <2geom/pathvector.h>
 #include <3rdparty/libuemf/symbol_convert.h>
+#include <glib.h>
 
 
 namespace Inkscape {
diff --git a/src/libnrtype/font-lister.cpp b/src/libnrtype/font-lister.cpp
index 47a260714..acef7318e 100644
--- a/src/libnrtype/font-lister.cpp
+++ b/src/libnrtype/font-lister.cpp
@@ -8,18 +8,18 @@
 
 #include <libnrtype/font-instance.h>
 
-#include "font-lister.h"
 #include "FontFactory.h"
+#include "font-lister.h"
 
-#include "desktop.h"
 #include "desktop-style.h"
+#include "desktop.h"
 #include "document.h"
 #include "inkscape.h"
 #include "preferences.h"
 
+#include "object/sp-namedview.h"
 #include "object/sp-object.h"
 #include "object/sp-root.h"
-#include "object/sp-namedview.h"
 
 #include "xml/repr.h"
 
diff --git a/src/line-geometry.cpp b/src/line-geometry.cpp
index 6e0f82d45..5f54aff3d 100644
--- a/src/line-geometry.cpp
+++ b/src/line-geometry.cpp
@@ -10,12 +10,12 @@
  */
 
 #include "line-geometry.h"
-#include "desktop.h"
 #include "desktop-style.h"
+#include "desktop.h"
 
+#include "display/sodipodi-ctrl.h"
 #include "display/sp-canvas.h"
 #include "display/sp-ctrlline.h"
-#include "display/sodipodi-ctrl.h"
 #include "ui/control-manager.h"
 
 using Inkscape::ControlManager;
diff --git a/src/livarot/AlphaLigne.cpp b/src/livarot/AlphaLigne.cpp
index 5b8321b72..d37ea5e38 100644
--- a/src/livarot/AlphaLigne.cpp
+++ b/src/livarot/AlphaLigne.cpp
@@ -9,10 +9,10 @@
 
 #include "AlphaLigne.h"
 
+#include <glib.h>
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <glib.h>
 
 AlphaLigne::AlphaLigne(int iMin,int iMax)
 {
diff --git a/src/livarot/BitLigne.cpp b/src/livarot/BitLigne.cpp
index d7cce26eb..2cc1d75a0 100644
--- a/src/livarot/BitLigne.cpp
+++ b/src/livarot/BitLigne.cpp
@@ -9,13 +9,13 @@
 
 #include "BitLigne.h"
 
-#include <math.h>
-#include <cstring>
-#include <cstdlib>
-#include <string>
 #include <cmath>
 #include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <glib.h>
+#include <math.h>
+#include <string>
 
 BitLigne::BitLigne(int ist,int ien,float iScale)
 {
diff --git a/src/livarot/Path.cpp b/src/livarot/Path.cpp
index 5fa418968..0146ce670 100644
--- a/src/livarot/Path.cpp
+++ b/src/livarot/Path.cpp
@@ -6,9 +6,9 @@
  *
  */
 
-#include <glib.h>
 #include "Path.h"
 #include "livarot/path-description.h"
+#include <glib.h>
 
 /*
  * manipulation of the path data: path description and polyline
diff --git a/src/livarot/PathConversion.cpp b/src/livarot/PathConversion.cpp
index 30e21d546..b1ca5706a 100644
--- a/src/livarot/PathConversion.cpp
+++ b/src/livarot/PathConversion.cpp
@@ -6,11 +6,11 @@
  *
  */
 
-#include <glib.h>
-#include <2geom/transforms.h>
 #include "Path.h"
 #include "Shape.h"
 #include "livarot/path-description.h"
+#include <2geom/transforms.h>
+#include <glib.h>
 
 /*
  * path description -> polyline
diff --git a/src/livarot/PathCutting.cpp b/src/livarot/PathCutting.cpp
index 086b30557..a4a283c73 100644
--- a/src/livarot/PathCutting.cpp
+++ b/src/livarot/PathCutting.cpp
@@ -13,20 +13,20 @@
  *  Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <cstring>
-#include <string>
-#include <cstdio>
-#include <typeinfo>
 #include "Path.h"
-#include "style.h"
+#include "helper/geom-curves.h"
+#include "helper/geom.h"
 #include "livarot/path-description.h"
+#include "style.h"
+#include <2geom/affine.h>
+#include <2geom/curves.h>
 #include <2geom/pathvector.h>
 #include <2geom/point.h>
-#include <2geom/affine.h>
 #include <2geom/sbasis-to-bezier.h>
-#include <2geom/curves.h>
-#include "helper/geom-curves.h"
-#include "helper/geom.h"
+#include <cstdio>
+#include <cstring>
+#include <string>
+#include <typeinfo>
 
 #include "svg/svg.h"
 
diff --git a/src/livarot/PathSimplify.cpp b/src/livarot/PathSimplify.cpp
index 81ddcd049..19e6708e7 100644
--- a/src/livarot/PathSimplify.cpp
+++ b/src/livarot/PathSimplify.cpp
@@ -6,10 +6,10 @@
  *
  */
 
-#include <glib.h>
-#include <2geom/affine.h>
 #include "livarot/Path.h"
 #include "livarot/path-description.h"
+#include <2geom/affine.h>
+#include <glib.h>
 
 /*
  * Reassembling polyline segments into cubic bezier patches
diff --git a/src/livarot/Shape.cpp b/src/livarot/Shape.cpp
index 33b383947..d235ecf20 100644
--- a/src/livarot/Shape.cpp
+++ b/src/livarot/Shape.cpp
@@ -6,12 +6,12 @@
  *
  */
 
-#include <cstdio>
-#include <cstdlib>
-#include <glib.h>
 #include "Shape.h"
 #include "livarot/sweep-event-queue.h"
 #include "livarot/sweep-tree-list.h"
+#include <cstdio>
+#include <cstdlib>
+#include <glib.h>
 
 /*
  * Shape instances handling.
diff --git a/src/livarot/ShapeDraw.cpp b/src/livarot/ShapeDraw.cpp
index d222cc49c..e95abcd61 100644
--- a/src/livarot/ShapeDraw.cpp
+++ b/src/livarot/ShapeDraw.cpp
@@ -6,10 +6,10 @@
  *
  */
 
+#include "Shape.h"
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include "Shape.h"
 //#include <ApplicationServices/ApplicationServices.h>
 
 // debug routine for vizualizing the polygons
diff --git a/src/livarot/ShapeMisc.cpp b/src/livarot/ShapeMisc.cpp
index 4f63007e7..dd7beb701 100644
--- a/src/livarot/ShapeMisc.cpp
+++ b/src/livarot/ShapeMisc.cpp
@@ -9,12 +9,12 @@
 #include "livarot/Shape.h"
 #include "livarot/Path.h"
 #include "livarot/path-description.h"
-#include <glib.h>
+#include <2geom/affine.h>
+#include <2geom/point.h>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include <2geom/point.h>
-#include <2geom/affine.h>
+#include <glib.h>
 
 /*
  * polygon offset and polyline to path reassembling (when using back data)
diff --git a/src/livarot/ShapeRaster.cpp b/src/livarot/ShapeRaster.cpp
index 2b35c9666..10747137e 100644
--- a/src/livarot/ShapeRaster.cpp
+++ b/src/livarot/ShapeRaster.cpp
@@ -8,9 +8,9 @@
 
 #include "Shape.h"
 
-#include "livarot/float-line.h"
 #include "AlphaLigne.h"
 #include "BitLigne.h"
+#include "livarot/float-line.h"
 
 #include "livarot/sweep-event-queue.h"
 #include "livarot/sweep-tree-list.h"
diff --git a/src/livarot/ShapeSweep.cpp b/src/livarot/ShapeSweep.cpp
index 1e6273964..97f9b94b0 100644
--- a/src/livarot/ShapeSweep.cpp
+++ b/src/livarot/ShapeSweep.cpp
@@ -6,15 +6,15 @@
  *
  */
 
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <glib.h>
-#include <2geom/affine.h>
 #include "Shape.h"
 #include "livarot/sweep-event-queue.h"
 #include "livarot/sweep-tree-list.h"
 #include "livarot/sweep-tree.h"
+#include <2geom/affine.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <glib.h>
 
 //int   doDebug=0;
 
diff --git a/src/livarot/float-line.cpp b/src/livarot/float-line.cpp
index e5350edc6..c972018af 100644
--- a/src/livarot/float-line.cpp
+++ b/src/livarot/float-line.cpp
@@ -12,10 +12,10 @@
 #ifdef faster_flatten
 # include <cmath>  // std::abs(float)
 #endif
-#include <stdio.h>
 #include "livarot/float-line.h"
 #include "livarot/int-line.h"
 #include <cstdio>
+#include <stdio.h>
 
 FloatLigne::FloatLigne()
 {
diff --git a/src/livarot/int-line.cpp b/src/livarot/int-line.cpp
index 998f638e7..72e0451eb 100644
--- a/src/livarot/int-line.cpp
+++ b/src/livarot/int-line.cpp
@@ -9,15 +9,15 @@
  *
  */
 
-#include <glib.h>
+#include "livarot/BitLigne.h"
+#include "livarot/float-line.h"
+#include "livarot/int-line.h"
 #include <cmath>
+#include <cstdio>
+#include <cstdlib>
 #include <cstring>
+#include <glib.h>
 #include <string>
-#include <cstdlib>
-#include <cstdio>
-#include "livarot/int-line.h"
-#include "livarot/float-line.h"
-#include "livarot/BitLigne.h"
 
 IntLigne::IntLigne()
 {
diff --git a/src/livarot/sweep-event.cpp b/src/livarot/sweep-event.cpp
index 48354fc46..c59e3cc2e 100644
--- a/src/livarot/sweep-event.cpp
+++ b/src/livarot/sweep-event.cpp
@@ -1,8 +1,8 @@
-#include <glib.h>
+#include "livarot/Shape.h"
 #include "livarot/sweep-event-queue.h"
-#include "livarot/sweep-tree.h"
 #include "livarot/sweep-event.h"
-#include "livarot/Shape.h"
+#include "livarot/sweep-tree.h"
+#include <glib.h>
 
 SweepEventQueue::SweepEventQueue(int s) : nbEvt(0), maxEvt(s)
 {
diff --git a/src/livarot/sweep-tree-list.cpp b/src/livarot/sweep-tree-list.cpp
index ea9e9a5d2..c359d5a44 100644
--- a/src/livarot/sweep-tree-list.cpp
+++ b/src/livarot/sweep-tree-list.cpp
@@ -1,6 +1,6 @@
-#include <glib.h>
-#include "livarot/sweep-tree.h"
 #include "livarot/sweep-tree-list.h"
+#include "livarot/sweep-tree.h"
+#include <glib.h>
 
 
 SweepTreeList::SweepTreeList(int s) :
diff --git a/src/livarot/sweep-tree.cpp b/src/livarot/sweep-tree.cpp
index 1b9868f2e..bc8981e38 100644
--- a/src/livarot/sweep-tree.cpp
+++ b/src/livarot/sweep-tree.cpp
@@ -1,8 +1,8 @@
 #include "livarot/sweep-event-queue.h"
+#include "livarot/Shape.h"
+#include "livarot/sweep-event.h"
 #include "livarot/sweep-tree-list.h"
 #include "livarot/sweep-tree.h"
-#include "livarot/sweep-event.h"
-#include "livarot/Shape.h"
 
 
 /*
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index 1e691eb4d..5333abf54 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -16,6 +16,7 @@
 #include "live_effects/lpe-angle_bisector.h"
 #include "live_effects/lpe-attach-path.h"
 #include "live_effects/lpe-bendpath.h"
+#include "live_effects/lpe-bool.h"
 #include "live_effects/lpe-bounding-box.h"
 #include "live_effects/lpe-bspline.h"
 #include "live_effects/lpe-circle_3pts.h"
@@ -27,6 +28,7 @@
 #include "live_effects/lpe-dash-stroke.h"
 #include "live_effects/lpe-dynastroke.h"
 #include "live_effects/lpe-ellipse_5pts.h"
+#include "live_effects/lpe-embrodery-stitch.h"
 #include "live_effects/lpe-envelope.h"
 #include "live_effects/lpe-extrude.h"
 #include "live_effects/lpe-fill-between-many.h"
@@ -37,8 +39,8 @@
 #include "live_effects/lpe-interpolate_points.h"
 #include "live_effects/lpe-jointype.h"
 #include "live_effects/lpe-knot.h"
-#include "live_effects/lpe-lattice2.h"
 #include "live_effects/lpe-lattice.h"
+#include "live_effects/lpe-lattice2.h"
 #include "live_effects/lpe-line_segment.h"
 #include "live_effects/lpe-measure-segments.h"
 #include "live_effects/lpe-mirror_symmetry.h"
@@ -51,45 +53,43 @@
 #include "live_effects/lpe-powerclip.h"
 #include "live_effects/lpe-powermask.h"
 #include "live_effects/lpe-powerstroke.h"
+#include "live_effects/lpe-pts2ellipse.h"
 #include "live_effects/lpe-recursiveskeleton.h"
-#include "live_effects/lpe-roughen.h"
 #include "live_effects/lpe-rough-hatches.h"
+#include "live_effects/lpe-roughen.h"
 #include "live_effects/lpe-ruler.h"
 #include "live_effects/lpe-show_handles.h"
 #include "live_effects/lpe-simplify.h"
 #include "live_effects/lpe-sketch.h"
 #include "live_effects/lpe-spiro.h"
 #include "live_effects/lpe-tangent_to_curve.h"
-#include "live_effects/lpe-transform_2pts.h"
 #include "live_effects/lpe-taperstroke.h"
 #include "live_effects/lpe-test-doEffect-stack.h"
 #include "live_effects/lpe-text_label.h"
+#include "live_effects/lpe-transform_2pts.h"
 #include "live_effects/lpe-vonkoch.h"
-#include "live_effects/lpe-embrodery-stitch.h"
-#include "live_effects/lpe-bool.h"
-#include "live_effects/lpe-pts2ellipse.h"
 
 #include "live_effects/lpeobject.h"
 
 #include "xml/node-event-vector.h"
 #include "xml/sp-css-attr.h"
 
-#include "message-stack.h"
+#include "display/curve.h"
 #include "document-private.h"
-#include "ui/tools/pen-tool.h"
-#include "ui/tools/node-tool.h"
-#include "ui/tools-switch.h"
 #include "knotholder.h"
+#include "message-stack.h"
 #include "path-chemistry.h"
-#include "display/curve.h"
+#include "ui/tools-switch.h"
+#include "ui/tools/node-tool.h"
+#include "ui/tools/pen-tool.h"
 
 #include "object/sp-defs.h"
 #include "object/sp-shape.h"
 
+#include <gtkmm/expander.h>
+#include <pangomm/layout.h>
 #include <stdio.h>
 #include <string.h>
-#include <pangomm/layout.h>
-#include <gtkmm/expander.h>
 
 namespace Inkscape {
 
diff --git a/src/live_effects/lpe-attach-path.cpp b/src/live_effects/lpe-attach-path.cpp
index ea2965c6a..0a10c03b9 100644
--- a/src/live_effects/lpe-attach-path.cpp
+++ b/src/live_effects/lpe-attach-path.cpp
@@ -4,10 +4,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <math.h>
 #include "live_effects/lpe-attach-path.h"
-#include "display/curve.h"
 #include "2geom/path-sink.h"
+#include "display/curve.h"
+#include <math.h>
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/lpe-bendpath.cpp b/src/live_effects/lpe-bendpath.cpp
index 11694249a..af500b1aa 100644
--- a/src/live_effects/lpe-bendpath.cpp
+++ b/src/live_effects/lpe-bendpath.cpp
@@ -6,9 +6,9 @@
  */
 
 #include "live_effects/lpe-bendpath.h"
+#include "display/curve.h"
 #include "knot-holder-entity.h"
 #include "knotholder.h"
-#include "display/curve.h"
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/lpe-bool.cpp b/src/live_effects/lpe-bool.cpp
index 01b019cec..6cc8b1a1d 100644
--- a/src/live_effects/lpe-bool.cpp
+++ b/src/live_effects/lpe-bool.cpp
@@ -6,27 +6,27 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <algorithm>
 #include <glibmm/i18n.h>
 #include <math.h>
 #include <string.h>
-#include <algorithm>
 
 #include "live_effects/lpe-bool.h"
 
 #include "display/curve.h"
 
-#include "2geom/path.h"
+#include "2geom/affine.h"
 #include "2geom/bezier-curve.h"
 #include "2geom/path-sink.h"
-#include "2geom/affine.h"
+#include "2geom/path.h"
 #include "2geom/svg-path-parser.h"
 
 #include "helper/geom.h"
 
-#include "splivarot.h"
 #include "livarot/Path.h"
 #include "livarot/Shape.h"
 #include "livarot/path-description.h"
+#include "splivarot.h"
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-bspline.cpp b/src/live_effects/lpe-bspline.cpp
index 7834ff108..a15b992b0 100644
--- a/src/live_effects/lpe-bspline.cpp
+++ b/src/live_effects/lpe-bspline.cpp
@@ -1,17 +1,18 @@
 /*
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
-#include <gtkmm.h>
-#include "live_effects/lpe-bspline.h"
-#include "ui/widget/scalar.h"
 #include "display/curve.h"
+#include "document-undo.h"
 #include "helper/geom-curves.h"
+#include "live_effects/lpe-bspline.h"
 #include "object/sp-path.h"
-#include "svg/svg.h"
-#include "xml/repr.h"
 #include "preferences.h"
-#include "document-undo.h"
+#include "svg/svg.h"
+#include "ui/widget/scalar.h"
 #include "verbs.h"
+#include "xml/repr.h"
+#include <glib.h>
+#include <gtkmm.h>
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/lpe-clone-original.cpp b/src/live_effects/lpe-clone-original.cpp
index f384c8bec..c4b8a36bb 100644
--- a/src/live_effects/lpe-clone-original.cpp
+++ b/src/live_effects/lpe-clone-original.cpp
@@ -5,11 +5,11 @@
  */
 
 #include "live_effects/lpe-clone-original.h"
-#include "live_effects/lpe-spiro.h"
+#include "display/curve.h"
 #include "live_effects/lpe-bspline.h"
-#include "live_effects/lpeobject.h"
+#include "live_effects/lpe-spiro.h"
 #include "live_effects/lpeobject-reference.h"
-#include "display/curve.h"
+#include "live_effects/lpeobject.h"
 #include "svg/path-string.h"
 #include "svg/svg.h"
 
diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp
index 74ee0cfda..a51a3531e 100644
--- a/src/live_effects/lpe-copy_rotate.cpp
+++ b/src/live_effects/lpe-copy_rotate.cpp
@@ -11,19 +11,19 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm.h>
-#include <gdk/gdk.h>
-#include <2geom/path-intersection.h>
-#include <2geom/sbasis-to-bezier.h>
-#include <2geom/intersection-graph.h>
+#include "display/curve.h"
+#include "helper/geom.h"
 #include "live_effects/lpe-copy_rotate.h"
 #include "live_effects/lpeobject.h"
-#include "display/curve.h"
+#include "path-chemistry.h"
 #include "svg/path-string.h"
 #include "svg/svg.h"
-#include "helper/geom.h"
 #include "xml/sp-css-attr.h"
-#include "path-chemistry.h"
+#include <2geom/intersection-graph.h>
+#include <2geom/path-intersection.h>
+#include <2geom/sbasis-to-bezier.h>
+#include <gdk/gdk.h>
+#include <gtkmm.h>
 
 #include "object/sp-path.h"
 #include "object/sp-shape.h"
diff --git a/src/live_effects/lpe-dash-stroke.cpp b/src/live_effects/lpe-dash-stroke.cpp
index 7b1e1b578..1adce4586 100644
--- a/src/live_effects/lpe-dash-stroke.cpp
+++ b/src/live_effects/lpe-dash-stroke.cpp
@@ -2,8 +2,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 #include "live_effects/lpe-dash-stroke.h"
-#include "2geom/pathvector.h"
 #include "2geom/path.h"
+#include "2geom/pathvector.h"
 #include "helper/geom.h"
 
 // TODO due to internal breakage in glibmm headers, this must be last:
diff --git a/src/live_effects/lpe-ellipse_5pts.cpp b/src/live_effects/lpe-ellipse_5pts.cpp
index 28e7058d7..294ca884a 100644
--- a/src/live_effects/lpe-ellipse_5pts.cpp
+++ b/src/live_effects/lpe-ellipse_5pts.cpp
@@ -12,12 +12,12 @@
  */
 
 #include "live_effects/lpe-ellipse_5pts.h"
+#include "desktop.h"
+#include "inkscape.h"
+#include "message-stack.h"
 #include <2geom/circle.h>
 #include <2geom/ellipse.h>
 #include <2geom/path-sink.h>
-#include "inkscape.h"
-#include "desktop.h"
-#include "message-stack.h"
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/lpe-embrodery-stitch.cpp b/src/live_effects/lpe-embrodery-stitch.cpp
index 972d29b9c..bb1bd13d5 100644
--- a/src/live_effects/lpe-embrodery-stitch.cpp
+++ b/src/live_effects/lpe-embrodery-stitch.cpp
@@ -9,15 +9,15 @@
 #include "ui/widget/scalar.h"
 #include <glibmm/i18n.h>
 
-#include "live_effects/lpe-embrodery-stitch.h"
 #include "live_effects/lpe-embrodery-stitch-ordering.h"
+#include "live_effects/lpe-embrodery-stitch.h"
 
+#include <2geom/bezier-to-sbasis.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/sbasis.h>
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-fill-between-many.cpp b/src/live_effects/lpe-fill-between-many.cpp
index 9715d7ff8..32599b4f9 100644
--- a/src/live_effects/lpe-fill-between-many.cpp
+++ b/src/live_effects/lpe-fill-between-many.cpp
@@ -6,11 +6,11 @@
 
 
 #include "live_effects/lpe-fill-between-many.h"
-#include "live_effects/lpeobject.h"
-#include "xml/node.h"
 #include "display/curve.h"
 #include "inkscape.h"
+#include "live_effects/lpeobject.h"
 #include "selection.h"
+#include "xml/node.h"
 
 #include "object/sp-defs.h"
 #include "object/sp-shape.h"
diff --git a/src/live_effects/lpe-fillet-chamfer.cpp b/src/live_effects/lpe-fillet-chamfer.cpp
index dffd09ec3..32667e924 100644
--- a/src/live_effects/lpe-fillet-chamfer.cpp
+++ b/src/live_effects/lpe-fillet-chamfer.cpp
@@ -10,13 +10,13 @@
 
 #include "live_effects/lpe-fillet-chamfer.h"
 
-#include "helper/geom.h"
 #include "helper/geom-curves.h"
 #include "helper/geom-satellite.h"
+#include "helper/geom.h"
 
-#include <2geom/elliptical-arc.h>
-#include "knotholder.h"
 #include "display/curve.h"
+#include "knotholder.h"
+#include <2geom/elliptical-arc.h>
 #include <boost/optional.hpp>
 
 #include "object/sp-shape.h"
diff --git a/src/live_effects/lpe-knot.cpp b/src/live_effects/lpe-knot.cpp
index d62965ca8..3c0b1aabc 100644
--- a/src/live_effects/lpe-knot.cpp
+++ b/src/live_effects/lpe-knot.cpp
@@ -13,25 +13,25 @@
  */
 
 #include "display/curve.h"
-#include "live_effects/lpe-knot.h"
 #include "knot-holder-entity.h"
 #include "knotholder.h"
+#include "live_effects/lpe-knot.h"
 
 #include <gdk/gdk.h>
 
-#include <2geom/sbasis-to-bezier.h>
-#include <2geom/bezier-to-sbasis.h>
-#include <2geom/basic-intersection.h>
 #include "helper/geom.h"
+#include <2geom/basic-intersection.h>
+#include <2geom/bezier-to-sbasis.h>
+#include <2geom/sbasis-to-bezier.h>
 
-#include "object/sp-shape.h"
 #include "object/sp-path.h"
+#include "object/sp-shape.h"
 #include "style.h"
 
 // for change crossing undo
-#include "verbs.h"
-#include "document.h"
 #include "document-undo.h"
+#include "document.h"
+#include "verbs.h"
 
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
diff --git a/src/live_effects/lpe-lattice.cpp b/src/live_effects/lpe-lattice.cpp
index df4da4590..67b87cb73 100644
--- a/src/live_effects/lpe-lattice.cpp
+++ b/src/live_effects/lpe-lattice.cpp
@@ -18,8 +18,8 @@
 
 #include "display/curve.h"
 
-#include <2geom/sbasis-2d.h>
 #include <2geom/bezier-to-sbasis.h>
+#include <2geom/sbasis-2d.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-lattice2.cpp b/src/live_effects/lpe-lattice2.cpp
index 8c2c3ec31..3699d7660 100644
--- a/src/live_effects/lpe-lattice2.cpp
+++ b/src/live_effects/lpe-lattice2.cpp
@@ -16,12 +16,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm.h>
-#include "live_effects/lpe-lattice2.h"
 #include "display/curve.h"
 #include "helper/geom.h"
-#include <2geom/sbasis-2d.h>
+#include "live_effects/lpe-lattice2.h"
 #include <2geom/bezier-to-sbasis.h>
+#include <2geom/sbasis-2d.h>
+#include <gtkmm.h>
 
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
diff --git a/src/live_effects/lpe-measure-segments.cpp b/src/live_effects/lpe-measure-segments.cpp
index 5f62f0281..0c911b532 100644
--- a/src/live_effects/lpe-measure-segments.cpp
+++ b/src/live_effects/lpe-measure-segments.cpp
@@ -10,36 +10,36 @@
  */
 
 #include "live_effects/lpeobject.h"
-#include "live_effects/lpeobject-reference.h"
-#include "live_effects/lpe-measure-segments.h"
 #include "2geom/affine.h"
 #include "2geom/angle.h"
 #include "2geom/point.h"
 #include "2geom/ray.h"
 #include "display/curve.h"
+#include "document-undo.h"
+#include "document.h"
 #include "helper/geom.h"
-#include "text-editing.h"
+#include "inkscape.h"
+#include "libnrtype/Layout-TNG.h"
+#include "live_effects/lpe-measure-segments.h"
+#include "live_effects/lpeobject-reference.h"
 #include "object/sp-defs.h"
-#include "object/sp-text.h"
 #include "object/sp-flowtext.h"
 #include "object/sp-item-group.h"
 #include "object/sp-item.h"
 #include "object/sp-path.h"
 #include "object/sp-root.h"
 #include "object/sp-shape.h"
+#include "object/sp-text.h"
+#include "path-chemistry.h"
+#include "preferences.h"
 #include "svg/stringstream.h"
-#include "svg/svg.h"
 #include "svg/svg-color.h"
 #include "svg/svg-length.h"
+#include "svg/svg.h"
+#include "text-editing.h"
 #include "util/units.h"
 #include "xml/node.h"
 #include "xml/sp-css-attr.h"
-#include "libnrtype/Layout-TNG.h"
-#include "document.h"
-#include "document-undo.h"
-#include "inkscape.h"
-#include "preferences.h"
-#include "path-chemistry.h"
 
 #include <cmath>
 #include <iomanip>
@@ -428,7 +428,7 @@ LPEMeasureSegments::createTextLabel(Geom::Point pos, size_t counter, double leng
     font_size <<  fontsize << "pt";
     setlocale (LC_NUMERIC, locale_base);
     gchar c[32];
-    sprintf(c, "#%06x", rgb24);
+    sprintf(c, "#%06lx", rgb24);
     sp_repr_css_set_property (css, "fill",c);
     Inkscape::SVGOStringStream os;
     os << SP_RGBA32_A_F(coloropacity.get_value());
@@ -626,7 +626,7 @@ LPEMeasureSegments::createLine(Geom::Point start,Geom::Point end, Glib::ustring
     style  += "stroke-width:";
     style  += stroke_w.str();
     gchar c[32];
-    sprintf(c, "#%06x", rgb24);
+    sprintf(c, "#%06lx", rgb24);
     style += ";stroke:";
     style += Glib::ustring(c);
     Inkscape::SVGOStringStream os;
diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp
index 1e62a98d5..b9a51cdee 100644
--- a/src/live_effects/lpe-mirror_symmetry.cpp
+++ b/src/live_effects/lpe-mirror_symmetry.cpp
@@ -14,21 +14,21 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm.h>
-#include "live_effects/lpe-mirror_symmetry.h"
-#include "display/curve.h"
-#include "svg/path-string.h"
-#include "svg/svg.h"
-#include "helper/geom.h"
+#include "2geom/affine.h"
 #include "2geom/intersection-graph.h"
 #include "2geom/path-intersection.h"
-#include "2geom/affine.h"
+#include "display/curve.h"
+#include "helper/geom.h"
 #include "helper/geom.h"
+#include "live_effects/lpe-mirror_symmetry.h"
 #include "path-chemistry.h"
+#include "svg/path-string.h"
+#include "svg/svg.h"
+#include <gtkmm.h>
 
 #include "object/sp-defs.h"
-#include "object/sp-path.h"
 #include "object/sp-lpe-item.h"
+#include "object/sp-path.h"
 #include "style.h"
 
 #include "xml/sp-css-attr.h"
diff --git a/src/live_effects/lpe-offset.cpp b/src/live_effects/lpe-offset.cpp
index 257d02c83..070c333ea 100644
--- a/src/live_effects/lpe-offset.cpp
+++ b/src/live_effects/lpe-offset.cpp
@@ -14,22 +14,22 @@
  */
 
 #include "live_effects/parameter/enum.h"
-#include "live_effects/lpe-offset.h"
 #include "display/curve.h"
-#include "inkscape.h"
-#include "helper/geom.h"
 #include "helper/geom-pathstroke.h"
-#include <2geom/sbasis-to-bezier.h>
-#include <2geom/piecewise.h>
-#include <2geom/path-intersection.h>
-#include <2geom/intersection-graph.h>
-#include <2geom/elliptical-arc.h>
-#include <2geom/angle.h>
-#include <2geom/curve.h>
-#include "object/sp-shape.h"
+#include "helper/geom.h"
+#include "inkscape.h"
 #include "knot-holder-entity.h"
-#include "knotholder.h"
 #include "knot.h"
+#include "knotholder.h"
+#include "live_effects/lpe-offset.h"
+#include "object/sp-shape.h"
+#include <2geom/angle.h>
+#include <2geom/curve.h>
+#include <2geom/elliptical-arc.h>
+#include <2geom/intersection-graph.h>
+#include <2geom/path-intersection.h>
+#include <2geom/piecewise.h>
+#include <2geom/sbasis-to-bezier.h>
 #include <algorithm>
 //this is only to flatten nonzero fillrule
 #include "livarot/Path.h"
diff --git a/src/live_effects/lpe-parallel.cpp b/src/live_effects/lpe-parallel.cpp
index 9c3b714cc..ace7ff2d0 100644
--- a/src/live_effects/lpe-parallel.cpp
+++ b/src/live_effects/lpe-parallel.cpp
@@ -12,8 +12,8 @@
  */
 
 #include "live_effects/lpe-parallel.h"
-#include "object/sp-shape.h"
 #include "display/curve.h"
+#include "object/sp-shape.h"
 
 #include "knotholder.h"
 
diff --git a/src/live_effects/lpe-patternalongpath.cpp b/src/live_effects/lpe-patternalongpath.cpp
index 115c777d0..13d8cd621 100644
--- a/src/live_effects/lpe-patternalongpath.cpp
+++ b/src/live_effects/lpe-patternalongpath.cpp
@@ -4,14 +4,14 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <cmath>
 #include <algorithm>
+#include <cmath>
 
 #include <2geom/bezier-to-sbasis.h>
 
+#include "display/curve.h"
 #include "live_effects/lpe-patternalongpath.h"
 #include "live_effects/lpeobject.h"
-#include "display/curve.h"
 
 #include "object/sp-shape.h"
 
diff --git a/src/live_effects/lpe-perspective-envelope.cpp b/src/live_effects/lpe-perspective-envelope.cpp
index e95cdfd4b..5ebe5ac54 100644
--- a/src/live_effects/lpe-perspective-envelope.cpp
+++ b/src/live_effects/lpe-perspective-envelope.cpp
@@ -14,11 +14,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm.h>
-#include "live_effects/lpe-perspective-envelope.h"
-#include "helper/geom.h"
 #include "display/curve.h"
+#include "helper/geom.h"
+#include "live_effects/lpe-perspective-envelope.h"
 #include <gsl/gsl_linalg.h>
+#include <gtkmm.h>
 
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
diff --git a/src/live_effects/lpe-perspective_path.cpp b/src/live_effects/lpe-perspective_path.cpp
index deed40bde..d5cb1ca90 100644
--- a/src/live_effects/lpe-perspective_path.cpp
+++ b/src/live_effects/lpe-perspective_path.cpp
@@ -14,10 +14,10 @@
 
 //#include "transf_mat_3x4.h"
 #include "document-private.h"
-#include "live_effects/lpe-perspective_path.h"
-#include "live_effects/lpeobject.h"
 #include "knot-holder-entity.h"
 #include "knotholder.h"
+#include "live_effects/lpe-perspective_path.h"
+#include "live_effects/lpeobject.h"
 #include <util/units.h>
 
 #include "object/persp3d.h"
diff --git a/src/live_effects/lpe-powerclip.cpp b/src/live_effects/lpe-powerclip.cpp
index b4c342930..5f9223d51 100644
--- a/src/live_effects/lpe-powerclip.cpp
+++ b/src/live_effects/lpe-powerclip.cpp
@@ -2,19 +2,19 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 #include "live_effects/lpe-powerclip.h"
-#include <2geom/path-intersection.h>
-#include <2geom/intersection-graph.h>
 #include "display/curve.h"
+#include "extract-uri.h"
 #include "helper/geom.h"
-#include "ui/tools-switch.h"
 #include "path-chemistry.h"
-#include "extract-uri.h"
+#include "ui/tools-switch.h"
+#include <2geom/intersection-graph.h>
+#include <2geom/path-intersection.h>
 #include <bad-uri-exception.h>
 
 #include "object/sp-clippath.h"
+#include "object/sp-item-group.h"
 #include "object/sp-path.h"
 #include "object/sp-shape.h"
-#include "object/sp-item-group.h"
 #include "object/uri.h"
 
 // TODO due to internal breakage in glibmm headers, this must be last:
diff --git a/src/live_effects/lpe-powermask.cpp b/src/live_effects/lpe-powermask.cpp
index 577d8a841..e757b1847 100644
--- a/src/live_effects/lpe-powermask.cpp
+++ b/src/live_effects/lpe-powermask.cpp
@@ -2,23 +2,23 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 #include "live_effects/lpe-powermask.h"
-#include <2geom/path-intersection.h>
-#include <2geom/intersection-graph.h>
 #include "display/curve.h"
+#include "extract-uri.h"
 #include "helper/geom.h"
-#include "svg/svg.h"
-#include "svg/svg-color.h"
+#include "path-chemistry.h"
 #include "svg/stringstream.h"
+#include "svg/svg-color.h"
+#include "svg/svg.h"
 #include "ui/tools-switch.h"
-#include "path-chemistry.h"
-#include "extract-uri.h"
+#include <2geom/intersection-graph.h>
+#include <2geom/path-intersection.h>
 #include <bad-uri-exception.h>
 
+#include "object/sp-defs.h"
+#include "object/sp-item-group.h"
 #include "object/sp-mask.h"
 #include "object/sp-path.h"
 #include "object/sp-shape.h"
-#include "object/sp-defs.h"
-#include "object/sp-item-group.h"
 #include "object/uri.h"
 
 
diff --git a/src/live_effects/lpe-powerstroke.cpp b/src/live_effects/lpe-powerstroke.cpp
index 1d64e9042..aed63b844 100644
--- a/src/live_effects/lpe-powerstroke.cpp
+++ b/src/live_effects/lpe-powerstroke.cpp
@@ -13,16 +13,16 @@
 #include "live_effects/lpe-powerstroke.h"
 #include "live_effects/lpe-powerstroke-interpolators.h"
 
-#include "svg/svg-color.h"
 #include "desktop-style.h"
-#include "svg/css-ostringstream.h"
 #include "display/curve.h"
+#include "svg/css-ostringstream.h"
+#include "svg/svg-color.h"
 
+#include "helper/geom.h"
+#include <2geom/circle.h>
 #include <2geom/elliptical-arc.h>
-#include <2geom/path-sink.h>
 #include <2geom/path-intersection.h>
-#include <2geom/circle.h>
-#include "helper/geom.h"
+#include <2geom/path-sink.h>
 
 #include "object/sp-shape.h"
 #include "style.h"
diff --git a/src/live_effects/lpe-pts2ellipse.cpp b/src/live_effects/lpe-pts2ellipse.cpp
index 4fd145646..d13b77da3 100644
--- a/src/live_effects/lpe-pts2ellipse.cpp
+++ b/src/live_effects/lpe-pts2ellipse.cpp
@@ -13,18 +13,18 @@
 
 #include "live_effects/lpe-pts2ellipse.h"
 
-#include <object/sp-shape.h>
+#include <display/curve.h>
+#include <object/sp-item-group.h>
 #include <object/sp-item.h>
 #include <object/sp-path.h>
-#include <object/sp-item-group.h>
+#include <object/sp-shape.h>
 #include <svg/svg.h>
-#include <display/curve.h>
 
-#include <2geom/path.h>
 #include <2geom/circle.h>
 #include <2geom/ellipse.h>
-#include <2geom/pathvector.h>
 #include <2geom/elliptical-arc.h>
+#include <2geom/path.h>
+#include <2geom/pathvector.h>
 
 #include <glib/gi18n.h>
 
diff --git a/src/live_effects/lpe-rough-hatches.cpp b/src/live_effects/lpe-rough-hatches.cpp
index 79ce89c9f..43c25eeab 100644
--- a/src/live_effects/lpe-rough-hatches.cpp
+++ b/src/live_effects/lpe-rough-hatches.cpp
@@ -19,8 +19,8 @@
 
 #include "xml/repr.h"
 
-#include <2geom/sbasis-math.h>
 #include <2geom/bezier-to-sbasis.h>
+#include <2geom/sbasis-math.h>
 
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
diff --git a/src/live_effects/lpe-roughen.cpp b/src/live_effects/lpe-roughen.cpp
index e78ab99fd..85d78c683 100644
--- a/src/live_effects/lpe-roughen.cpp
+++ b/src/live_effects/lpe-roughen.cpp
@@ -13,11 +13,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm.h>
-#include "live_effects/lpe-roughen.h"
 #include "display/curve.h"
-#include <boost/functional/hash.hpp>
 #include "helper/geom.h"
+#include "live_effects/lpe-roughen.h"
+#include <boost/functional/hash.hpp>
+#include <gtkmm.h>
 
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
diff --git a/src/live_effects/lpe-show_handles.cpp b/src/live_effects/lpe-show_handles.cpp
index 35da722d0..af8604e58 100644
--- a/src/live_effects/lpe-show_handles.cpp
+++ b/src/live_effects/lpe-show_handles.cpp
@@ -6,14 +6,14 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm.h>
-#include "live_effects/lpe-show_handles.h"
-#include <2geom/sbasis-to-bezier.h>
-#include <2geom/svg-path-parser.h>
-#include "helper/geom.h"
 #include "desktop-style.h"
 #include "display/curve.h"
+#include "helper/geom.h"
+#include "live_effects/lpe-show_handles.h"
 #include "svg/svg.h"
+#include <2geom/sbasis-to-bezier.h>
+#include <2geom/svg-path-parser.h>
+#include <gtkmm.h>
 
 #include "object/sp-shape.h"
 #include "style.h"
diff --git a/src/live_effects/lpe-simplify.cpp b/src/live_effects/lpe-simplify.cpp
index e676f37a0..2a7c6a1d3 100644
--- a/src/live_effects/lpe-simplify.cpp
+++ b/src/live_effects/lpe-simplify.cpp
@@ -2,14 +2,14 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm.h>
-#include "live_effects/lpe-simplify.h"
 #include "display/curve.h"
 #include "helper/geom.h"
-#include <2geom/svg-path-parser.h>
+#include "live_effects/lpe-simplify.h"
 #include "svg/svg.h"
-#include "ui/tools/node-tool.h"
 #include "ui/icon-names.h"
+#include "ui/tools/node-tool.h"
+#include <2geom/svg-path-parser.h>
+#include <gtkmm.h>
 
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
diff --git a/src/live_effects/lpe-sketch.cpp b/src/live_effects/lpe-sketch.cpp
index dfb860de8..82fd4e4cb 100644
--- a/src/live_effects/lpe-sketch.cpp
+++ b/src/live_effects/lpe-sketch.cpp
@@ -14,9 +14,9 @@
 #include "live_effects/lpe-sketch.h"
 
 // You might need to include other 2geom files. You can add them here:
-#include <2geom/sbasis-math.h>
 #include <2geom/bezier-to-sbasis.h>
 #include <2geom/path-intersection.h>
+#include <2geom/sbasis-math.h>
 
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
diff --git a/src/live_effects/lpe-spiro.cpp b/src/live_effects/lpe-spiro.cpp
index 8ea57bee4..6058bb16e 100644
--- a/src/live_effects/lpe-spiro.cpp
+++ b/src/live_effects/lpe-spiro.cpp
@@ -7,15 +7,15 @@
 #include "live_effects/lpe-spiro.h"
 
 #include "display/curve.h"
-#include <2geom/curves.h>
-#include "helper/geom-nodetype.h"
 #include "helper/geom-curves.h"
+#include "helper/geom-nodetype.h"
+#include <2geom/curves.h>
 
 #include "live_effects/spiro.h"
 
 // For handling un-continuous paths:
-#include "message-stack.h"
 #include "inkscape.h"
+#include "message-stack.h"
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-tangent_to_curve.cpp b/src/live_effects/lpe-tangent_to_curve.cpp
index 3a225c0be..8d0c91e92 100644
--- a/src/live_effects/lpe-tangent_to_curve.cpp
+++ b/src/live_effects/lpe-tangent_to_curve.cpp
@@ -17,8 +17,8 @@
 #include "display/curve.h"
 #include "knotholder.h"
 
-#include "object/sp-shape.h"
 #include "object/sp-object-group.h"
+#include "object/sp-shape.h"
 
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
diff --git a/src/live_effects/lpe-taperstroke.cpp b/src/live_effects/lpe-taperstroke.cpp
index b5e440767..cc0b602d3 100644
--- a/src/live_effects/lpe-taperstroke.cpp
+++ b/src/live_effects/lpe-taperstroke.cpp
@@ -18,17 +18,17 @@
 
 #include "desktop-style.h"
 
+#include "display/curve.h"
 #include "helper/geom-nodetype.h"
 #include "helper/geom-pathstroke.h"
-#include "display/curve.h"
-#include "svg/svg-color.h"
 #include "svg/css-ostringstream.h"
+#include "svg/svg-color.h"
 #include "svg/svg.h"
 
 #include "knotholder.h"
 
-#include "object/sp-shape.h"
 #include "object/sp-object-group.h"
+#include "object/sp-shape.h"
 #include "style.h"
 
 // TODO due to internal breakage in glibmm headers, this must be last:
diff --git a/src/live_effects/lpe-transform_2pts.cpp b/src/live_effects/lpe-transform_2pts.cpp
index 47f8864ce..36e0df24f 100644
--- a/src/live_effects/lpe-transform_2pts.cpp
+++ b/src/live_effects/lpe-transform_2pts.cpp
@@ -12,12 +12,12 @@
 
 #include <gtkmm.h>
 
-#include "live_effects/lpe-transform_2pts.h"
 #include "display/curve.h"
-#include "ui/icon-names.h"
+#include "live_effects/lpe-transform_2pts.h"
+#include "object/sp-path.h"
 #include "svg/svg.h"
+#include "ui/icon-names.h"
 #include "verbs.h"
-#include "object/sp-path.h"
 
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
diff --git a/src/live_effects/lpegroupbbox.cpp b/src/live_effects/lpegroupbbox.cpp
index 6df6278b1..5b339b8bf 100644
--- a/src/live_effects/lpegroupbbox.cpp
+++ b/src/live_effects/lpegroupbbox.cpp
@@ -8,11 +8,11 @@
 #include "document.h"
 #include "live_effects/lpegroupbbox.h"
 #include "object/sp-clippath.h"
+#include "object/sp-item-group.h"
+#include "object/sp-lpe-item.h"
 #include "object/sp-mask.h"
 #include "object/sp-root.h"
 #include "object/sp-shape.h"
-#include "object/sp-item-group.h"
-#include "object/sp-lpe-item.h"
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpeobject.cpp b/src/live_effects/lpeobject.cpp
index bc5ff0576..1d478bd48 100644
--- a/src/live_effects/lpeobject.cpp
+++ b/src/live_effects/lpeobject.cpp
@@ -9,11 +9,11 @@
 
 #include "live_effects/effect.h"
 
-#include "xml/repr.h"
-#include "xml/node-event-vector.h"
 #include "attributes.h"
-#include "document.h"
 #include "document-private.h"
+#include "document.h"
+#include "xml/node-event-vector.h"
+#include "xml/repr.h"
 
 #include "object/sp-defs.h"
 
diff --git a/src/live_effects/parameter/bool.cpp b/src/live_effects/parameter/bool.cpp
index bfbda2bfd..fa0195aaa 100644
--- a/src/live_effects/parameter/bool.cpp
+++ b/src/live_effects/parameter/bool.cpp
@@ -5,13 +5,13 @@
  */
 
 #include "ui/widget/registered-widget.h"
-#include "live_effects/parameter/bool.h"
+#include "helper-fns.h"
+#include "inkscape.h"
 #include "live_effects/effect.h"
-#include "svg/svg.h"
+#include "live_effects/parameter/bool.h"
 #include "svg/stringstream.h"
-#include "inkscape.h"
+#include "svg/svg.h"
 #include "verbs.h"
-#include "helper-fns.h"
 #include <glibmm/i18n.h>
 
 namespace Inkscape {
diff --git a/src/live_effects/parameter/colorpicker.cpp b/src/live_effects/parameter/colorpicker.cpp
index f6521d0c0..9b5ff67d1 100644
--- a/src/live_effects/parameter/colorpicker.cpp
+++ b/src/live_effects/parameter/colorpicker.cpp
@@ -4,19 +4,19 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm.h>
-#include "ui/widget/registered-widget.h"
-#include "live_effects/parameter/colorpicker.h"
-#include "live_effects/effect.h"
-#include "ui/widget/color-picker.h"
-#include "svg/svg.h"
-#include "svg/svg-color.h"
 #include "color.h"
+#include "document-undo.h"
+#include "document.h"
 #include "inkscape.h"
+#include "live_effects/effect.h"
+#include "live_effects/parameter/colorpicker.h"
 #include "svg/stringstream.h"
+#include "svg/svg-color.h"
+#include "svg/svg.h"
+#include "ui/widget/color-picker.h"
+#include "ui/widget/registered-widget.h"
 #include "verbs.h"
-#include "document.h"
-#include "document-undo.h"
+#include <gtkmm.h>
 
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/parameter/fontbutton.cpp b/src/live_effects/parameter/fontbutton.cpp
index 49edb850a..337b1d7a4 100644
--- a/src/live_effects/parameter/fontbutton.cpp
+++ b/src/live_effects/parameter/fontbutton.cpp
@@ -4,14 +4,14 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm.h>
-#include "ui/widget/registered-widget.h"
-#include "live_effects/parameter/fontbutton.h"
 #include "live_effects/effect.h"
-#include "ui/widget/font-button.h"
-#include "svg/svg.h"
+#include "live_effects/parameter/fontbutton.h"
 #include "svg/stringstream.h"
+#include "svg/svg.h"
+#include "ui/widget/font-button.h"
+#include "ui/widget/registered-widget.h"
 #include "verbs.h"
+#include <gtkmm.h>
 
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/parameter/hidden.cpp b/src/live_effects/parameter/hidden.cpp
index 5a21f572b..a68a7229c 100644
--- a/src/live_effects/parameter/hidden.cpp
+++ b/src/live_effects/parameter/hidden.cpp
@@ -13,8 +13,8 @@
 
 #include "live_effects/parameter/hidden.h"
 #include "live_effects/effect.h"
-#include "svg/svg.h"
 #include "svg/stringstream.h"
+#include "svg/svg.h"
 
 namespace Inkscape {
 
diff --git a/src/live_effects/parameter/item-reference.cpp b/src/live_effects/parameter/item-reference.cpp
index 6540245d3..407dc3be9 100644
--- a/src/live_effects/parameter/item-reference.cpp
+++ b/src/live_effects/parameter/item-reference.cpp
@@ -8,9 +8,9 @@
 
 #include "live_effects/parameter/item-reference.h"
 
+#include "object/sp-item-group.h"
 #include "object/sp-shape.h"
 #include "object/sp-text.h"
-#include "object/sp-item-group.h"
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/parameter/item.cpp b/src/live_effects/parameter/item.cpp
index 2107a5912..d3bc96f98 100644
--- a/src/live_effects/parameter/item.cpp
+++ b/src/live_effects/parameter/item.cpp
@@ -18,11 +18,11 @@
 #include "live_effects/effect.h"
 #include "svg/svg.h"
 
-#include "selection-chemistry.h"
-#include "xml/repr.h"
 #include "desktop.h"
 #include "inkscape.h"
 #include "message-stack.h"
+#include "selection-chemistry.h"
+#include "xml/repr.h"
 
 // clipboard support
 #include "ui/clipboard.h"
diff --git a/src/live_effects/parameter/message.cpp b/src/live_effects/parameter/message.cpp
index 03eb2219f..693396ce0 100644
--- a/src/live_effects/parameter/message.cpp
+++ b/src/live_effects/parameter/message.cpp
@@ -4,10 +4,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm.h>
-#include "live_effects/parameter/message.h"
 #include "live_effects/effect.h"
+#include "live_effects/parameter/message.h"
 #include <glibmm/i18n.h>
+#include <gtkmm.h>
 
 namespace Inkscape {
 
diff --git a/src/live_effects/parameter/originalitem.cpp b/src/live_effects/parameter/originalitem.cpp
index 52e4c2fd8..8e4bb0849 100644
--- a/src/live_effects/parameter/originalitem.cpp
+++ b/src/live_effects/parameter/originalitem.cpp
@@ -8,8 +8,8 @@
 # include "config.h"
 #endif
 
-#include <gtkmm/box.h>
 #include "live_effects/parameter/originalitem.h"
+#include <gtkmm/box.h>
 
 #include <glibmm/i18n.h>
 #include <gtkmm/button.h>
@@ -18,8 +18,8 @@
 #include "display/curve.h"
 #include "live_effects/effect.h"
 
-#include "inkscape.h"
 #include "desktop.h"
+#include "inkscape.h"
 #include "selection.h"
 
 #include "object/uri.h"
diff --git a/src/live_effects/parameter/originalitemarray.cpp b/src/live_effects/parameter/originalitemarray.cpp
index a801d25f6..f2ead5cea 100644
--- a/src/live_effects/parameter/originalitemarray.cpp
+++ b/src/live_effects/parameter/originalitemarray.cpp
@@ -10,27 +10,27 @@
 
 #include "live_effects/parameter/originalitemarray.h"
 
-#include <gtkmm/widget.h>
 #include <gtkmm/icontheme.h>
 #include <gtkmm/imagemenuitem.h>
-#include <gtkmm/separatormenuitem.h>
 #include <gtkmm/scrolledwindow.h>
+#include <gtkmm/separatormenuitem.h>
+#include <gtkmm/widget.h>
 
 #include <glibmm/i18n.h>
 
 #include "inkscape.h"
-#include "ui/clipboard.h"
-#include "svg/svg.h"
-#include "svg/stringstream.h"
 #include "originalitem.h"
+#include "svg/stringstream.h"
+#include "svg/svg.h"
+#include "ui/clipboard.h"
 
 #include "object/uri.h"
 
 #include "live_effects/effect.h"
 
-#include "verbs.h"
 #include "document-undo.h"
 #include "document.h"
+#include "verbs.h"
 
 namespace Inkscape {
 
diff --git a/src/live_effects/parameter/originalpath.cpp b/src/live_effects/parameter/originalpath.cpp
index 018e1e69e..e71df4a54 100644
--- a/src/live_effects/parameter/originalpath.cpp
+++ b/src/live_effects/parameter/originalpath.cpp
@@ -8,8 +8,8 @@
 # include "config.h"
 #endif
 
-#include <gtkmm/box.h>
 #include "live_effects/parameter/originalpath.h"
+#include <gtkmm/box.h>
 
 #include <glibmm/i18n.h>
 #include <gtkmm/button.h>
@@ -18,12 +18,12 @@
 #include "display/curve.h"
 #include "live_effects/effect.h"
 
-#include "object/uri.h"
 #include "object/sp-shape.h"
 #include "object/sp-text.h"
+#include "object/uri.h"
 
-#include "inkscape.h"
 #include "desktop.h"
+#include "inkscape.h"
 #include "selection.h"
 #include "ui/icon-names.h"
 
diff --git a/src/live_effects/parameter/originalpatharray.cpp b/src/live_effects/parameter/originalpatharray.cpp
index 70f17ccb8..309b6c989 100644
--- a/src/live_effects/parameter/originalpatharray.cpp
+++ b/src/live_effects/parameter/originalpatharray.cpp
@@ -8,26 +8,26 @@
 # include "config.h"
 #endif
 
-#include "live_effects/parameter/originalpatharray.h"
-#include "live_effects/lpe-spiro.h"
 #include "live_effects/lpe-bspline.h"
-#include "live_effects/lpeobject.h"
+#include "live_effects/lpe-spiro.h"
 #include "live_effects/lpeobject-reference.h"
+#include "live_effects/lpeobject.h"
+#include "live_effects/parameter/originalpatharray.h"
 
-#include <gtkmm/widget.h>
 #include <gtkmm/icontheme.h>
 #include <gtkmm/imagemenuitem.h>
-#include <gtkmm/separatormenuitem.h>
 #include <gtkmm/scrolledwindow.h>
+#include <gtkmm/separatormenuitem.h>
+#include <gtkmm/widget.h>
 
 #include <glibmm/i18n.h>
 
+#include "display/curve.h"
 #include "inkscape.h"
-#include "ui/clipboard.h"
-#include "svg/svg.h"
-#include "svg/stringstream.h"
 #include "originalpath.h"
-#include "display/curve.h"
+#include "svg/stringstream.h"
+#include "svg/svg.h"
+#include "ui/clipboard.h"
 
 #include <2geom/coord.h>
 #include <2geom/point.h>
@@ -38,9 +38,9 @@
 
 #include "live_effects/effect.h"
 
-#include "verbs.h"
 #include "document-undo.h"
 #include "document.h"
+#include "verbs.h"
 
 namespace Inkscape {
 
diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp
index ab385daa6..706b6d105 100644
--- a/src/live_effects/parameter/path.cpp
+++ b/src/live_effects/parameter/path.cpp
@@ -17,38 +17,38 @@
 
 #include "live_effects/effect.h"
 #include "svg/svg.h"
-#include <2geom/svg-path-parser.h>
-#include <2geom/sbasis-to-bezier.h>
-#include <2geom/pathvector.h>
 #include <2geom/d2.h>
+#include <2geom/pathvector.h>
+#include <2geom/sbasis-to-bezier.h>
+#include <2geom/svg-path-parser.h>
 
-#include "selection-chemistry.h"
-#include "xml/repr.h"
 #include "desktop.h"
+#include "document-undo.h"
+#include "document.h"
 #include "inkscape.h"
 #include "message-stack.h"
+#include "selection-chemistry.h"
 #include "verbs.h"
-#include "document.h"
-#include "document-undo.h"
+#include "xml/repr.h"
 
 // needed for on-canvas editing:
-#include "ui/tools-switch.h"
 #include "ui/shape-editor.h"
+#include "ui/tools-switch.h"
 
 #include "selection.h"
 // clipboard support
 #include "ui/clipboard.h"
 // required for linking to other paths
 
-#include "object/uri.h"
 #include "object/sp-shape.h"
 #include "object/sp-text.h"
+#include "object/uri.h"
 
 #include "display/curve.h"
 
-#include "ui/tools/node-tool.h"
 #include "ui/tool/multi-path-manipulator.h"
 #include "ui/tool/shape-record.h"
+#include "ui/tools/node-tool.h"
 
 #include "ui/icon-names.h"
 
diff --git a/src/live_effects/parameter/point.cpp b/src/live_effects/parameter/point.cpp
index b811b7f2b..2261ec59a 100644
--- a/src/live_effects/parameter/point.cpp
+++ b/src/live_effects/parameter/point.cpp
@@ -5,13 +5,13 @@
  */
 
 #include "live_effects/parameter/point.h"
+#include "inkscape.h"
+#include "knotholder.h"
 #include "live_effects/effect.h"
-#include "svg/svg.h"
 #include "svg/stringstream.h"
+#include "svg/svg.h"
 #include "ui/widget/point.h"
-#include "inkscape.h"
 #include "verbs.h"
-#include "knotholder.h"
 #include <glibmm/i18n.h>
 
 namespace Inkscape {
diff --git a/src/live_effects/parameter/powerstrokepointarray.cpp b/src/live_effects/parameter/powerstrokepointarray.cpp
index cf4adc5fd..a3739a09f 100644
--- a/src/live_effects/parameter/powerstrokepointarray.cpp
+++ b/src/live_effects/parameter/powerstrokepointarray.cpp
@@ -7,8 +7,8 @@
 #include "ui/dialog/lpe-powerstroke-properties.h"
 #include "live_effects/parameter/powerstrokepointarray.h"
 
-#include "live_effects/effect.h"
 #include "knotholder.h"
+#include "live_effects/effect.h"
 
 
 #include <2geom/piecewise.h>
diff --git a/src/live_effects/parameter/random.cpp b/src/live_effects/parameter/random.cpp
index 23912bedb..642a62bb4 100644
--- a/src/live_effects/parameter/random.cpp
+++ b/src/live_effects/parameter/random.cpp
@@ -5,11 +5,11 @@
  */
 
 #include "ui/widget/registered-widget.h"
-#include "live_effects/parameter/random.h"
 #include "live_effects/effect.h"
-#include <glibmm/i18n.h>
+#include "live_effects/parameter/random.h"
 #include "svg/svg.h"
 #include "ui/widget/random.h"
+#include <glibmm/i18n.h>
 
 #include "svg/stringstream.h"
 
diff --git a/src/live_effects/parameter/satellitesarray.cpp b/src/live_effects/parameter/satellitesarray.cpp
index c6f5492d1..d4254ec19 100644
--- a/src/live_effects/parameter/satellitesarray.cpp
+++ b/src/live_effects/parameter/satellitesarray.cpp
@@ -7,9 +7,9 @@
  */
 
 #include "knotholder.h"
-#include "ui/dialog/lpe-fillet-chamfer-properties.h"
-#include "live_effects/parameter/satellitesarray.h"
 #include "live_effects/effect.h"
+#include "live_effects/parameter/satellitesarray.h"
+#include "ui/dialog/lpe-fillet-chamfer-properties.h"
 
 #include "inkscape.h"
 #include <preferences.h>
diff --git a/src/live_effects/parameter/text.cpp b/src/live_effects/parameter/text.cpp
index 37ae3a1d7..2f48f87d5 100644
--- a/src/live_effects/parameter/text.cpp
+++ b/src/live_effects/parameter/text.cpp
@@ -11,13 +11,13 @@
 #include "ui/widget/registered-widget.h"
 #include <gtkmm/alignment.h>
 
-#include "live_effects/parameter/text.h"
+#include "display/canvas-text.h"
+#include "inkscape.h"
 #include "live_effects/effect.h"
-#include "svg/svg.h"
+#include "live_effects/parameter/text.h"
 #include "svg/stringstream.h"
-#include "inkscape.h"
+#include "svg/svg.h"
 #include "verbs.h"
-#include "display/canvas-text.h"
 #include <2geom/sbasis-geometric.h>
 
 #include <glibmm/i18n.h>
diff --git a/src/live_effects/parameter/togglebutton.cpp b/src/live_effects/parameter/togglebutton.cpp
index bb9d9a90e..74ceda456 100644
--- a/src/live_effects/parameter/togglebutton.cpp
+++ b/src/live_effects/parameter/togglebutton.cpp
@@ -8,14 +8,14 @@
 #include "ui/widget/registered-widget.h"
 #include <glibmm/i18n.h>
 
-#include "live_effects/parameter/togglebutton.h"
+#include "helper-fns.h"
+#include "inkscape.h"
 #include "live_effects/effect.h"
-#include "svg/svg.h"
-#include "svg/stringstream.h"
+#include "live_effects/parameter/togglebutton.h"
 #include "selection.h"
-#include "inkscape.h"
+#include "svg/stringstream.h"
+#include "svg/svg.h"
 #include "verbs.h"
-#include "helper-fns.h"
 
 namespace Inkscape {
 
diff --git a/src/live_effects/parameter/transformedpoint.cpp b/src/live_effects/parameter/transformedpoint.cpp
index ab66e7256..bbdbc43f8 100644
--- a/src/live_effects/parameter/transformedpoint.cpp
+++ b/src/live_effects/parameter/transformedpoint.cpp
@@ -8,11 +8,11 @@
 #include "live_effects/parameter/transformedpoint.h"
 
 #include "knotholder.h"
-#include "svg/svg.h"
 #include "svg/stringstream.h"
+#include "svg/svg.h"
 
-#include "live_effects/effect.h"
 #include "desktop.h"
+#include "live_effects/effect.h"
 #include "verbs.h"
 
 #include <glibmm/i18n.h>
diff --git a/src/live_effects/parameter/unit.cpp b/src/live_effects/parameter/unit.cpp
index 9199e592d..9216c06ef 100644
--- a/src/live_effects/parameter/unit.cpp
+++ b/src/live_effects/parameter/unit.cpp
@@ -7,10 +7,10 @@
 #include "ui/widget/registered-widget.h"
 #include <glibmm/i18n.h>
 
-#include "live_effects/parameter/unit.h"
 #include "live_effects/effect.h"
-#include "verbs.h"
+#include "live_effects/parameter/unit.h"
 #include "util/units.h"
+#include "verbs.h"
 
 using Inkscape::Util::unit_table;
 
diff --git a/src/live_effects/parameter/vector.cpp b/src/live_effects/parameter/vector.cpp
index 1207a05da..2bcd6c83f 100644
--- a/src/live_effects/parameter/vector.cpp
+++ b/src/live_effects/parameter/vector.cpp
@@ -10,8 +10,8 @@
 #include "live_effects/parameter/vector.h"
 
 #include "knotholder.h"
-#include "svg/svg.h"
 #include "svg/stringstream.h"
+#include "svg/svg.h"
 
 #include "live_effects/effect.h"
 #include "verbs.h"
diff --git a/src/live_effects/spiro-converters.cpp b/src/live_effects/spiro-converters.cpp
index ee214704c..06b9bbf84 100644
--- a/src/live_effects/spiro-converters.cpp
+++ b/src/live_effects/spiro-converters.cpp
@@ -7,8 +7,8 @@
  */

 

 #include "spiro-converters.h"

-#include <2geom/path.h>

 #include "display/curve.h"

+#include <2geom/path.h>

 #include <glib.h>

 

 #define SPIRO_SHOW_INFINITE_COORDINATE_CALLS

diff --git a/src/main.cpp b/src/main.cpp
index 4a3b2d4ea..db165f6aa 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -55,35 +55,35 @@
 #undef AND
 #endif
 
-#include "file.h"
+#include "color.h"
 #include "document.h"
+#include "file.h"
 #include "layer-model.h"
-#include "selection.h"
+#include "print.h"
 #include "selection-chemistry.h"
+#include "selection.h"
 #include "ui/interface.h"
-#include "print.h"
-#include "color.h"
 
-#include "svg/svg.h"
-#include "svg/svg-color.h"
 #include "svg/stringstream.h"
+#include "svg/svg-color.h"
+#include "svg/svg.h"
 
-#include "inkscape.h"
 #include "inkscape-version.h"
+#include "inkscape.h"
 
 #include "object/object-set.h"
+#include "object/sp-flowtext.h"
 #include "object/sp-guide.h"
-#include "object/sp-root.h"
 #include "object/sp-namedview.h"
+#include "object/sp-root.h"
 #include "object/sp-text.h"
-#include "object/sp-flowtext.h"
 
 #include "xml/repr.h"
 
 #include "io/sys.h"
 
-#include "debug/logger.h"
 #include "debug/log-display-config.h"
+#include "debug/logger.h"
 
 #include "helper/action-context.h"
 #include "helper/png-write.h"
@@ -91,10 +91,10 @@
 #include "helper/gettext.h"
 #endif
 
-#include <extension/extension.h>
 #include <extension/db.h>
-#include <extension/output.h>
+#include <extension/extension.h>
 #include <extension/input.h>
+#include <extension/output.h>
 
 #ifdef WIN32
 #include <windows.h>
@@ -108,19 +108,19 @@
 #include "extension/dbus/dbus-init.h"
 #endif // WITH_DBUS
 
-#include <glibmm/i18n.h>
 #include <glibmm/convert.h>
 #include <glibmm/fileutils.h>
-#include <glibmm/miscutils.h>
+#include <glibmm/i18n.h>
 #include <glibmm/main.h>
+#include <glibmm/miscutils.h>
 #include <gtkmm/main.h>
 #include <gtkmm/window.h>
 
 #include "main-cmdlineact.h"
 #include "main-cmdlinexact.h"
 
-#include <errno.h>
 #include "verbs.h"
+#include <errno.h>
 
 #include "path-chemistry.h"
 #include "text-editing.h"
diff --git a/src/message-context.cpp b/src/message-context.cpp
index 2c07f4a43..43f127c1b 100644
--- a/src/message-context.cpp
+++ b/src/message-context.cpp
@@ -9,9 +9,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib.h>
 #include "message-context.h"
 #include "message-stack.h"
+#include <glib.h>
 
 namespace Inkscape {
 
diff --git a/src/message-stack.cpp b/src/message-stack.cpp
index 70b2fb42d..e70527e9a 100644
--- a/src/message-stack.cpp
+++ b/src/message-stack.cpp
@@ -9,10 +9,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <string.h>
-#include <glib.h>
-#include <cstring>
 #include "message-stack.h"
+#include <cstring>
+#include <glib.h>
+#include <string.h>
 
 namespace Inkscape {
 
diff --git a/src/object/box3d-side.cpp b/src/object/box3d-side.cpp
index b6b9bbbf7..cce899305 100644
--- a/src/object/box3d-side.cpp
+++ b/src/object/box3d-side.cpp
@@ -12,17 +12,17 @@
  */
 
 #include "box3d-side.h"
-#include "document.h"
-#include "xml/document.h"
-#include "xml/repr.h"
-#include "display/curve.h"
-#include "svg/svg.h"
 #include "attributes.h"
+#include "desktop-style.h"
+#include "display/curve.h"
+#include "document.h"
 #include "inkscape.h"
-#include "persp3d.h"
 #include "persp3d-reference.h"
+#include "persp3d.h"
+#include "svg/svg.h"
 #include "ui/tools/box3d-tool.h"
-#include "desktop-style.h"
+#include "xml/document.h"
+#include "xml/repr.h"
 
 static void box3d_side_compute_corner_ids(Box3DSide *side, unsigned int corners[4]);
 
diff --git a/src/object/box3d.cpp b/src/object/box3d.cpp
index af1d00b0f..6c574e13b 100644
--- a/src/object/box3d.cpp
+++ b/src/object/box3d.cpp
@@ -17,20 +17,20 @@
 
 #include "box3d.h"
 
-#include <glibmm/i18n.h>
 #include "attributes.h"
 #include "xml/document.h"
 #include "xml/repr.h"
+#include <glibmm/i18n.h>
 
 #include "bad-uri-exception.h"
 #include "box3d-side.h"
-#include "ui/tools/box3d-tool.h"
-#include "perspective-line.h"
 #include "persp3d-reference.h"
-#include "uri.h"
-#include <2geom/line.h>
+#include "perspective-line.h"
 #include "sp-guide.h"
 #include "sp-namedview.h"
+#include "ui/tools/box3d-tool.h"
+#include "uri.h"
+#include <2geom/line.h>
 
 #include "desktop.h"
 
diff --git a/src/object/color-profile.cpp b/src/object/color-profile.cpp
index 7bdde9b6d..c0ff72752 100644
--- a/src/object/color-profile.cpp
+++ b/src/object/color-profile.cpp
@@ -6,18 +6,18 @@
 
 #include <gdkmm/rgba.h>
 
-#include <glib/gstdio.h>
 #include <fcntl.h>
 #include <glib/gi18n.h>
+#include <glib/gstdio.h>
 
 #ifdef DEBUG_LCMS
 #include <gtk/gtk.h>
 #endif // DEBUG_LCMS
 
-#include <unistd.h>
 #include <cstring>
-#include <io/sys.h>
 #include <io/resource.h>
+#include <io/sys.h>
+#include <unistd.h>
 
 #ifdef WIN32
 #ifndef _WIN32_WINDOWS         // Allow use of features specific to Windows 98 or later. Required for correctly including icm.h
@@ -32,18 +32,18 @@
 #  include <lcms.h>
 #endif // HAVE_LIBLCMS2
 
-#include "xml/repr.h"
-#include "color.h"
-#include "color-profile.h"
+#include "attributes.h"
 #include "cms-system.h"
 #include "color-profile-cms-fns.h"
-#include "attributes.h"
-#include "inkscape.h"
+#include "color-profile.h"
+#include "color.h"
 #include "document.h"
+#include "inkscape.h"
 #include "preferences.h"
+#include "uri.h"
+#include "xml/repr.h"
 #include <glibmm/checksum.h>
 #include <glibmm/convert.h>
-#include "uri.h"
 
 #ifdef WIN32
 #include <icm.h>
diff --git a/src/object/filters/colormatrix.cpp b/src/object/filters/colormatrix.cpp
index 0e8398ace..85b420049 100644
--- a/src/object/filters/colormatrix.cpp
+++ b/src/object/filters/colormatrix.cpp
@@ -17,10 +17,10 @@
 #include <string.h>
 
 #include "attributes.h"
-#include "svg/svg.h"
 #include "colormatrix.h"
-#include "xml/repr.h"
 #include "helper-fns.h"
+#include "svg/svg.h"
+#include "xml/repr.h"
 
 #include "display/nr-filter.h"
 
diff --git a/src/object/filters/componenttransfer-funcnode.cpp b/src/object/filters/componenttransfer-funcnode.cpp
index 23c8dbd96..f17740668 100644
--- a/src/object/filters/componenttransfer-funcnode.cpp
+++ b/src/object/filters/componenttransfer-funcnode.cpp
@@ -16,11 +16,11 @@
 #include <glib.h>
 
 #include "attributes.h"
-#include "document.h"
-#include "componenttransfer.h"
 #include "componenttransfer-funcnode.h"
-#include "xml/repr.h"
+#include "componenttransfer.h"
+#include "document.h"
 #include "helper-fns.h"
+#include "xml/repr.h"
 
 #define SP_MACROS_SILENT
 
diff --git a/src/object/filters/componenttransfer.cpp b/src/object/filters/componenttransfer.cpp
index dd13d85d1..0a7778f89 100644
--- a/src/object/filters/componenttransfer.cpp
+++ b/src/object/filters/componenttransfer.cpp
@@ -16,8 +16,8 @@
 #include "document.h"
 
 // In same directory
-#include "componenttransfer.h"
 #include "componenttransfer-funcnode.h"
+#include "componenttransfer.h"
 
 #include "display/nr-filter.h"
 
diff --git a/src/object/filters/composite.cpp b/src/object/filters/composite.cpp
index bca67774b..ea2a2b82e 100644
--- a/src/object/filters/composite.cpp
+++ b/src/object/filters/composite.cpp
@@ -17,8 +17,8 @@
 #include "attributes.h"
 #include "helper-fns.h"
 
-#include "display/nr-filter.h"
 #include "display/nr-filter-composite.h"
+#include "display/nr-filter.h"
 
 #include "object/sp-filter.h"
 
diff --git a/src/object/filters/convolvematrix.cpp b/src/object/filters/convolvematrix.cpp
index e856690ff..39965bc56 100644
--- a/src/object/filters/convolvematrix.cpp
+++ b/src/object/filters/convolvematrix.cpp
@@ -13,8 +13,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <string.h>
 #include <math.h>
+#include <string.h>
 #include <vector>
 
 #include "convolvematrix.h"
diff --git a/src/object/filters/diffuselighting.cpp b/src/object/filters/diffuselighting.cpp
index f23817993..b5ccb2775 100644
--- a/src/object/filters/diffuselighting.cpp
+++ b/src/object/filters/diffuselighting.cpp
@@ -20,15 +20,15 @@
 #include "pointlight.h"
 #include "spotlight.h"
 
-#include "strneq.h"
 #include "attributes.h"
+#include "strneq.h"
 
-#include "display/nr-filter.h"
 #include "display/nr-filter-diffuselighting.h"
+#include "display/nr-filter.h"
 
-#include "svg/svg.h"
 #include "svg/svg-color.h"
 #include "svg/svg-icc-color.h"
+#include "svg/svg.h"
 
 #include "xml/repr.h"
 
diff --git a/src/object/filters/distantlight.cpp b/src/object/filters/distantlight.cpp
index 076a7aab5..d53c93b5a 100644
--- a/src/object/filters/distantlight.cpp
+++ b/src/object/filters/distantlight.cpp
@@ -16,8 +16,8 @@
 #include <glib.h>
 
 // In same dirctory
-#include "distantlight.h"
 #include "diffuselighting.h"
+#include "distantlight.h"
 #include "specularlighting.h"
 
 #include "attributes.h"
diff --git a/src/object/filters/flood.cpp b/src/object/filters/flood.cpp
index 9132b2028..c9919bdff 100644
--- a/src/object/filters/flood.cpp
+++ b/src/object/filters/flood.cpp
@@ -14,14 +14,14 @@
 
 #include "flood.h"
 
-#include "strneq.h"
 #include "attributes.h"
+#include "strneq.h"
 
-#include "svg/svg.h"
 #include "svg/svg-color.h"
+#include "svg/svg.h"
 
-#include "display/nr-filter.h"
 #include "display/nr-filter-flood.h"
+#include "display/nr-filter.h"
 
 #include "xml/repr.h"
 
diff --git a/src/object/filters/gaussian-blur.cpp b/src/object/filters/gaussian-blur.cpp
index 81addb8e1..78b69924d 100644
--- a/src/object/filters/gaussian-blur.cpp
+++ b/src/object/filters/gaussian-blur.cpp
@@ -21,8 +21,8 @@
 
 #include "attributes.h"
 
-#include "display/nr-filter.h"
 #include "display/nr-filter-gaussian.h"
+#include "display/nr-filter.h"
 
 #include "svg/svg.h"
 
diff --git a/src/object/filters/image.cpp b/src/object/filters/image.cpp
index 1eeb32111..0ab9707ee 100644
--- a/src/object/filters/image.cpp
+++ b/src/object/filters/image.cpp
@@ -24,8 +24,8 @@
 #include "bad-uri-exception.h"
 
 #include "object/sp-image.h"
-#include "object/uri.h"
 #include "object/uri-references.h"
+#include "object/uri.h"
 
 #include "display/nr-filter-image.h"
 #include "display/nr-filter.h"
diff --git a/src/object/filters/merge.cpp b/src/object/filters/merge.cpp
index 8ec40cb46..2d7f74258 100644
--- a/src/object/filters/merge.cpp
+++ b/src/object/filters/merge.cpp
@@ -15,10 +15,10 @@
 #include "svg/svg.h"
 #include "xml/repr.h"
 
+#include "display/nr-filter-merge.h"
+#include "display/nr-filter.h"
 #include "merge.h"
 #include "mergenode.h"
-#include "display/nr-filter.h"
-#include "display/nr-filter-merge.h"
 
 SPFeMerge::SPFeMerge() : SPFilterPrimitive() {
 }
diff --git a/src/object/filters/morphology.cpp b/src/object/filters/morphology.cpp
index b3cfa0697..e80f0c5e1 100644
--- a/src/object/filters/morphology.cpp
+++ b/src/object/filters/morphology.cpp
@@ -16,10 +16,10 @@
 #include <string.h>
 
 #include "attributes.h"
-#include "svg/svg.h"
+#include "display/nr-filter.h"
 #include "morphology.h"
+#include "svg/svg.h"
 #include "xml/repr.h"
-#include "display/nr-filter.h"
 
 SPFeMorphology::SPFeMorphology() : SPFilterPrimitive() {
 	this->Operator = Inkscape::Filters::MORPHOLOGY_OPERATOR_ERODE;
diff --git a/src/object/filters/offset.cpp b/src/object/filters/offset.cpp
index a0057d722..7814927ed 100644
--- a/src/object/filters/offset.cpp
+++ b/src/object/filters/offset.cpp
@@ -18,8 +18,8 @@
 #include "attributes.h"
 #include "helper-fns.h"
 
-#include "display/nr-filter.h"
 #include "display/nr-filter-offset.h"
+#include "display/nr-filter.h"
 
 #include "svg/svg.h"
 
diff --git a/src/object/filters/specularlighting.cpp b/src/object/filters/specularlighting.cpp
index c46a21080..df92badf7 100644
--- a/src/object/filters/specularlighting.cpp
+++ b/src/object/filters/specularlighting.cpp
@@ -23,14 +23,14 @@
 #include "attributes.h"
 #include "strneq.h"
 
-#include "display/nr-filter.h"
 #include "display/nr-filter-specularlighting.h"
+#include "display/nr-filter.h"
 
 #include "object/sp-object.h"
 
-#include "svg/svg.h"
 #include "svg/svg-color.h"
 #include "svg/svg-icc-color.h"
+#include "svg/svg.h"
 
 #include "xml/repr.h"
 
diff --git a/src/object/filters/tile.cpp b/src/object/filters/tile.cpp
index 82e63c220..2a7ea3160 100644
--- a/src/object/filters/tile.cpp
+++ b/src/object/filters/tile.cpp
@@ -15,8 +15,8 @@
 
 #include "attributes.h"
 
-#include "display/nr-filter.h"
 #include "display/nr-filter-tile.h"
+#include "display/nr-filter.h"
 
 #include "svg/svg.h"
 
diff --git a/src/object/filters/turbulence.cpp b/src/object/filters/turbulence.cpp
index 9af51892e..b9630d53b 100644
--- a/src/object/filters/turbulence.cpp
+++ b/src/object/filters/turbulence.cpp
@@ -15,9 +15,9 @@
  */
 
 #include "attributes.h"
+#include "helper-fns.h"
 #include "svg/svg.h"
 #include "turbulence.h"
-#include "helper-fns.h"
 #include "xml/repr.h"
 
 #include "display/nr-filter.h"
diff --git a/src/object/object-set.cpp b/src/object/object-set.cpp
index 36ddac350..44c0ded6f 100644
--- a/src/object/object-set.cpp
+++ b/src/object/object-set.cpp
@@ -9,14 +9,14 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <sigc++/sigc++.h>
-#include <glib.h>
-#include "object-set.h"
 #include "box3d.h"
+#include "object-set.h"
 #include "persp3d.h"
 #include "preferences.h"
 #include <boost/range/adaptor/filtered.hpp>
 #include <boost/range/adaptor/transformed.hpp>
+#include <glib.h>
+#include <sigc++/sigc++.h>
 
 namespace Inkscape {
 
diff --git a/src/object/persp3d.cpp b/src/object/persp3d.cpp
index ca39447a1..2dcb202e0 100644
--- a/src/object/persp3d.cpp
+++ b/src/object/persp3d.cpp
@@ -13,21 +13,21 @@
 
 #include "persp3d.h"
 #include "perspective-line.h"
-#include "sp-root.h"
 #include "sp-defs.h"
+#include "sp-root.h"
 
 #include "attributes.h"
+#include "desktop.h"
 #include "document-private.h"
 #include "document-undo.h"
-#include "vanishing-point.h"
-#include "ui/tools/box3d-tool.h"
 #include "svg/stringstream.h"
+#include "ui/tools/box3d-tool.h"
+#include "vanishing-point.h"
 #include "xml/node-event-vector.h"
-#include "desktop.h"
 
-#include <glibmm/i18n.h>
-#include "verbs.h"
 #include "util/units.h"
+#include "verbs.h"
+#include <glibmm/i18n.h>
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/object/sp-anchor.cpp b/src/object/sp-anchor.cpp
index b40f53ee1..c9fa19d0e 100644
--- a/src/object/sp-anchor.cpp
+++ b/src/object/sp-anchor.cpp
@@ -14,13 +14,13 @@
 
 #define noSP_ANCHOR_VERBOSE
 
-#include <glibmm/i18n.h>
-#include "xml/quote.h"
-#include "xml/repr.h"
 #include "attributes.h"
+#include "document.h"
 #include "sp-anchor.h"
 #include "ui/view/view.h"
-#include "document.h"
+#include "xml/quote.h"
+#include "xml/repr.h"
+#include <glibmm/i18n.h>
 
 SPAnchor::SPAnchor() : SPGroup() {
     this->href = NULL;
diff --git a/src/object/sp-clippath.cpp b/src/object/sp-clippath.cpp
index 4afbf7e51..79f3371c1 100644
--- a/src/object/sp-clippath.cpp
+++ b/src/object/sp-clippath.cpp
@@ -15,21 +15,21 @@
 #include <cstring>
 #include <string>
 
-#include "display/drawing.h"
 #include "display/drawing-group.h"
+#include "display/drawing.h"
 #include "xml/repr.h"
 
-#include "enums.h"
 #include "attributes.h"
-#include "document.h"
 #include "document-private.h"
+#include "document.h"
+#include "enums.h"
 #include "style.h"
 
 #include <2geom/transforms.h>
 
 #include "sp-clippath.h"
-#include "sp-item.h"
 #include "sp-defs.h"
+#include "sp-item.h"
 
 struct SPClipPathView {
     SPClipPathView *next;
diff --git a/src/object/sp-conn-end-pair.cpp b/src/object/sp-conn-end-pair.cpp
index b810df315..2c45b2858 100644
--- a/src/object/sp-conn-end-pair.cpp
+++ b/src/object/sp-conn-end-pair.cpp
@@ -12,18 +12,18 @@
  */
 
 #include <cstring>
-#include <string>
 #include <glibmm/stringutils.h>
+#include <string>
 
+#include "3rdparty/adaptagrams/libavoid/router.h"
 #include "attributes.h"
-#include "sp-conn-end.h"
-#include "uri.h"
 #include "display/curve.h"
-#include "xml/repr.h"
-#include "sp-path.h"
-#include "3rdparty/adaptagrams/libavoid/router.h"
 #include "document.h"
+#include "sp-conn-end.h"
 #include "sp-item-group.h"
+#include "sp-path.h"
+#include "uri.h"
+#include "xml/repr.h"
 
 
 SPConnEndPair::SPConnEndPair(SPPath *const owner)
diff --git a/src/object/sp-conn-end.cpp b/src/object/sp-conn-end.cpp
index 996d8499a..f6a87d610 100644
--- a/src/object/sp-conn-end.cpp
+++ b/src/object/sp-conn-end.cpp
@@ -1,17 +1,17 @@
 #include "sp-conn-end.h"
 
 #include <cstring>
-#include <string>
 #include <limits>
+#include <string>
 
+#include "2geom/path-intersection.h"
 #include "bad-uri-exception.h"
 #include "display/curve.h"
-#include "xml/repr.h"
-#include "sp-path.h"
-#include "uri.h"
 #include "document.h"
 #include "sp-item-group.h"
-#include "2geom/path-intersection.h"
+#include "sp-path.h"
+#include "uri.h"
+#include "xml/repr.h"
 
 
 static void change_endpts(SPCurve *const curve, double const endPos[2]);
diff --git a/src/object/sp-defs.cpp b/src/object/sp-defs.cpp
index 619a27c0f..05b6ac674 100644
--- a/src/object/sp-defs.cpp
+++ b/src/object/sp-defs.cpp
@@ -17,8 +17,8 @@
  */
 
 #include "sp-defs.h"
-#include "xml/repr.h"
 #include "document.h"
+#include "xml/repr.h"
 
 SPDefs::SPDefs() : SPObject() {
 }
diff --git a/src/object/sp-ellipse.cpp b/src/object/sp-ellipse.cpp
index 74ade912c..a6b1123a9 100644
--- a/src/object/sp-ellipse.cpp
+++ b/src/object/sp-ellipse.cpp
@@ -18,8 +18,8 @@
 #include <glibmm/i18n.h>
 
 #include "live_effects/effect.h"
-#include "live_effects/lpeobject.h"
 #include "live_effects/lpeobject-reference.h"
+#include "live_effects/lpeobject.h"
 
 #include <2geom/angle.h>
 #include <2geom/circle.h>
@@ -33,8 +33,8 @@
 #include "snap-candidate.h"
 #include "sp-ellipse.h"
 #include "style.h"
-#include "svg/svg.h"
 #include "svg/path-string.h"
+#include "svg/svg.h"
 
 #define SP_2PI (2 * M_PI)
 
diff --git a/src/object/sp-factory.cpp b/src/object/sp-factory.cpp
index a540399c7..a3f52a574 100644
--- a/src/object/sp-factory.cpp
+++ b/src/object/sp-factory.cpp
@@ -11,9 +11,10 @@
 #include "sp-factory.h"
 
 // primary
-#include "box3d.h"
 #include "box3d-side.h"
+#include "box3d.h"
 #include "color-profile.h"
+#include "live_effects/lpeobject.h"
 #include "persp3d.h"
 #include "sp-anchor.h"
 #include "sp-clippath.h"
@@ -24,13 +25,13 @@
 #include "sp-flowdiv.h"
 #include "sp-flowregion.h"
 #include "sp-flowtext.h"
-#include "sp-font.h"
 #include "sp-font-face.h"
-#include "sp-glyph.h"
+#include "sp-font.h"
 #include "sp-glyph-kerning.h"
+#include "sp-glyph.h"
 #include "sp-guide.h"
-#include "sp-hatch.h"
 #include "sp-hatch-path.h"
+#include "sp-hatch.h"
 #include "sp-image.h"
 #include "sp-line.h"
 #include "sp-linear-gradient.h"
@@ -58,21 +59,20 @@
 #include "sp-style-elem.h"
 #include "sp-switch.h"
 #include "sp-symbol.h"
-#include "sp-tag.h"
 #include "sp-tag-use.h"
+#include "sp-tag.h"
 #include "sp-text.h"
 #include "sp-textpath.h"
 #include "sp-title.h"
 #include "sp-tref.h"
 #include "sp-tspan.h"
 #include "sp-use.h"
-#include "live_effects/lpeobject.h"
 
 // filters
 #include "filters/blend.h"
 #include "filters/colormatrix.h"
-#include "filters/componenttransfer.h"
 #include "filters/componenttransfer-funcnode.h"
+#include "filters/componenttransfer.h"
 #include "filters/composite.h"
 #include "filters/convolvematrix.h"
 #include "filters/diffuselighting.h"
diff --git a/src/object/sp-filter.cpp b/src/object/sp-filter.cpp
index 6cb4f8e5d..81e9e904b 100644
--- a/src/object/sp-filter.cpp
+++ b/src/object/sp-filter.cpp
@@ -24,12 +24,12 @@
 
 #include <glibmm.h>
 
-#include "bad-uri-exception.h"
 #include "attributes.h"
+#include "bad-uri-exception.h"
 #include "display/nr-filter.h"
 #include "document.h"
-#include "sp-filter-reference.h"
 #include "filters/sp-filter-primitive.h"
+#include "sp-filter-reference.h"
 #include "uri.h"
 #include "xml/repr.h"
 
diff --git a/src/object/sp-flowdiv.cpp b/src/object/sp-flowdiv.cpp
index 002fcff85..4b82dcfbc 100644
--- a/src/object/sp-flowdiv.cpp
+++ b/src/object/sp-flowdiv.cpp
@@ -2,9 +2,9 @@
  */
 
 #include "xml/repr.h"
+#include "document.h"
 #include "sp-flowdiv.h"
 #include "sp-string.h"
-#include "document.h"
 
 SPFlowdiv::SPFlowdiv() : SPItem() {
 }
diff --git a/src/object/sp-flowregion.cpp b/src/object/sp-flowregion.cpp
index 6640d93c2..f5855a2d4 100644
--- a/src/object/sp-flowregion.cpp
+++ b/src/object/sp-flowregion.cpp
@@ -6,15 +6,15 @@
 #endif
 #include <glibmm/i18n.h>
 
-#include <xml/repr.h>
 #include "display/curve.h"
+#include "document.h"
+#include "sp-desc.h"
 #include "sp-shape.h"
 #include "sp-text.h"
+#include "sp-title.h"
 #include "sp-use.h"
 #include "style.h"
-#include "document.h"
-#include "sp-title.h"
-#include "sp-desc.h"
+#include <xml/repr.h>
 
 #include "sp-flowregion.h"
 
diff --git a/src/object/sp-flowtext.cpp b/src/object/sp-flowtext.cpp
index 28b6b9575..8eeefe445 100644
--- a/src/object/sp-flowtext.cpp
+++ b/src/object/sp-flowtext.cpp
@@ -4,20 +4,20 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <glibmm/i18n.h>
 #include <cstring>
+#include <glibmm/i18n.h>
 #include <string>
 
 #include "attributes.h"
-#include "xml/repr.h"
-#include "style.h"
-#include "inkscape.h"
 #include "document.h"
+#include "inkscape.h"
+#include "style.h"
+#include "xml/repr.h"
 
 #include "desktop.h"
 
-#include "text-tag-attributes.h"
 #include "text-editing.h"
+#include "text-tag-attributes.h"
 
 #include "sp-flowdiv.h"
 #include "sp-flowregion.h"
diff --git a/src/object/sp-font-face.cpp b/src/object/sp-font-face.cpp
index 52fc09ddd..936b22368 100644
--- a/src/object/sp-font-face.cpp
+++ b/src/object/sp-font-face.cpp
@@ -20,8 +20,8 @@
 
 #include "xml/repr.h"
 #include "attributes.h"
-#include "sp-font-face.h"
 #include "document.h"
+#include "sp-font-face.h"
 
 #include <cstring>
 
diff --git a/src/object/sp-font.cpp b/src/object/sp-font.cpp
index a0193224c..72b4dc77b 100644
--- a/src/object/sp-font.cpp
+++ b/src/object/sp-font.cpp
@@ -16,8 +16,8 @@
 
 #include "xml/repr.h"
 #include "attributes.h"
-#include "sp-font.h"
 #include "document.h"
+#include "sp-font.h"
 
 #include "display/nr-svgfonts.h"
 
diff --git a/src/object/sp-glyph.cpp b/src/object/sp-glyph.cpp
index 6284cbfa1..4cc6e0690 100644
--- a/src/object/sp-glyph.cpp
+++ b/src/object/sp-glyph.cpp
@@ -15,8 +15,8 @@
 
 #include "xml/repr.h"
 #include "attributes.h"
-#include "sp-glyph.h"
 #include "document.h"
+#include "sp-glyph.h"
 
 SPGlyph::SPGlyph()
     : SPObject() 
diff --git a/src/object/sp-gradient.cpp b/src/object/sp-gradient.cpp
index feaa04e0f..477fd8a14 100644
--- a/src/object/sp-gradient.cpp
+++ b/src/object/sp-gradient.cpp
@@ -33,23 +33,23 @@
 
 #include <cairo.h>
 
-#include <sigc++/functors/ptr_fun.h>
 #include <sigc++/adaptors/bind.h>
+#include <sigc++/functors/ptr_fun.h>
 
+#include "attributes.h"
 #include "bad-uri-exception.h"
 #include "display/cairo-utils.h"
-#include "svg/svg.h"
-#include "svg/css-ostringstream.h"
-#include "attributes.h"
 #include "document-private.h"
 #include "gradient-chemistry.h"
 #include "sp-gradient-reference.h"
 #include "sp-linear-gradient.h"
-#include "sp-radial-gradient.h"
 #include "sp-mesh-gradient.h"
-#include "sp-mesh-row.h"
 #include "sp-mesh-patch.h"
+#include "sp-mesh-row.h"
+#include "sp-radial-gradient.h"
 #include "sp-stop.h"
+#include "svg/css-ostringstream.h"
+#include "svg/svg.h"
 
 /// Has to be power of 2   Seems to be unused.
 //#define NCOLORS NR_GRADIENT_VECTOR_LENGTH
diff --git a/src/object/sp-guide.cpp b/src/object/sp-guide.cpp
index 25bcee92b..7bfa03798 100644
--- a/src/object/sp-guide.cpp
+++ b/src/object/sp-guide.cpp
@@ -23,24 +23,24 @@
 #include <cstring>
 #include <string>
 
-#include "display/sp-canvas.h"
-#include "display/guideline.h"
-#include "svg/svg.h"
-#include "svg/svg-color.h"
-#include "svg/stringstream.h"
 #include "attributes.h"
-#include "sp-guide.h"
-#include "sp-item-notify-moveto.h"
-#include <glibmm/i18n.h>
-#include <xml/repr.h>
-#include <remove-last.h>
-#include "inkscape.h"
 #include "desktop.h"
-#include "sp-root.h"
-#include "sp-namedview.h"
+#include "display/guideline.h"
+#include "display/sp-canvas.h"
 #include "document-undo.h"
 #include "helper-fns.h"
+#include "inkscape.h"
+#include "sp-guide.h"
+#include "sp-item-notify-moveto.h"
+#include "sp-namedview.h"
+#include "sp-root.h"
+#include "svg/stringstream.h"
+#include "svg/svg-color.h"
+#include "svg/svg.h"
 #include "verbs.h"
+#include <glibmm/i18n.h>
+#include <remove-last.h>
+#include <xml/repr.h>
 
 using Inkscape::DocumentUndo;
 using std::vector;
diff --git a/src/object/sp-hatch-path.cpp b/src/object/sp-hatch-path.cpp
index 4497b6911..7b4d4834d 100644
--- a/src/object/sp-hatch-path.cpp
+++ b/src/object/sp-hatch-path.cpp
@@ -12,22 +12,22 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <string>
 #include <2geom/path.h>
+#include <string>
 
-#include "svg/svg.h"
+#include "attributes.h"
 #include "display/cairo-utils.h"
 #include "display/curve.h"
 #include "display/drawing-context.h"
+#include "display/drawing-shape.h"
 #include "display/drawing-surface.h"
 #include "display/drawing.h"
-#include "display/drawing-shape.h"
-#include "helper/geom.h"
-#include "attributes.h"
 #include "document-private.h"
-#include "sp-item.h"
+#include "helper/geom.h"
 #include "sp-hatch-path.h"
+#include "sp-item.h"
 #include "svg/css-ostringstream.h"
+#include "svg/svg.h"
 
 SPHatchPath::SPHatchPath()
     : offset(),
diff --git a/src/object/sp-hatch.cpp b/src/object/sp-hatch.cpp
index f1958a53b..45d22d74f 100644
--- a/src/object/sp-hatch.cpp
+++ b/src/object/sp-hatch.cpp
@@ -20,16 +20,16 @@
 #include <2geom/transforms.h>
 #include <sigc++/functors/mem_fun.h>
 
+#include "attributes.h"
 #include "bad-uri-exception.h"
-#include "svg/svg.h"
 #include "display/cairo-utils.h"
 #include "display/drawing-context.h"
+#include "display/drawing-pattern.h"
 #include "display/drawing-surface.h"
 #include "display/drawing.h"
-#include "display/drawing-pattern.h"
-#include "attributes.h"
 #include "document-private.h"
 #include "sp-hatch-path.h"
+#include "svg/svg.h"
 
 SPHatch::SPHatch()
     : SPPaintServer(),
diff --git a/src/object/sp-image.cpp b/src/object/sp-image.cpp
index 8d3a15f0b..69288d1cd 100644
--- a/src/object/sp-image.cpp
+++ b/src/object/sp-image.cpp
@@ -17,28 +17,28 @@
 # include "config.h"
 #endif
 
-#include <cstring>
-#include <algorithm>
-#include <string>
-#include <glibmm.h>
-#include <glib/gstdio.h>
 #include <2geom/rect.h>
 #include <2geom/transforms.h>
+#include <algorithm>
+#include <cstring>
+#include <glib/gstdio.h>
+#include <glibmm.h>
 #include <glibmm/i18n.h>
+#include <string>
 
-#include "display/drawing-image.h"
 #include "display/cairo-utils.h"
 #include "display/curve.h"
+#include "display/drawing-image.h"
 //Added for preserveAspectRatio support -- EAF
 #include "attributes.h"
-#include "print.h"
 #include "brokenimage.xpm"
 #include "document.h"
-#include "sp-image.h"
+#include "io/sys.h"
+#include "preferences.h"
+#include "print.h"
 #include "sp-clippath.h"
+#include "sp-image.h"
 #include "xml/quote.h"
-#include "preferences.h"
-#include "io/sys.h"
 
 #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
 #include "cms-system.h"
diff --git a/src/object/sp-item-group.cpp b/src/object/sp-item-group.cpp
index 602c4558c..8ea5ad8e2 100644
--- a/src/object/sp-item-group.cpp
+++ b/src/object/sp-item-group.cpp
@@ -18,42 +18,42 @@
 #include <config.h>
 #endif
 
-#include <glibmm/i18n.h>
 #include <cstring>
+#include <glibmm/i18n.h>
 #include <string>
 
 #include "attributes.h"
-#include "document.h"
 #include "document-undo.h"
+#include "document.h"
 #include "selection-chemistry.h"
 #include "verbs.h"
 
-#include "display/drawing-group.h"
 #include "display/curve.h"
+#include "display/drawing-group.h"
 #include "live_effects/effect.h"
-#include "live_effects/lpeobject.h"
 #include "live_effects/lpeobject-reference.h"
-#include "svg/svg.h"
+#include "live_effects/lpeobject.h"
 #include "svg/css-ostringstream.h"
+#include "svg/svg.h"
 #include "xml/repr.h"
 #include "xml/sp-css-attr.h"
 
 #include "box3d.h"
 #include "persp3d.h"
+#include "sp-clippath.h"
 #include "sp-defs.h"
+#include "sp-desc.h"
+#include "sp-flowtext.h"
 #include "sp-item-transform.h"
-#include "sp-root.h"
-#include "sp-rect.h"
-#include "sp-offset.h"
-#include "sp-clippath.h"
 #include "sp-mask.h"
+#include "sp-offset.h"
 #include "sp-path.h"
-#include "sp-use.h"
-#include "sp-title.h"
-#include "sp-desc.h"
+#include "sp-rect.h"
+#include "sp-root.h"
 #include "sp-switch.h"
 #include "sp-textpath.h"
-#include "sp-flowtext.h"
+#include "sp-title.h"
+#include "sp-use.h"
 #include "style.h"
 
 using Inkscape::DocumentUndo;
diff --git a/src/object/sp-item-rm-unsatisfied-cns.cpp b/src/object/sp-item-rm-unsatisfied-cns.cpp
index 516c88672..9549318f2 100644
--- a/src/object/sp-item-rm-unsatisfied-cns.cpp
+++ b/src/object/sp-item-rm-unsatisfied-cns.cpp
@@ -1,6 +1,6 @@
 
-#include <algorithm>
 #include <2geom/coord.h>
+#include <algorithm>
 
 #include "remove-last.h"
 #include "sp-guide.h"
diff --git a/src/object/sp-item-transform.cpp b/src/object/sp-item-transform.cpp
index 3675323ca..9100bdef2 100644
--- a/src/object/sp-item-transform.cpp
+++ b/src/object/sp-item-transform.cpp
@@ -14,9 +14,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <2geom/transforms.h>
-#include "sp-item.h"
 #include "sp-item-transform.h"
+#include "sp-item.h"
+#include <2geom/transforms.h>
 
 #include <glib.h>
 
diff --git a/src/object/sp-item-update-cns.cpp b/src/object/sp-item-update-cns.cpp
index 077931d52..b5ccc984f 100644
--- a/src/object/sp-item-update-cns.cpp
+++ b/src/object/sp-item-update-cns.cpp
@@ -2,8 +2,8 @@
 
 #include "satisfied-guide-cns.h"
 
-#include "sp-item-update-cns.h"
 #include "sp-guide.h"
+#include "sp-item-update-cns.h"
 
 using std::find;
 using std::vector;
diff --git a/src/object/sp-item.cpp b/src/object/sp-item.cpp
index 5ca22cabd..0acbb07be 100644
--- a/src/object/sp-item.cpp
+++ b/src/object/sp-item.cpp
@@ -20,19 +20,19 @@
 
 #include <glibmm/i18n.h>
 
+#include "attributes.h"
 #include "bad-uri-exception.h"
-#include "svg/svg.h"
-#include "print.h"
 #include "display/drawing-item.h"
-#include "attributes.h"
 #include "document.h"
+#include "print.h"
+#include "svg/svg.h"
 
-#include "inkscape.h"
-#include "desktop.h"
-#include "gradient-chemistry.h"
-#include "conn-avoid-ref.h"
 #include "conditions.h"
+#include "conn-avoid-ref.h"
+#include "desktop.h"
 #include "filter-chemistry.h"
+#include "gradient-chemistry.h"
+#include "inkscape.h"
 
 #include "sp-clippath.h"
 #include "sp-desc.h"
@@ -40,8 +40,8 @@
 #include "sp-item-rm-unsatisfied-cns.h"
 #include "sp-mask.h"
 #include "sp-pattern.h"
-#include "sp-root.h"
 #include "sp-rect.h"
+#include "sp-root.h"
 #include "sp-switch.h"
 #include "sp-text.h"
 #include "sp-textpath.h"
@@ -57,9 +57,9 @@
 
 #include "extract-uri.h"
 
-#include "live_effects/lpeobject.h"
 #include "live_effects/effect.h"
 #include "live_effects/lpeobject-reference.h"
+#include "live_effects/lpeobject.h"
 
 #include "util/units.h"
 
diff --git a/src/object/sp-line.cpp b/src/object/sp-line.cpp
index 2ba633972..71cd66154 100644
--- a/src/object/sp-line.cpp
+++ b/src/object/sp-line.cpp
@@ -12,13 +12,13 @@
  */
 
 #include "attributes.h"
-#include "style.h"
-#include "sp-line.h"
-#include "sp-guide.h"
 #include "display/curve.h"
-#include <glibmm/i18n.h>
 #include "document.h"
 #include "inkscape.h"
+#include "sp-guide.h"
+#include "sp-line.h"
+#include "style.h"
+#include <glibmm/i18n.h>
 
 SPLine::SPLine() : SPShape() {
     this->x1.unset();
diff --git a/src/object/sp-lpe-item.cpp b/src/object/sp-lpe-item.cpp
index c7c925c55..7f099de5f 100644
--- a/src/object/sp-lpe-item.cpp
+++ b/src/object/sp-lpe-item.cpp
@@ -21,29 +21,29 @@
 #include "ui/tool/multi-path-manipulator.h"
 
 #include "live_effects/effect.h"
+#include "live_effects/lpe-copy_rotate.h"
+#include "live_effects/lpe-mirror_symmetry.h"
 #include "live_effects/lpe-path_length.h"
-#include "live_effects/lpeobject.h"
 #include "live_effects/lpeobject-reference.h"
-#include "live_effects/lpe-mirror_symmetry.h"
-#include "live_effects/lpe-copy_rotate.h"
+#include "live_effects/lpeobject.h"
 
-#include "sp-path.h"
-#include "sp-item-group.h"
 #include "attributes.h"
-#include "uri.h"
-#include "message-stack.h"
-#include "inkscape.h"
 #include "desktop.h"
-#include "ui/shape-editor.h"
-#include "path-chemistry.h"
-#include "sp-ellipse.h"
 #include "display/curve.h"
-#include "svg/svg.h"
+#include "inkscape.h"
+#include "message-stack.h"
+#include "path-chemistry.h"
 #include "sp-clippath.h"
+#include "sp-ellipse.h"
+#include "sp-item-group.h"
 #include "sp-mask.h"
+#include "sp-path.h"
 #include "sp-rect.h"
+#include "svg/svg.h"
+#include "ui/shape-editor.h"
 #include "ui/tools-switch.h"
 #include "ui/tools/node-tool.h"
+#include "uri.h"
 
 /* LPEItem base class */
 static void sp_lpe_item_enable_path_effects(SPLPEItem *lpeitem, bool enable);
diff --git a/src/object/sp-marker.cpp b/src/object/sp-marker.cpp
index e5ddb91b5..08cda0a5a 100644
--- a/src/object/sp-marker.cpp
+++ b/src/object/sp-marker.cpp
@@ -17,18 +17,18 @@
 #include <cstring>
 #include <string>
 
-#include <2geom/affine.h>
-#include <2geom/transforms.h>
-#include "svg/svg.h"
-#include "display/drawing-group.h"
-#include "xml/repr.h"
 #include "attributes.h"
-#include "document.h"
+#include "display/drawing-group.h"
 #include "document-private.h"
+#include "document.h"
 #include "preferences.h"
+#include "svg/svg.h"
+#include "xml/repr.h"
+#include <2geom/affine.h>
+#include <2geom/transforms.h>
 
-#include "sp-marker.h"
 #include "sp-defs.h"
+#include "sp-marker.h"
 
 class SPMarkerView {
 
diff --git a/src/object/sp-mask.cpp b/src/object/sp-mask.cpp
index 2e764131c..9db32722b 100644
--- a/src/object/sp-mask.cpp
+++ b/src/object/sp-mask.cpp
@@ -11,20 +11,20 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <2geom/transforms.h>
 #include <cstring>
 #include <string>
-#include <2geom/transforms.h>
 
-#include "display/drawing.h"
 #include "display/drawing-group.h"
+#include "display/drawing.h"
 #include "xml/repr.h"
 
-#include "enums.h"
 #include "attributes.h"
-#include "document.h"
+#include "attributes.h"
 #include "document-private.h"
+#include "document.h"
+#include "enums.h"
 #include "style.h"
-#include "attributes.h"
 
 #include "sp-defs.h"
 #include "sp-item.h"
diff --git a/src/object/sp-mesh-array.cpp b/src/object/sp-mesh-array.cpp
index d958427f2..40fc75389 100644
--- a/src/object/sp-mesh-array.cpp
+++ b/src/object/sp-mesh-array.cpp
@@ -41,18 +41,18 @@
 #include <set>
 
 // For color picking
-#include "display/drawing.h"
-#include "display/drawing-context.h"
 #include "display/cairo-utils.h"
+#include "display/drawing-context.h"
+#include "display/drawing.h"
 #include "document.h"
 #include "sp-root.h"
 
-#include "sp-mesh-gradient.h"
+#include "display/curve.h"
 #include "sp-mesh-array.h"
-#include "sp-mesh-row.h"
+#include "sp-mesh-gradient.h"
 #include "sp-mesh-patch.h"
+#include "sp-mesh-row.h"
 #include "sp-stop.h"
-#include "display/curve.h"
 
 // For new mesh creation
 #include "preferences.h"
@@ -71,8 +71,8 @@
 #include "2geom/line.h"
 
 #include "xml/repr.h"
-#include <cmath>
 #include <algorithm>
+#include <cmath>
 
 enum { ROW, COL };
 
diff --git a/src/object/sp-metadata.cpp b/src/object/sp-metadata.cpp
index e7907e4f0..d8c22704c 100644
--- a/src/object/sp-metadata.cpp
+++ b/src/object/sp-metadata.cpp
@@ -14,8 +14,8 @@
 #endif
 
 #include "sp-metadata.h"
-#include "xml/node-iterators.h"
 #include "document.h"
+#include "xml/node-iterators.h"
 
 #include "sp-item-group.h"
 #include "sp-root.h"
diff --git a/src/object/sp-missing-glyph.cpp b/src/object/sp-missing-glyph.cpp
index f441b66d2..c80921d9c 100644
--- a/src/object/sp-missing-glyph.cpp
+++ b/src/object/sp-missing-glyph.cpp
@@ -16,8 +16,8 @@
 
 #include "xml/repr.h"
 #include "attributes.h"
-#include "sp-missing-glyph.h"
 #include "document.h"
+#include "sp-missing-glyph.h"
 
 SPMissingGlyph::SPMissingGlyph() : SPObject() {
 //TODO: correct these values:
diff --git a/src/object/sp-namedview.cpp b/src/object/sp-namedview.cpp
index 59c7129f6..8eef39db3 100644
--- a/src/object/sp-namedview.cpp
+++ b/src/object/sp-namedview.cpp
@@ -14,28 +14,28 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <cstring>
-#include <string>
 #include "event-log.h"
 #include <2geom/transforms.h>
+#include <cstring>
+#include <string>
 
-#include "display/canvas-grid.h"
-#include "util/units.h"
-#include "svg/svg-color.h"
-#include "xml/repr.h"
 #include "attributes.h"
-#include "document.h"
-#include "document-undo.h"
 #include "desktop-events.h"
+#include "display/canvas-grid.h"
+#include "document-undo.h"
+#include "document.h"
 #include "enums.h"
+#include "svg/svg-color.h"
 #include "ui/monitor.h"
+#include "util/units.h"
+#include "xml/repr.h"
 
+#include "conn-avoid-ref.h" // for defaultConnSpacing.
+#include "desktop.h"
+#include "preferences.h"
 #include "sp-guide.h"
 #include "sp-item-group.h"
 #include "sp-namedview.h"
-#include "preferences.h"
-#include "desktop.h"
-#include "conn-avoid-ref.h" // for defaultConnSpacing.
 #include "sp-root.h"
 #include <gtkmm/window.h>
 
diff --git a/src/object/sp-object-group.cpp b/src/object/sp-object-group.cpp
index f8ef855e3..84c90a96f 100644
--- a/src/object/sp-object-group.cpp
+++ b/src/object/sp-object-group.cpp
@@ -13,8 +13,8 @@
  */
 
 #include "sp-object-group.h"
-#include "xml/repr.h"
 #include "document.h"
+#include "xml/repr.h"
 
 SPObjectGroup::SPObjectGroup() : SPObject() {
 }
diff --git a/src/object/sp-object.cpp b/src/object/sp-object.cpp
index 112a08fb9..828c842d3 100644
--- a/src/object/sp-object.cpp
+++ b/src/object/sp-object.cpp
@@ -20,28 +20,28 @@
 
 #include <boost/range/adaptor/transformed.hpp>
 
-#include "helper/sp-marshal.h"
-#include "xml/node-event-vector.h"
-#include "attributes.h"
 #include "attribute-rel-util.h"
+#include "attributes.h"
 #include "color-profile.h"
+#include "debug/demangle.h"
+#include "debug/event-tracker.h"
+#include "debug/simple-event.h"
 #include "document.h"
-#include "preferences.h"
-#include "style.h"
+#include "helper/sp-marshal.h"
 #include "live_effects/lpeobject.h"
+#include "preferences.h"
 #include "sp-factory.h"
 #include "sp-paint-server.h"
 #include "sp-root.h"
-#include "sp-style-elem.h"
 #include "sp-script.h"
+#include "sp-style-elem.h"
 #include "streq.h"
 #include "strneq.h"
-#include "xml/node-fns.h"
-#include "debug/event-tracker.h"
-#include "debug/simple-event.h"
-#include "debug/demangle.h"
+#include "style.h"
 #include "util/format.h"
 #include "util/longest-common-suffix.h"
+#include "xml/node-event-vector.h"
+#include "xml/node-fns.h"
 
 using std::memcpy;
 using std::strchr;
diff --git a/src/object/sp-offset.cpp b/src/object/sp-offset.cpp
index 2864e88cb..d3c881d6e 100644
--- a/src/object/sp-offset.cpp
+++ b/src/object/sp-offset.cpp
@@ -25,10 +25,10 @@
 
 #include <glibmm/i18n.h>
 
-#include "bad-uri-exception.h"
-#include "svg/svg.h"
 #include "attributes.h"
+#include "bad-uri-exception.h"
 #include "display/curve.h"
+#include "svg/svg.h"
 
 #include "livarot/Path.h"
 #include "livarot/Shape.h"
diff --git a/src/object/sp-path.cpp b/src/object/sp-path.cpp
index de31b45e2..9dd29eb3b 100644
--- a/src/object/sp-path.cpp
+++ b/src/object/sp-path.cpp
@@ -22,28 +22,28 @@
 #include <glibmm/i18n.h>
 
 #include "live_effects/effect.h"
-#include "live_effects/lpeobject.h"
 #include "live_effects/lpeobject-reference.h"
+#include "live_effects/lpeobject.h"
 #include "sp-lpe-item.h"
 
 #include "display/curve.h"
-#include <2geom/curves.h>
 #include "helper/geom-curves.h"
+#include <2geom/curves.h>
 
+#include "attributes.h"
 #include "svg/svg.h"
 #include "xml/repr.h"
-#include "attributes.h"
 
-#include "sp-path.h"
 #include "sp-guide.h"
+#include "sp-path.h"
 
-#include "document.h"
 #include "desktop.h"
+#include "document.h"
 
 #include "desktop-style.h"
-#include "ui/tools/tool-base.h"
 #include "inkscape.h"
 #include "style.h"
+#include "ui/tools/tool-base.h"
 
 #define noPATH_VERBOSE
 
diff --git a/src/object/sp-pattern.cpp b/src/object/sp-pattern.cpp
index ebe78d63c..5f513871e 100644
--- a/src/object/sp-pattern.cpp
+++ b/src/object/sp-pattern.cpp
@@ -18,20 +18,20 @@
 
 #include "sp-pattern.h"
 
+#include <2geom/transforms.h>
 #include <cstring>
-#include <string>
 #include <glibmm.h>
-#include <2geom/transforms.h>
+#include <string>
 
+#include "attributes.h"
 #include "bad-uri-exception.h"
-#include "svg/svg.h"
 #include "display/cairo-utils.h"
 #include "display/drawing-context.h"
+#include "display/drawing-group.h"
 #include "display/drawing-surface.h"
 #include "display/drawing.h"
-#include "display/drawing-group.h"
-#include "attributes.h"
 #include "document-private.h"
+#include "svg/svg.h"
 
 #include "sp-factory.h"
 
diff --git a/src/object/sp-polygon.cpp b/src/object/sp-polygon.cpp
index b2a0c1480..74f51406a 100644
--- a/src/object/sp-polygon.cpp
+++ b/src/object/sp-polygon.cpp
@@ -12,14 +12,14 @@
  */
 
 #include "attributes.h"
-#include "sp-polygon.h"
 #include "display/curve.h"
-#include <glibmm/i18n.h>
-#include <2geom/curves.h>
+#include "document.h"
 #include "helper/geom-curves.h"
+#include "sp-polygon.h"
 #include "svg/stringstream.h"
 #include "xml/repr.h"
-#include "document.h"
+#include <2geom/curves.h>
+#include <glibmm/i18n.h>
 
 SPPolygon::SPPolygon() : SPShape() {
 }
diff --git a/src/object/sp-polyline.cpp b/src/object/sp-polyline.cpp
index 3be4700eb..7a62099fc 100644
--- a/src/object/sp-polyline.cpp
+++ b/src/object/sp-polyline.cpp
@@ -12,11 +12,11 @@
  */
 
 #include "attributes.h"
-#include "sp-polyline.h"
 #include "display/curve.h"
-#include <glibmm/i18n.h>
-#include "xml/repr.h"
 #include "document.h"
+#include "sp-polyline.h"
+#include "xml/repr.h"
+#include <glibmm/i18n.h>
 
 SPPolyLine::SPPolyLine() : SPShape() {
 }
diff --git a/src/object/sp-rect.cpp b/src/object/sp-rect.cpp
index 08c3df4fd..45ea93c54 100644
--- a/src/object/sp-rect.cpp
+++ b/src/object/sp-rect.cpp
@@ -17,14 +17,14 @@
 
 #include "display/curve.h"
 
-#include "inkscape.h"
-#include "document.h"
 #include "attributes.h"
-#include "style.h"
+#include "document.h"
+#include "inkscape.h"
+#include "preferences.h"
+#include "sp-guide.h"
 #include "sp-rect.h"
+#include "style.h"
 #include <glibmm/i18n.h>
-#include "sp-guide.h"
-#include "preferences.h"
 
 #define noRECT_VERBOSE
 
diff --git a/src/object/sp-root.cpp b/src/object/sp-root.cpp
index 3f31588cc..69796ff9f 100644
--- a/src/object/sp-root.cpp
+++ b/src/object/sp-root.cpp
@@ -13,20 +13,20 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <string>
 #include <2geom/transforms.h>
+#include <string>
 
 #include "attributes.h"
-#include "print.h"
+#include "display/drawing-group.h"
 #include "document.h"
 #include "inkscape-version.h"
+#include "print.h"
 #include "sp-defs.h"
 #include "sp-root.h"
-#include "display/drawing-group.h"
 #include "svg/stringstream.h"
 #include "svg/svg.h"
-#include "xml/repr.h"
 #include "util/units.h"
+#include "xml/repr.h"
 
 SPRoot::SPRoot() : SPGroup(), SPViewBox()
 {
diff --git a/src/object/sp-shape.cpp b/src/object/sp-shape.cpp
index 1708ecfb3..21774abb3 100644
--- a/src/object/sp-shape.cpp
+++ b/src/object/sp-shape.cpp
@@ -18,28 +18,28 @@
 #include <config.h>
 #endif
 
+#include "helper/geom-nodetype.h"
+#include "helper/geom.h"
+#include <2geom/path-intersection.h>
+#include <2geom/pathvector.h>
 #include <2geom/rect.h>
 #include <2geom/transforms.h>
-#include <2geom/pathvector.h>
-#include <2geom/path-intersection.h>
-#include "helper/geom.h"
-#include "helper/geom-nodetype.h"
 
-#include <sigc++/functors/ptr_fun.h>
 #include <sigc++/adaptors/bind.h>
+#include <sigc++/functors/ptr_fun.h>
 
-#include "display/drawing-shape.h"
+#include "attributes.h"
 #include "display/curve.h"
-#include "print.h"
+#include "display/drawing-shape.h"
 #include "document.h"
-#include "style.h"
+#include "live_effects/lpeobject.h"
+#include "preferences.h"
+#include "print.h"
 #include "sp-marker.h"
 #include "sp-path.h"
-#include "preferences.h"
-#include "attributes.h"
-#include "svg/svg.h"
+#include "style.h"
 #include "svg/path-string.h"
-#include "live_effects/lpeobject.h"
+#include "svg/svg.h"
 
 #include "helper/mathfns.h" // for triangle_area()
 
diff --git a/src/object/sp-spiral.cpp b/src/object/sp-spiral.cpp
index e17ddb10d..9ef1f2b2c 100644
--- a/src/object/sp-spiral.cpp
+++ b/src/object/sp-spiral.cpp
@@ -15,14 +15,14 @@
  */
 
 #include "live_effects/effect.h"
-#include "svg/svg.h"
 #include "attributes.h"
+#include "display/curve.h"
+#include "document.h"
+#include "svg/svg.h"
+#include "xml/repr.h"
 #include <2geom/bezier-utils.h>
 #include <2geom/pathvector.h>
-#include "display/curve.h"
 #include <glibmm/i18n.h>
-#include "xml/repr.h"
-#include "document.h"
 
 #include "sp-spiral.h"
 
diff --git a/src/object/sp-star.cpp b/src/object/sp-star.cpp
index da00080a3..2fcac1b21 100644
--- a/src/object/sp-star.cpp
+++ b/src/object/sp-star.cpp
@@ -17,16 +17,16 @@
 #include <config.h>
 #endif
 
+#include "live_effects/effect.h"
 #include <cstring>
-#include <string>
 #include <glib.h>
-#include "live_effects/effect.h"
+#include <string>
 
-#include "svg/svg.h"
 #include "attributes.h"
 #include "display/curve.h"
-#include "xml/repr.h"
 #include "document.h"
+#include "svg/svg.h"
+#include "xml/repr.h"
 
 #include "sp-star.h"
 #include <glibmm/i18n.h>
diff --git a/src/object/sp-stop.cpp b/src/object/sp-stop.cpp
index 58746c951..e29afc53d 100644
--- a/src/object/sp-stop.cpp
+++ b/src/object/sp-stop.cpp
@@ -19,9 +19,9 @@
 
 #include "attributes.h"
 #include "streq.h"
-#include "svg/svg.h"
-#include "svg/svg-color.h"
 #include "svg/css-ostringstream.h"
+#include "svg/svg-color.h"
+#include "svg/svg.h"
 
 SPStop::SPStop() : SPObject() {
 	this->path_string = NULL;
diff --git a/src/object/sp-style-elem.cpp b/src/object/sp-style-elem.cpp
index f1e66ae45..246a01cda 100644
--- a/src/object/sp-style-elem.cpp
+++ b/src/object/sp-style-elem.cpp
@@ -1,16 +1,16 @@
-#include <3rdparty/libcroco/cr-parser.h>
-#include "xml/node-event-vector.h"
-#include "xml/repr.h"
+#include "attributes.h"
 #include "document.h"
-#include "sp-style-elem.h"
 #include "sp-root.h"
-#include "attributes.h"
+#include "sp-style-elem.h"
 #include "style.h"
+#include "xml/node-event-vector.h"
+#include "xml/repr.h"
+#include <3rdparty/libcroco/cr-parser.h>
 
 // For external style sheets
 #include "io/resource.h"
-#include <iostream>
 #include <fstream>
+#include <iostream>
 
 // For font-rule
 #include "libnrtype/FontFactory.h"
diff --git a/src/object/sp-switch.cpp b/src/object/sp-switch.cpp
index d6ab1e904..4aa68ec0c 100644
--- a/src/object/sp-switch.cpp
+++ b/src/object/sp-switch.cpp
@@ -14,9 +14,9 @@
 
 #include <glibmm/i18n.h>
 
-#include "sp-switch.h"
-#include "display/drawing-group.h"
 #include "conditions.h"
+#include "display/drawing-group.h"
+#include "sp-switch.h"
 
 #include <sigc++/adaptors/bind.h>
 
diff --git a/src/object/sp-symbol.cpp b/src/object/sp-symbol.cpp
index 55b5101af..80971c080 100644
--- a/src/object/sp-symbol.cpp
+++ b/src/object/sp-symbol.cpp
@@ -17,13 +17,13 @@
 
 #include <string>
 
-#include <2geom/transforms.h>
-#include "display/drawing-group.h"
-#include "xml/repr.h"
 #include "attributes.h"
+#include "display/drawing-group.h"
+#include "document.h"
 #include "print.h"
 #include "sp-symbol.h"
-#include "document.h"
+#include "xml/repr.h"
+#include <2geom/transforms.h>
 
 SPSymbol::SPSymbol() : SPGroup(), SPViewBox() {
 }
diff --git a/src/object/sp-tag-use.cpp b/src/object/sp-tag-use.cpp
index 1312b923f..b76701c69 100644
--- a/src/object/sp-tag-use.cpp
+++ b/src/object/sp-tag-use.cpp
@@ -17,17 +17,17 @@
 
 #include <glibmm/i18n.h>
 
+#include "attributes.h"
 #include "bad-uri-exception.h"
 #include "display/drawing-group.h"
-#include "attributes.h"
 #include "document.h"
-#include "uri.h"
-#include "xml/repr.h"
 #include "preferences.h"
-#include "style.h"
 #include "sp-factory.h"
 #include "sp-symbol.h"
 #include "sp-tag-use-reference.h"
+#include "style.h"
+#include "uri.h"
+#include "xml/repr.h"
 
 SPTagUse::SPTagUse()
 {
diff --git a/src/object/sp-text.cpp b/src/object/sp-text.cpp
index 93694e844..4dd8aac7a 100644
--- a/src/object/sp-text.cpp
+++ b/src/object/sp-text.cpp
@@ -27,22 +27,22 @@
 #include <libnrtype/FontFactory.h>
 #include <libnrtype/font-instance.h>
 
-#include <glibmm/i18n.h>
-#include <glibmm/regex.h>
-#include "svg/svg.h"
-#include "display/drawing-text.h"
 #include "attributes.h"
+#include "desktop.h"
+#include "display/drawing-text.h"
 #include "document.h"
+#include "inkscape.h"
+#include "mod360.h"
 #include "preferences.h"
-#include "desktop.h"
 #include "sp-namedview.h"
-#include "inkscape.h"
+#include "svg/svg.h"
 #include "xml/quote.h"
-#include "mod360.h"
+#include <glibmm/i18n.h>
+#include <glibmm/regex.h>
 
-#include "sp-title.h"
 #include "sp-desc.h"
 #include "sp-text.h"
+#include "sp-title.h"
 
 #include "sp-shape.h"
 #include "sp-textpath.h"
@@ -52,8 +52,8 @@
 #include "text-editing.h"
 
 // For SVG 2 text flow
-#include "livarot/Shape.h"
 #include "display/curve.h"
+#include "livarot/Shape.h"
 
 /*#####################################################
 #  SPTEXT
diff --git a/src/object/sp-tref.cpp b/src/object/sp-tref.cpp
index eae852a89..be6777fd7 100644
--- a/src/object/sp-tref.cpp
+++ b/src/object/sp-tref.cpp
@@ -20,8 +20,8 @@
 
 #include <glibmm/i18n.h>
 
-#include "bad-uri-exception.h"
 #include "attributes.h"
+#include "bad-uri-exception.h"
 #include "document.h"
 #include "sp-factory.h"
 #include "sp-text.h"
diff --git a/src/object/sp-tspan.cpp b/src/object/sp-tspan.cpp
index d8c655c06..67219f1a9 100644
--- a/src/object/sp-tspan.cpp
+++ b/src/object/sp-tspan.cpp
@@ -28,19 +28,19 @@
 #endif
 
 #include <cstring>
-#include <string>
 #include <glibmm/i18n.h>
+#include <string>
 
-#include <livarot/Path.h>
-#include "svg/stringstream.h"
 #include "attributes.h"
-#include "sp-use-reference.h"
-#include "sp-tspan.h"
-#include "sp-tref.h"
+#include "document.h"
 #include "sp-textpath.h"
-#include "text-editing.h"
+#include "sp-tref.h"
+#include "sp-tspan.h"
+#include "sp-use-reference.h"
 #include "style.h"
-#include "document.h"
+#include "svg/stringstream.h"
+#include "text-editing.h"
+#include <livarot/Path.h>
 
 /*#####################################################
 #  SPTSPAN
diff --git a/src/object/sp-use.cpp b/src/object/sp-use.cpp
index af61e392b..c02bbade7 100644
--- a/src/object/sp-use.cpp
+++ b/src/object/sp-use.cpp
@@ -20,28 +20,28 @@
 #include <glibmm/i18n.h>
 #include <glibmm/markup.h>
 
+#include "attributes.h"
 #include "bad-uri-exception.h"
 #include "display/drawing-group.h"
-#include "attributes.h"
 #include "document.h"
+#include "preferences.h"
+#include "print.h"
 #include "sp-clippath.h"
-#include "sp-mask.h"
 #include "sp-factory.h"
 #include "sp-flowregion.h"
+#include "sp-mask.h"
+#include "style.h"
+#include "svg/svg.h"
 #include "uri.h"
-#include "print.h"
 #include "xml/repr.h"
-#include "svg/svg.h"
-#include "preferences.h"
-#include "style.h"
 
-#include "sp-use.h"
-#include "sp-symbol.h"
+#include "sp-flowtext.h"
 #include "sp-root.h"
-#include "sp-use-reference.h"
 #include "sp-shape.h"
+#include "sp-symbol.h"
 #include "sp-text.h"
-#include "sp-flowtext.h"
+#include "sp-use-reference.h"
+#include "sp-use.h"
 
 SPUse::SPUse()
     : SPItem(),
diff --git a/src/object/uri-references.cpp b/src/object/uri-references.cpp
index faa3d38d9..c46eda5c0 100644
--- a/src/object/uri-references.cpp
+++ b/src/object/uri-references.cpp
@@ -13,17 +13,17 @@
 
 #include "uri-references.h"
 
-#include <iostream>
 #include <cstring>
+#include <iostream>
 
-#include <glibmm/miscutils.h>
-#include "live_effects/lpeobject.h"
 #include "bad-uri-exception.h"
 #include "document.h"
-#include "sp-object.h"
-#include "uri.h"
 #include "extract-uri.h"
+#include "live_effects/lpeobject.h"
+#include "sp-object.h"
 #include "sp-tag-use.h"
+#include "uri.h"
+#include <glibmm/miscutils.h>
 
 namespace Inkscape {
 
diff --git a/src/object/uri.cpp b/src/object/uri.cpp
index 881b322b4..6d274d99a 100644
--- a/src/object/uri.cpp
+++ b/src/object/uri.cpp
@@ -10,8 +10,8 @@
 
 #include "uri.h"
 
-#include <glibmm/ustring.h>
 #include <glibmm/miscutils.h>
+#include <glibmm/ustring.h>
 
 #include "bad-uri-exception.h"
 
diff --git a/src/object/viewbox.cpp b/src/object/viewbox.cpp
index 1b50fe71c..e48010c02 100644
--- a/src/object/viewbox.cpp
+++ b/src/object/viewbox.cpp
@@ -14,9 +14,9 @@
 
 #include <2geom/transforms.h>
 
-#include "viewbox.h"
 #include "enums.h"
 #include "sp-item.h"
+#include "viewbox.h"
 
 SPViewBox::SPViewBox()
     : viewBox_set(false)
diff --git a/src/path-prefix.cpp b/src/path-prefix.cpp
index 87b756eb4..8a2da789d 100644
--- a/src/path-prefix.cpp
+++ b/src/path-prefix.cpp
@@ -23,8 +23,8 @@
 #endif
 
 
-#include <glib.h>
 #include "path-prefix.h"
+#include <glib.h>
 
 
 /**
diff --git a/src/preferences.cpp b/src/preferences.cpp
index 958e879f8..7a322f725 100644
--- a/src/preferences.cpp
+++ b/src/preferences.cpp
@@ -10,22 +10,22 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
 
+#include "attribute-rel-util.h"
+#include "inkscape.h"
+#include "io/resource.h"
+#include "preferences-skeleton.h"
+#include "preferences.h"
+#include "util/units.h"
+#include "xml/attribute-record.h"
+#include "xml/node-iterators.h"
+#include "xml/node-observer.h"
 #include <cstring>
-#include <sstream>
-#include <glibmm/fileutils.h>
+#include <glib/gstdio.h>
 #include <glibmm/convert.h>
+#include <glibmm/fileutils.h>
 #include <glibmm/i18n.h>
-#include <glib/gstdio.h>
 #include <gtk/gtk.h>
-#include "preferences.h"
-#include "preferences-skeleton.h"
-#include "inkscape.h"
-#include "xml/node-observer.h"
-#include "xml/node-iterators.h"
-#include "xml/attribute-record.h"
-#include "util/units.h"
-#include "attribute-rel-util.h"
-#include "io/resource.h"
+#include <sstream>
 
 #define PREFERENCES_FILE_NAME "preferences.xml"
 
diff --git a/src/prefix.cpp b/src/prefix.cpp
index 14fdd04df..72616f857 100644
--- a/src/prefix.cpp
+++ b/src/prefix.cpp
@@ -31,11 +31,11 @@
 #endif
 
 
-#include <glib.h>
-#include <cstdlib>
+#include "prefix.h"
 #include <cstdio>
+#include <cstdlib>
 #include <cstring>
-#include "prefix.h"
+#include <glib.h>
 
 
 #ifdef __cplusplus
diff --git a/src/removeoverlap.cpp b/src/removeoverlap.cpp
index 06e7b81e6..f66d9c235 100644
--- a/src/removeoverlap.cpp
+++ b/src/removeoverlap.cpp
@@ -19,8 +19,8 @@
 
 #include "libvpsc/rectangle.h"
 
-#include "object/sp-item.h"
 #include "object/sp-item-transform.h"
+#include "object/sp-item.h"
 
 
 using vpsc::Rectangle;
diff --git a/src/resource-manager.cpp b/src/resource-manager.cpp
index 0176a4abe..3ad53b7eb 100644
--- a/src/resource-manager.cpp
+++ b/src/resource-manager.cpp
@@ -6,21 +6,21 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <algorithm>
 #include <string>
 #include <vector>
-#include <algorithm>
 
-#include <gtkmm/recentmanager.h>
+#include <glibmm/convert.h>
+#include <glibmm/fileutils.h>
 #include <glibmm/i18n.h>
 #include <glibmm/miscutils.h>
-#include <glibmm/fileutils.h>
 #include <glibmm/uriutils.h>
-#include <glibmm/convert.h>
+#include <gtkmm/recentmanager.h>
 
 #include "resource-manager.h"
 
-#include "document.h"
 #include "document-undo.h"
+#include "document.h"
 #include "verbs.h"
 
 #include "object/sp-object.h"
diff --git a/src/rubberband.cpp b/src/rubberband.cpp
index 47fdffb28..bfdc4aec2 100644
--- a/src/rubberband.cpp
+++ b/src/rubberband.cpp
@@ -13,10 +13,10 @@
 #include "display/sodipodi-ctrlrect.h"
 #include "desktop.h"
 
-#include "rubberband.h"
-#include "display/sp-canvas.h"
 #include "display/canvas-bpath.h"
 #include "display/curve.h"
+#include "display/sp-canvas.h"
+#include "rubberband.h"
 
 Inkscape::Rubberband *Inkscape::Rubberband::_instance = NULL;
 
diff --git a/src/selection-describer.cpp b/src/selection-describer.cpp
index caa83fb94..aa42d13ac 100644
--- a/src/selection-describer.cpp
+++ b/src/selection-describer.cpp
@@ -21,9 +21,9 @@
 
 #include "selection-describer.h"
 
+#include "desktop.h"
 #include "layer-model.h"
 #include "selection.h"
-#include "desktop.h"
 
 #include "object/sp-flowtext.h"
 #include "object/sp-image.h"
diff --git a/src/selection.cpp b/src/selection.cpp
index b8dffb4ae..d332c8323 100644
--- a/src/selection.cpp
+++ b/src/selection.cpp
@@ -22,12 +22,12 @@
 #endif
 
 #include "inkscape.h"
-#include "preferences.h"
 #include "desktop.h"
 #include "document.h"
+#include "preferences.h"
 
-#include "object/sp-shape.h"
 #include "object/sp-path.h"
+#include "object/sp-shape.h"
 
 #include "xml/repr.h"
 
diff --git a/src/shortcuts.cpp b/src/shortcuts.cpp
index 96008dbeb..1c5ca9215 100644
--- a/src/shortcuts.cpp
+++ b/src/shortcuts.cpp
@@ -20,32 +20,32 @@
 # include "config.h"
 #endif
 
-#include <vector>
 #include <cstring>
-#include <string>
 #include <map>
+#include <string>
+#include <vector>
 
 #include "shortcuts.h"
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include <glibmm/i18n.h>
 #include <glibmm/convert.h>
+#include <glibmm/i18n.h>
 #include <glibmm/miscutils.h>
 
+#include "desktop.h"
+#include "document.h"
 #include "helper/action.h"
-#include "io/sys.h"
+#include "inkscape.h"
 #include "io/resource.h"
+#include "io/sys.h"
+#include "path-prefix.h"
+#include "preferences.h"
+#include "ui/dialog/filedialog.h"
+#include "ui/tools/tool-base.h"
 #include "verbs.h"
 #include "xml/node-iterators.h"
 #include "xml/repr.h"
-#include "document.h"
-#include "preferences.h"
-#include "ui/tools/tool-base.h"
-#include "inkscape.h"
-#include "desktop.h"
-#include "path-prefix.h"
-#include "ui/dialog/filedialog.h"
 
 using namespace Inkscape;
 using namespace Inkscape::IO::Resource;
diff --git a/src/snap.cpp b/src/snap.cpp
index 26d548040..0b5de77d0 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -30,8 +30,8 @@
 
 #include "helper/mathfns.h"
 
-#include "object/sp-namedview.h"
 #include "object/sp-guide.h"
+#include "object/sp-namedview.h"
 
 #include "ui/tools/tool-base.h"
 
diff --git a/src/snapped-point.cpp b/src/snapped-point.cpp
index f826211fa..b89d0b502 100644
--- a/src/snapped-point.cpp
+++ b/src/snapped-point.cpp
@@ -9,9 +9,9 @@
  *  Released under GNU GPL, read the file 'COPYING' for more information.
  */
 
-#include <gtk/gtk.h>
-#include "snapped-point.h"
 #include "preferences.h"
+#include "snapped-point.h"
+#include <gtk/gtk.h>
 
 // overloaded constructor
 Inkscape::SnappedPoint::SnappedPoint(Geom::Point const &p, SnapSourceType const &source, long source_num, SnapTargetType const &target, Geom::Coord const &d, Geom::Coord const &t, bool const &a, bool const &constrained_snap, bool const &fully_constrained, Geom::OptRect target_bbox) :
diff --git a/src/sp-item-notify-moveto.cpp b/src/sp-item-notify-moveto.cpp
index 52a76e55f..bd0c9b4b4 100644
--- a/src/sp-item-notify-moveto.cpp
+++ b/src/sp-item-notify-moveto.cpp
@@ -7,8 +7,8 @@
 #include "sp-item-notify-moveto.h"
 
 #include "object/sp-guide.h"
-#include "object/sp-item.h"
 #include "object/sp-item-rm-unsatisfied-cns.h"
+#include "object/sp-item.h"
 
 using std::vector;
 
diff --git a/src/style-internal.cpp b/src/style-internal.cpp
index f8f2042c4..f834337a6 100644
--- a/src/style-internal.cpp
+++ b/src/style-internal.cpp
@@ -37,9 +37,9 @@
 #include "streq.h"
 #include "strneq.h"
 
-#include "svg/svg.h"
-#include "svg/svg-color.h"
 #include "svg/css-ostringstream.h"
+#include "svg/svg-color.h"
+#include "svg/svg.h"
 
 #include "util/units.h"
 
diff --git a/src/style.cpp b/src/style.cpp
index 5d6ba7a15..c8d838ca3 100644
--- a/src/style.cpp
+++ b/src/style.cpp
@@ -25,9 +25,9 @@
 
 #include "style.h"
 
+#include <algorithm>
 #include <cstring>
 #include <string>
-#include <algorithm>
 
 #include <glibmm/regex.h>
 
diff --git a/src/svg-view-slideshow.cpp b/src/svg-view-slideshow.cpp
index 430fd9ce5..fe9ce1fe1 100644
--- a/src/svg-view-slideshow.cpp
+++ b/src/svg-view-slideshow.cpp
@@ -40,9 +40,9 @@
 #include "ui/monitor.h"
 #include "util/units.h"
 
-#include "svg-view.h"
 #include "svg-view-slideshow.h"
 #include "svg-view-widget.h"
+#include "svg-view.h"
 
 
 SPSlideShow::SPSlideShow(std::vector<Glib::ustring> const &slides, bool full_screen, int timer, double scale)
diff --git a/src/svg-view-widget.cpp b/src/svg-view-widget.cpp
index 7c72686b4..88ae47378 100644
--- a/src/svg-view-widget.cpp
+++ b/src/svg-view-widget.cpp
@@ -15,11 +15,11 @@
  */
 
 #include "display/sp-canvas.h"
-#include "display/sp-canvas-group.h"
 #include "display/canvas-arena.h"
+#include "display/sp-canvas-group.h"
 #include "document.h"
-#include "svg-view.h"
 #include "svg-view-widget.h"
+#include "svg-view.h"
 #include "util/units.h"
 
 static void sp_svg_view_widget_dispose(GObject *object);
diff --git a/src/svg/css-ostringstream.cpp b/src/svg/css-ostringstream.cpp
index ef0413372..51a2ce6ab 100644
--- a/src/svg/css-ostringstream.cpp
+++ b/src/svg/css-ostringstream.cpp
@@ -1,6 +1,6 @@
 #include "svg/css-ostringstream.h"
-#include "svg/strip-trailing-zeros.h"
 #include "preferences.h"
+#include "svg/strip-trailing-zeros.h"
 
 Inkscape::CSSOStringStream::CSSOStringStream()
 {
diff --git a/src/svg/path-string.cpp b/src/svg/path-string.cpp
index 7d0092dfa..5d853b98a 100644
--- a/src/svg/path-string.cpp
+++ b/src/svg/path-string.cpp
@@ -14,9 +14,9 @@
  */
 
 #include "svg/path-string.h"
+#include "preferences.h"
 #include "svg/stringstream.h"
 #include "svg/svg.h"
-#include "preferences.h"
 
 // 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/stringstream.cpp b/src/svg/stringstream.cpp
index ef7587154..f83f246de 100644
--- a/src/svg/stringstream.cpp
+++ b/src/svg/stringstream.cpp
@@ -1,6 +1,6 @@
 #include "svg/stringstream.h"
-#include "svg/strip-trailing-zeros.h"
 #include "preferences.h"
+#include "svg/strip-trailing-zeros.h"
 #include <2geom/point.h>
 
 Inkscape::SVGOStringStream::SVGOStringStream()
diff --git a/src/svg/strip-trailing-zeros.cpp b/src/svg/strip-trailing-zeros.cpp
index 47da93249..5b7b0e7b3 100644
--- a/src/svg/strip-trailing-zeros.cpp
+++ b/src/svg/strip-trailing-zeros.cpp
@@ -1,7 +1,7 @@
 
 #include <cstring>
-#include <string>
 #include <glib.h>
+#include <string>
 
 #include "svg/strip-trailing-zeros.h"
 
diff --git a/src/svg/svg-affine.cpp b/src/svg/svg-affine.cpp
index 76d89579d..59ba4947e 100644
--- a/src/svg/svg-affine.cpp
+++ b/src/svg/svg-affine.cpp
@@ -15,14 +15,14 @@
 #include "config.h"
 #endif
 
-#include <cstring>
-#include <string>
-#include <cstdlib>
+#include "preferences.h"
+#include "svg.h"
+#include <2geom/transforms.h>
 #include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <glib.h>
-#include <2geom/transforms.h>
-#include "svg.h"
-#include "preferences.h"
+#include <string>
 
 bool
 sp_svg_transform_read(gchar const *str, Geom::Affine *transform)
diff --git a/src/svg/svg-angle.cpp b/src/svg/svg-angle.cpp
index 9d4435a18..e92893204 100644
--- a/src/svg/svg-angle.cpp
+++ b/src/svg/svg-angle.cpp
@@ -17,8 +17,8 @@
 #endif
 
 #include <cstring>
-#include <string>
 #include <glib.h>
+#include <string>
 
 #include "svg/svg-angle.h"
 #include "util/units.h"
diff --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp
index d1e91ace1..db0c0ab34 100644
--- a/src/svg/svg-color.cpp
+++ b/src/svg/svg-color.cpp
@@ -15,19 +15,19 @@
 # include "config.h"
 #endif
 
-#include <cstdlib>
 #include <cstdio> // sprintf
+#include <cstdlib>
 #include <cstring>
-#include <string>
-#include <math.h>
-#include <glib.h> // g_assert
 #include <errno.h>
+#include <glib.h> // g_assert
+#include <math.h>
+#include <string>
 
 #include <map>
 
 #include "colorspace.h"
-#include "strneq.h"
 #include "preferences.h"
+#include "strneq.h"
 #include "svg-color.h"
 #include "svg-icc-color.h"
 
diff --git a/src/svg/svg-length.cpp b/src/svg/svg-length.cpp
index b3468d49c..63ca09821 100644
--- a/src/svg/svg-length.cpp
+++ b/src/svg/svg-length.cpp
@@ -12,12 +12,12 @@
 
 #include <cmath>
 #include <cstring>
-#include <string>
 #include <glib.h>
 #include <iostream>
+#include <string>
 
-#include "svg.h"
 #include "stringstream.h"
+#include "svg.h"
 #include "util/units.h"
 
 static unsigned sp_svg_length_read_lff(gchar const *str, SVGLength::Unit *unit, float *val, float *computed, char **next);
diff --git a/src/svg/svg-path.cpp b/src/svg/svg-path.cpp
index 13795f2a3..dee79075a 100644
--- a/src/svg/svg-path.cpp
+++ b/src/svg/svg-path.cpp
@@ -16,17 +16,17 @@
  */
 
 #include <cstring>
-#include <string>
 #include <glib.h> // g_assert()
+#include <string>
 
-#include <2geom/pathvector.h>
 #include <2geom/curves.h>
-#include <2geom/sbasis-to-bezier.h>
 #include <2geom/path-sink.h>
+#include <2geom/pathvector.h>
+#include <2geom/sbasis-to-bezier.h>
 #include <2geom/svg-path-parser.h>
 
-#include "svg/svg.h"
 #include "svg/path-string.h"
+#include "svg/svg.h"
 
 /*
  * Parses the path in str. When an error is found in the pathstring, this method
diff --git a/src/text-chemistry.cpp b/src/text-chemistry.cpp
index b26293801..20e6f931e 100644
--- a/src/text-chemistry.cpp
+++ b/src/text-chemistry.cpp
@@ -16,8 +16,8 @@
 #endif
 
 #include <cstring>
-#include <string>
 #include <glibmm/i18n.h>
+#include <string>
 
 
 #include "desktop.h"
diff --git a/src/text-editing.cpp b/src/text-editing.cpp
index ec9b82235..eaaaafaf7 100644
--- a/src/text-editing.cpp
+++ b/src/text-editing.cpp
@@ -16,8 +16,8 @@
 #endif
 
 #include <cstring>
-#include <string>
 #include <glibmm/i18n.h>
+#include <string>
 
 #include "desktop.h"
 #include "document.h"
@@ -25,11 +25,11 @@
 #include "message-stack.h"
 #include "text-editing.h"
 
-#include "object/sp-textpath.h"
-#include "object/sp-flowtext.h"
 #include "object/sp-flowdiv.h"
 #include "object/sp-flowregion.h"
+#include "object/sp-flowtext.h"
 #include "object/sp-item-group.h"
+#include "object/sp-textpath.h"
 #include "object/sp-tref.h"
 #include "object/sp-tspan.h"
 #include "style.h"
@@ -1240,7 +1240,7 @@ sp_te_adjust_line_height (SPObject *object, double amount, double average, bool
     // Always set if top level true.
     // Also set if line_height is set to a non-zero value.
     if (top_level ||
-        (style->line_height.set && !style->line_height.inherit && !style->line_height.computed == 0)){
+        (style->line_height.set && !style->line_height.inherit && (!(style->line_height.computed) == 0))){
 
         // Scale default values
         if (!style->line_height.set || style->line_height.inherit || style->line_height.normal) {
diff --git a/src/trace/potrace/inkscape-potrace.cpp b/src/trace/potrace/inkscape-potrace.cpp
index b438be248..f9c416961 100644
--- a/src/trace/potrace/inkscape-potrace.cpp
+++ b/src/trace/potrace/inkscape-potrace.cpp
@@ -21,17 +21,17 @@
 #include <iomanip>
 
 #include "trace/filterset.h"
-#include "trace/quantize.h"
 #include "trace/imagemap-gdk.h"
+#include "trace/quantize.h"
 
-#include <inkscape.h>
 #include "desktop.h"
 #include "message-stack.h"
+#include <inkscape.h>
 
 #include "object/sp-path.h"
 
-#include <svg/path-string.h>
 #include "bitmap.h"
+#include <svg/path-string.h>
 
 using Glib::ustring;
 
diff --git a/src/trace/quantize.cpp b/src/trace/quantize.cpp
index c386c0ee9..7a085b083 100644
--- a/src/trace/quantize.cpp
+++ b/src/trace/quantize.cpp
@@ -11,11 +11,11 @@
 
 #include <cassert>
 #include <cstdio>
-#include <stdlib.h>
 #include <new>
+#include <stdlib.h>
 
-#include "pool.h"
 #include "imagemap.h"
+#include "pool.h"
 #include "quantize.h"
 
 typedef struct Ocnode_def Ocnode;
diff --git a/src/trace/siox.cpp b/src/trace/siox.cpp
index 9df4e561c..8bd04c0b9 100644
--- a/src/trace/siox.cpp
+++ b/src/trace/siox.cpp
@@ -7,11 +7,11 @@
  */
 #include "siox.h"
 
-#include <math.h>
-#include <stdarg.h>
-#include <map>
 #include <algorithm>
 #include <cstdlib>
+#include <map>
+#include <math.h>
+#include <stdarg.h>
 
 
 namespace org
diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp
index 5595b2544..94e24dfc2 100644
--- a/src/trace/trace.cpp
+++ b/src/trace/trace.cpp
@@ -14,30 +14,30 @@
 
 #include "trace/potrace/inkscape-potrace.h"
 
-#include "inkscape.h"
 #include "desktop.h"
+#include "inkscape.h"
 
-#include "document.h"
 #include "document-undo.h"
+#include "document.h"
 #include "message-stack.h"
-#include <glibmm/i18n.h>
-#include <gtkmm/main.h>
 #include "selection.h"
-#include "xml/repr.h"
+#include "verbs.h"
 #include "xml/attribute-record.h"
+#include "xml/repr.h"
 #include <2geom/transforms.h>
-#include "verbs.h"
+#include <glibmm/i18n.h>
+#include <gtkmm/main.h>
 
 #include "display/cairo-utils.h"
-#include "display/drawing.h"
 #include "display/drawing-shape.h"
+#include "display/drawing.h"
 
+#include "object/sp-image.h"
 #include "object/sp-item.h"
 #include "object/sp-shape.h"
-#include "object/sp-image.h"
 
-#include "siox.h"
 #include "imagemap-gdk.h"
+#include "siox.h"
 
 namespace Inkscape {
 namespace Trace {
diff --git a/src/transf_mat_3x4.cpp b/src/transf_mat_3x4.cpp
index 05d0e9d6d..db17e61c6 100644
--- a/src/transf_mat_3x4.cpp
+++ b/src/transf_mat_3x4.cpp
@@ -12,12 +12,12 @@
  */
 
 #include "transf_mat_3x4.h"
-#include <gtk/gtk.h>
-#include <2geom/affine.h>
-#include "svg/stringstream.h"
-#include "syseq.h"
 #include "document.h"
 #include "inkscape.h"
+#include "svg/stringstream.h"
+#include "syseq.h"
+#include <2geom/affine.h>
+#include <gtk/gtk.h>
 
 namespace Proj {
 
diff --git a/src/ui/cache/svg_preview_cache.cpp b/src/ui/cache/svg_preview_cache.cpp
index 829c6b0ef..35a7214a1 100644
--- a/src/ui/cache/svg_preview_cache.cpp
+++ b/src/ui/cache/svg_preview_cache.cpp
@@ -23,9 +23,9 @@
 
 #include <2geom/transforms.h>
 
-#include "selection.h"
-#include "inkscape.h"
 #include "document-private.h"
+#include "inkscape.h"
+#include "selection.h"
 
 #include "display/cairo-utils.h"
 #include "display/drawing-context.h"
diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index 4f6adec4f..a5bd0aee0 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -21,42 +21,42 @@
  * See the file COPYING for details.
  */
 
-#include <gtkmm/clipboard.h>
 #include "ui/clipboard.h"
+#include <gtkmm/clipboard.h>
 
 // TODO: reduce header bloat if possible
 
+#include "desktop.h"
 #include "file.h" // for file_import, used in _pasteImage
-#include <glibmm/i18n.h>
-#include <glib/gstdio.h> // for g_file_set_contents etc., used in _onGet and paste
 #include "inkgc/gc-core.h"
-#include "xml/repr.h"
 #include "inkscape.h"
 #include "io/stringstream.h"
-#include "desktop.h"
+#include "xml/repr.h"
+#include <glib/gstdio.h> // for g_file_set_contents etc., used in _onGet and paste
+#include <glibmm/i18n.h>
 
+#include "context-fns.h"
 #include "desktop-style.h" // for sp_desktop_set_style, used in _pasteStyle
-#include "document.h"
 #include "document-private.h"
-#include "message-stack.h"
-#include "context-fns.h"
-#include "ui/tools/dropper-tool.h" // used in copy()
+#include "document.h"
 #include "extension/db.h" // extension database
+#include "extension/find_extension_by_mime.h"
 #include "extension/input.h"
 #include "extension/output.h"
-#include "selection-chemistry.h"
-#include <2geom/transforms.h>
 #include "gradient-drag.h"
-#include "live_effects/lpeobject.h"
+#include "helper/png-write.h"
 #include "live_effects/lpeobject-reference.h"
+#include "live_effects/lpeobject.h"
 #include "live_effects/parameter/path.h"
-#include "ui/tools/text-tool.h"
+#include "message-stack.h"
+#include "path-chemistry.h"
+#include "selection-chemistry.h"
 #include "text-editing.h"
 #include "ui/tools-switch.h"
-#include "path-chemistry.h"
+#include "ui/tools/dropper-tool.h" // used in copy()
+#include "ui/tools/text-tool.h"
 #include "util/units.h"
-#include "helper/png-write.h"
-#include "extension/find_extension_by_mime.h"
+#include <2geom/transforms.h>
 
 #include "object/box3d.h"
 #include "object/persp3d.h"
@@ -72,13 +72,13 @@
 #include "object/sp-rect.h"
 #include "object/sp-root.h"
 #include "object/sp-shape.h"
-#include "object/sp-use.h"
 #include "object/sp-textpath.h"
+#include "object/sp-use.h"
 #include "style.h"
 
-#include "svg/svg.h" // for sp_svg_transform_write, used in _copySelection
 #include "svg/css-ostringstream.h" // used in copy
 #include "svg/svg-color.h"
+#include "svg/svg.h" // for sp_svg_transform_write, used in _copySelection
 
 /// Made up mimetype to represent Gdk::Pixbuf clipboard contents.
 #define CLIPBOARD_GDK_PIXBUF_TARGET "image/x-gdk-pixbuf"
diff --git a/src/ui/clipboard.h b/src/ui/clipboard.h
index e32b5aed2..67cbe9e08 100644
--- a/src/ui/clipboard.h
+++ b/src/ui/clipboard.h
@@ -20,6 +20,7 @@
  */
 
 #include <glibmm/ustring.h>
+#include <vector>
 
 // forward declarations
 class SPDesktop;
diff --git a/src/ui/contextmenu.cpp b/src/ui/contextmenu.cpp
index 1a5691c3f..0f0b6fe1b 100644
--- a/src/ui/contextmenu.cpp
+++ b/src/ui/contextmenu.cpp
@@ -29,15 +29,15 @@
 #include <gtkmm/separatormenuitem.h>
 
 #include "desktop.h"
-#include "document.h"
 #include "document-undo.h"
-#include "helper/action.h"
+#include "document.h"
 #include "helper/action-context.h"
+#include "helper/action.h"
 #include "inkscape.h"
 #include "message-context.h"
 #include "message-stack.h"
-#include "selection.h"
 #include "selection-chemistry.h"
+#include "selection.h"
 #include "shortcuts.h"
 
 #include "object/sp-anchor.h"
diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp
index d0106bfcd..d1921d893 100644
--- a/src/ui/control-manager.cpp
+++ b/src/ui/control-manager.cpp
@@ -17,8 +17,8 @@
 #include <glib-object.h>
 
 #include "display/sodipodi-ctrl.h" // for SP_TYPE_CTRL
-#include "display/sp-ctrlline.h"
 #include "display/sp-ctrlcurve.h"
+#include "display/sp-ctrlline.h"
 #include "preferences.h"
 
 using Inkscape::ControlFlags;
diff --git a/src/ui/dialog-events.cpp b/src/ui/dialog-events.cpp
index cf11490f3..e950288ea 100644
--- a/src/ui/dialog-events.cpp
+++ b/src/ui/dialog-events.cpp
@@ -15,12 +15,12 @@
 #include <config.h>
 #endif
 
-#include <gtkmm/entry.h>
-#include <gtkmm/window.h>
-#include "macros.h"
 #include "desktop.h"
 #include "inkscape.h"
+#include "macros.h"
 #include "ui/tools/tool-base.h"
+#include <gtkmm/entry.h>
+#include <gtkmm/window.h>
 
 #include "ui/dialog-events.h"
 
diff --git a/src/ui/dialog/color-item.cpp b/src/ui/dialog/color-item.cpp
index 8eda9ae08..a22316f1a 100644
--- a/src/ui/dialog/color-item.cpp
+++ b/src/ui/dialog/color-item.cpp
@@ -17,8 +17,8 @@
 
 #include <errno.h>
 
-#include <gtkmm/label.h>
 #include <glibmm/i18n.h>
+#include <gtkmm/label.h>
 
 #include "color-item.h"
 
@@ -26,8 +26,8 @@
 
 #include "desktop-style.h"
 #include "display/cairo-utils.h"
-#include "document.h"
 #include "document-undo.h"
+#include "document.h"
 #include "inkscape.h" // for SP_ACTIVE_DESKTOP
 #include "io/resource.h"
 #include "io/sys.h"
diff --git a/src/ui/dialog/cssdialog.cpp b/src/ui/dialog/cssdialog.cpp
index efceeae11..de9328f3c 100644
--- a/src/ui/dialog/cssdialog.cpp
+++ b/src/ui/dialog/cssdialog.cpp
@@ -13,8 +13,8 @@
 
 #include "cssdialog.h"
 
-#include "verbs.h"
 #include "selection.h"
+#include "verbs.h"
 
 #include "ui/widget/addtoicon.h"
 
diff --git a/src/ui/dialog/debug.cpp b/src/ui/dialog/debug.cpp
index d062bf863..03a8627ec 100644
--- a/src/ui/dialog/debug.cpp
+++ b/src/ui/dialog/debug.cpp
@@ -13,12 +13,12 @@
 #include "config.h"
 #endif
 
+#include <glibmm/i18n.h>
 #include <gtkmm/box.h>
 #include <gtkmm/dialog.h>
-#include <gtkmm/textview.h>
 #include <gtkmm/menubar.h>
 #include <gtkmm/scrolledwindow.h>
-#include <glibmm/i18n.h>
+#include <gtkmm/textview.h>
 
 #include "debug.h"
 
diff --git a/src/ui/dialog/desktop-tracker.cpp b/src/ui/dialog/desktop-tracker.cpp
index c18711a55..a86b425e2 100644
--- a/src/ui/dialog/desktop-tracker.cpp
+++ b/src/ui/dialog/desktop-tracker.cpp
@@ -9,8 +9,8 @@
 
 #include "desktop-tracker.h"
 
-#include "inkscape.h"
 #include "desktop.h"
+#include "inkscape.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp
index 0a4a774e6..3d83cd956 100644
--- a/src/ui/dialog/dialog-manager.cpp
+++ b/src/ui/dialog/dialog-manager.cpp
@@ -19,14 +19,13 @@
 
 #include "ui/dialog/dialog-manager.h"
 
-#include "ui/dialog/prototype.h"
 #include "ui/dialog/align-and-distribute.h"
 #include "ui/dialog/document-metadata.h"
 #include "ui/dialog/document-properties.h"
 #include "ui/dialog/extension-editor.h"
 #include "ui/dialog/fill-and-stroke.h"
-#include "ui/dialog/filter-effects-dialog.h"
 #include "ui/dialog/filter-editor.h"
+#include "ui/dialog/filter-effects-dialog.h"
 #include "ui/dialog/find.h"
 #include "ui/dialog/glyphs.h"
 #include "ui/dialog/inkscape-preferences.h"
@@ -34,6 +33,7 @@
 #include "ui/dialog/livepatheffect-editor.h"
 #include "ui/dialog/memory.h"
 #include "ui/dialog/messages.h"
+#include "ui/dialog/prototype.h"
 #include "ui/dialog/symbols.h"
 #include "ui/dialog/tile.h"
 
@@ -41,26 +41,26 @@
 # include "ui/dialog/tracedialog.h"
 #endif
 
+#include "ui/dialog/icon-preview.h"
+#include "ui/dialog/layers.h"
+#include "ui/dialog/panel-dialog.h"
 #include "ui/dialog/pixelartdialog.h"
 #include "ui/dialog/transformation.h"
 #include "ui/dialog/undo-history.h"
-#include "ui/dialog/panel-dialog.h"
-#include "ui/dialog/layers.h"
-#include "ui/dialog/icon-preview.h"
 //#include "ui/dialog/print-colors-preview-dialog.h"
-#include "util/ege-appear-time-tracker.h"
+#include "ui/dialog/clonetiler.h"
+#include "ui/dialog/cssdialog.h"
+#include "ui/dialog/export.h"
 #include "ui/dialog/object-attributes.h"
 #include "ui/dialog/object-properties.h"
-#include "ui/dialog/text-edit.h"
+#include "ui/dialog/objects.h"
 #include "ui/dialog/spellcheck.h"
-#include "ui/dialog/export.h"
-#include "ui/dialog/xml-tree.h"
-#include "ui/dialog/clonetiler.h"
+#include "ui/dialog/styledialog.h"
 #include "ui/dialog/svg-fonts-dialog.h"
-#include "ui/dialog/objects.h"
 #include "ui/dialog/tags.h"
-#include "ui/dialog/styledialog.h"
-#include "ui/dialog/cssdialog.h"
+#include "ui/dialog/text-edit.h"
+#include "ui/dialog/xml-tree.h"
+#include "util/ege-appear-time-tracker.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp
index f7e9a1bed..f58630825 100644
--- a/src/ui/dialog/dialog.cpp
+++ b/src/ui/dialog/dialog.cpp
@@ -22,15 +22,15 @@
 
 #include <gdk/gdkkeysyms.h>
 
+#include "desktop.h"
 #include "inkscape.h"
 #include "ui/monitor.h"
 #include "ui/tools/tool-base.h"
-#include "desktop.h"
 
 #include "shortcuts.h"
 #include "ui/interface.h"
-#include "verbs.h"
 #include "ui/tool/event-utils.h"
+#include "verbs.h"
 
 #define MIN_ONSCREEN_DISTANCE 50
 
diff --git a/src/ui/dialog/dock-behavior.cpp b/src/ui/dialog/dock-behavior.cpp
index bff2b2b64..c96bff81f 100644
--- a/src/ui/dialog/dock-behavior.cpp
+++ b/src/ui/dialog/dock-behavior.cpp
@@ -15,14 +15,14 @@
 #include "config.h"
 #endif
 
+#include "desktop.h"
+#include "dialog.h"
 #include "dock-behavior.h"
 #include "inkscape.h"
-#include "desktop.h"
+#include "ui/dialog-events.h"
 #include "ui/interface.h"
 #include "ui/widget/dock.h"
 #include "verbs.h"
-#include "dialog.h"
-#include "ui/dialog-events.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/document-metadata.cpp b/src/ui/dialog/document-metadata.cpp
index e46f5ec6c..b96b22c48 100644
--- a/src/ui/dialog/document-metadata.cpp
+++ b/src/ui/dialog/document-metadata.cpp
@@ -18,8 +18,8 @@
 #include "config.h"
 #endif
 
-#include "document-metadata.h"
 #include "desktop.h"
+#include "document-metadata.h"
 #include "rdf.h"
 #include "verbs.h"
 
diff --git a/src/ui/dialog/extension-editor.cpp b/src/ui/dialog/extension-editor.cpp
index 14248cc4b..bf8b263b7 100644
--- a/src/ui/dialog/extension-editor.cpp
+++ b/src/ui/dialog/extension-editor.cpp
@@ -21,9 +21,9 @@
 #include <gtkmm/frame.h>
 #include <gtkmm/notebook.h>
 
-#include "verbs.h"
 #include "preferences.h"
 #include "ui/interface.h"
+#include "verbs.h"
 
 #include "extension/db.h"
 
diff --git a/src/ui/dialog/filedialog.cpp b/src/ui/dialog/filedialog.cpp
index df3c4a307..0cbc3536f 100644
--- a/src/ui/dialog/filedialog.cpp
+++ b/src/ui/dialog/filedialog.cpp
@@ -22,8 +22,8 @@
 
 #include "filedialogimpl-gtkmm.h"
 
-#include "ui/dialog-events.h"
 #include "extension/output.h"
+#include "ui/dialog-events.h"
 
 #include <glibmm/convert.h>
 
diff --git a/src/ui/dialog/filedialogimpl-gtkmm.cpp b/src/ui/dialog/filedialogimpl-gtkmm.cpp
index c8c508ee3..4370de94a 100644
--- a/src/ui/dialog/filedialogimpl-gtkmm.cpp
+++ b/src/ui/dialog/filedialogimpl-gtkmm.cpp
@@ -24,12 +24,12 @@
 #include <iostream>
 
 #include "filedialogimpl-gtkmm.h"
-#include "ui/dialog-events.h"
-#include "ui/interface.h"
-#include "io/sys.h"
 #include "io/resource.h"
+#include "io/sys.h"
 #include "path-prefix.h"
 #include "preferences.h"
+#include "ui/dialog-events.h"
+#include "ui/interface.h"
 
 #include <gtkmm/expander.h>
 
@@ -41,11 +41,11 @@
 #include <glibmm/regex.h>
 
 #include "document.h"
+#include "extension/db.h"
 #include "extension/input.h"
 #include "extension/output.h"
-#include "extension/db.h"
-#include "svg-view-widget.h"
 #include "inkscape.h"
+#include "svg-view-widget.h"
 
 // Routines from file.cpp
 #undef INK_DUMP_FILENAME_CONV
diff --git a/src/ui/dialog/filter-editor.cpp b/src/ui/dialog/filter-editor.cpp
index ef702aba4..202e724d8 100644
--- a/src/ui/dialog/filter-editor.cpp
+++ b/src/ui/dialog/filter-editor.cpp
@@ -16,13 +16,13 @@
 
 #include <string>
 
-#include <gtkmm.h>
 #include <gdkmm/display.h>
 #include <glibmm/convert.h>
 #include <glibmm/error.h>
 #include <glibmm/i18n.h>
 #include <glibmm/main.h>
 #include <glibmm/stringutils.h>
+#include <gtkmm.h>
 
 #if GTK_CHECK_VERSION(3, 20, 0)
 # include <gdkmm/seat.h>
@@ -42,13 +42,13 @@
 #include "selection-chemistry.h"
 #include "verbs.h"
 
-#include "io/sys.h"
 #include "io/resource.h"
+#include "io/sys.h"
 
 #include "object/filters/blend.h"
 #include "object/filters/colormatrix.h"
-#include "object/filters/componenttransfer.h"
 #include "object/filters/componenttransfer-funcnode.h"
+#include "object/filters/componenttransfer.h"
 #include "object/filters/convolvematrix.h"
 #include "object/filters/distantlight.h"
 #include "object/filters/merge.h"
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index e62d309c5..4b0584b94 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -33,10 +33,10 @@
 #endif
 
 
+#include <glibmm/convert.h>
 #include <glibmm/i18n.h>
-#include <glibmm/stringutils.h>
 #include <glibmm/main.h>
-#include <glibmm/convert.h>
+#include <glibmm/stringutils.h>
 
 #include "desktop.h"
 #include "dialog-manager.h"
@@ -51,8 +51,8 @@
 
 #include "object/filters/blend.h"
 #include "object/filters/colormatrix.h"
-#include "object/filters/componenttransfer.h"
 #include "object/filters/componenttransfer-funcnode.h"
+#include "object/filters/componenttransfer.h"
 #include "object/filters/convolvematrix.h"
 #include "object/filters/distantlight.h"
 #include "object/filters/merge.h"
diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp
index d172eca57..6c9193ff5 100644
--- a/src/ui/dialog/find.cpp
+++ b/src/ui/dialog/find.cpp
@@ -16,9 +16,9 @@
 
 #include "find.h"
 
-#include <gtkmm/entry.h>
 #include <glibmm/i18n.h>
 #include <glibmm/regex.h>
+#include <gtkmm/entry.h>
 
 #include "desktop.h"
 #include "document-undo.h"
diff --git a/src/ui/dialog/floating-behavior.cpp b/src/ui/dialog/floating-behavior.cpp
index 9abad3e7b..04a25a621 100644
--- a/src/ui/dialog/floating-behavior.cpp
+++ b/src/ui/dialog/floating-behavior.cpp
@@ -14,14 +14,14 @@
 #include "config.h"
 #endif
 
-#include <gtkmm/dialog.h>
 #include <glibmm/main.h>
+#include <gtkmm/dialog.h>
 
-#include "floating-behavior.h"
 #include "dialog.h"
+#include "floating-behavior.h"
 
-#include "inkscape.h"
 #include "desktop.h"
+#include "inkscape.h"
 #include "ui/dialog-events.h"
 #include "ui/interface.h"
 #include "verbs.h"
diff --git a/src/ui/dialog/font-substitution.cpp b/src/ui/dialog/font-substitution.cpp
index da7d14d9c..b13ef8cf0 100644
--- a/src/ui/dialog/font-substitution.cpp
+++ b/src/ui/dialog/font-substitution.cpp
@@ -15,8 +15,8 @@
 #include <glibmm/i18n.h>
 #include <glibmm/regex.h>
 
-#include <gtkmm/messagedialog.h>
 #include <gtkmm/checkbutton.h>
+#include <gtkmm/messagedialog.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/textview.h>
 
@@ -28,11 +28,11 @@
 #include "selection-chemistry.h"
 #include "text-editing.h"
 
+#include "object/sp-flowdiv.h"
+#include "object/sp-flowtext.h"
 #include "object/sp-root.h"
 #include "object/sp-text.h"
 #include "object/sp-textpath.h"
-#include "object/sp-flowtext.h"
-#include "object/sp-flowdiv.h"
 #include "object/sp-tspan.h"
 
 #include "libnrtype/FontFactory.h"
diff --git a/src/ui/dialog/grid-arrange-tab.cpp b/src/ui/dialog/grid-arrange-tab.cpp
index 96e6acb3c..6df64565e 100644
--- a/src/ui/dialog/grid-arrange-tab.cpp
+++ b/src/ui/dialog/grid-arrange-tab.cpp
@@ -22,13 +22,13 @@
 
 #include <2geom/transforms.h>
 
-#include "verbs.h"
-#include "preferences.h"
 #include "inkscape.h"
+#include "preferences.h"
+#include "verbs.h"
 
-#include "document.h"
-#include "document-undo.h"
 #include "desktop.h"
+#include "document-undo.h"
+#include "document.h"
     //#include "sp-item-transform.h" FIXME
 #include "ui/dialog/tile.h" // for Inkscape::UI::Dialog::ArrangeDialog
 
diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index 47f6f3121..99ad84c9b 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -18,8 +18,8 @@
 #endif
 
 #include <glibmm/i18n.h>
-#include <glibmm/timer.h>
 #include <glibmm/main.h>
+#include <glibmm/timer.h>
 
 #include <gtkmm/buttonbox.h>
 #include <gtkmm/checkbutton.h>
@@ -31,8 +31,8 @@
 #include "verbs.h"
 
 #include "display/cairo-utils.h"
-#include "display/drawing.h"
 #include "display/drawing-context.h"
+#include "display/drawing.h"
 
 #include "object/sp-namedview.h"
 #include "object/sp-root.h"
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 96c446d0c..2af77ed42 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -20,11 +20,11 @@
 #include "inkscape-preferences.h"
 
 #include <glibmm/i18n.h>
-#include <glibmm/miscutils.h>
 #include <glibmm/markup.h>
+#include <glibmm/miscutils.h>
 #include <gtkmm/main.h>
-#include <gtkmm/recentmanager.h>
 #include <gtkmm/recentinfo.h>
+#include <gtkmm/recentmanager.h>
 
 #include "cms-system.h"
 #include "document.h"
diff --git a/src/ui/dialog/input.cpp b/src/ui/dialog/input.cpp
index 3fdd2a6cf..addc01b0a 100644
--- a/src/ui/dialog/input.cpp
+++ b/src/ui/dialog/input.cpp
@@ -9,11 +9,11 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
 
+#include "ui/widget/frame.h"
+#include "ui/widget/panel.h"
+#include <list>
 #include <map>
 #include <set>
-#include <list>
-#include "ui/widget/panel.h"
-#include "ui/widget/frame.h"
 
 #include <glibmm/i18n.h>
 
@@ -21,6 +21,7 @@
 #include <gtkmm/cellrenderercombo.h>
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/comboboxtext.h>
+#include <gtkmm/eventbox.h>
 #include <gtkmm/grid.h>
 #include <gtkmm/liststore.h>
 #include <gtkmm/menubar.h>
@@ -29,7 +30,6 @@
 #include <gtkmm/progressbar.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/treestore.h>
-#include <gtkmm/eventbox.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 29e1cb2bb..0faff17d4 100644
--- a/src/ui/dialog/knot-properties.cpp
+++ b/src/ui/dialog/knot-properties.cpp
@@ -19,15 +19,15 @@
 
 #include "ui/dialog/knot-properties.h"
 
-#include <boost/lexical_cast.hpp>
-#include <glibmm/i18n.h>
-#include <glibmm/main.h>
-#include "inkscape.h"
-#include "util/units.h"
 #include "desktop.h"
-#include "document.h"
 #include "document-undo.h"
+#include "document.h"
+#include "inkscape.h"
 #include "layer-manager.h"
+#include "util/units.h"
+#include <boost/lexical_cast.hpp>
+#include <glibmm/i18n.h>
+#include <glibmm/main.h>
 
 #include "selection-chemistry.h"
 
diff --git a/src/ui/dialog/layer-properties.cpp b/src/ui/dialog/layer-properties.cpp
index 4ab6e130e..f8695c206 100644
--- a/src/ui/dialog/layer-properties.cpp
+++ b/src/ui/dialog/layer-properties.cpp
@@ -17,18 +17,18 @@
 #include <glibmm/i18n.h>
 #include <glibmm/main.h>
 
-#include "inkscape.h"
 #include "desktop.h"
-#include "document.h"
 #include "document-undo.h"
+#include "document.h"
+#include "inkscape.h"
 #include "layer-manager.h"
 #include "message-stack.h"
 
-#include "verbs.h"
 #include "selection-chemistry.h"
 #include "ui/icon-names.h"
-#include "ui/widget/imagetoggler.h"
 #include "ui/tools/tool-base.h"
+#include "ui/widget/imagetoggler.h"
+#include "verbs.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index 6f609736a..4e41e889c 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -15,9 +15,9 @@
 
 #include "layers.h"
 
+#include <glibmm/main.h>
 #include <gtkmm/icontheme.h>
 #include <gtkmm/separatormenuitem.h>
-#include <glibmm/main.h>
 
 #include "desktop-style.h"
 #include "desktop.h"
diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp
index 6cf7f807a..e833c5ed1 100644
--- a/src/ui/dialog/livepatheffect-editor.cpp
+++ b/src/ui/dialog/livepatheffect-editor.cpp
@@ -38,8 +38,8 @@
 #include "object/sp-item-group.h"
 #include "object/sp-path.h"
 #include "object/sp-rect.h"
-#include "object/sp-use.h"
 #include "object/sp-text.h"
+#include "object/sp-use.h"
 
 #include "ui/icon-names.h"
 #include "ui/tools/node-tool.h"
diff --git a/src/ui/dialog/lpe-fillet-chamfer-properties.cpp b/src/ui/dialog/lpe-fillet-chamfer-properties.cpp
index 6d19f9090..d2de61dc9 100644
--- a/src/ui/dialog/lpe-fillet-chamfer-properties.cpp
+++ b/src/ui/dialog/lpe-fillet-chamfer-properties.cpp
@@ -8,15 +8,15 @@
 #include "config.h"
 #endif
 
-#include <gtkmm.h>
-#include "lpe-fillet-chamfer-properties.h"
-#include <boost/lexical_cast.hpp>
-#include <glibmm/i18n.h>
-#include "inkscape.h"
 #include "desktop.h"
 #include "document-undo.h"
+#include "inkscape.h"
 #include "layer-manager.h"
+#include "lpe-fillet-chamfer-properties.h"
 #include "message-stack.h"
+#include <boost/lexical_cast.hpp>
+#include <glibmm/i18n.h>
+#include <gtkmm.h>
 
 #include "selection-chemistry.h"
 
diff --git a/src/ui/dialog/lpe-powerstroke-properties.cpp b/src/ui/dialog/lpe-powerstroke-properties.cpp
index e66229dcd..bfb20cc80 100644
--- a/src/ui/dialog/lpe-powerstroke-properties.cpp
+++ b/src/ui/dialog/lpe-powerstroke-properties.cpp
@@ -17,13 +17,13 @@
 #include "config.h"
 #endif
 
-#include "lpe-powerstroke-properties.h"
-#include <boost/lexical_cast.hpp>
-#include <glibmm/i18n.h>
-#include "inkscape.h"
 #include "desktop.h"
 #include "document-undo.h"
+#include "inkscape.h"
 #include "layer-manager.h"
+#include "lpe-powerstroke-properties.h"
+#include <boost/lexical_cast.hpp>
+#include <glibmm/i18n.h>
 
 #include "selection-chemistry.h"
 //#include "event-context.h"
diff --git a/src/ui/dialog/memory.cpp b/src/ui/dialog/memory.cpp
index c9a16225e..cd6eaa5a1 100644
--- a/src/ui/dialog/memory.cpp
+++ b/src/ui/dialog/memory.cpp
@@ -18,12 +18,12 @@
 #include <glibmm/i18n.h>
 #include <glibmm/main.h>
 
+#include <gtkmm/dialog.h>
 #include <gtkmm/liststore.h>
 #include <gtkmm/treeview.h>
-#include <gtkmm/dialog.h>
 
-#include "inkgc/gc-core.h"
 #include "debug/heap.h"
+#include "inkgc/gc-core.h"
 #include "verbs.h"
 
 namespace Inkscape {
diff --git a/src/ui/dialog/new-from-template.cpp b/src/ui/dialog/new-from-template.cpp
index 7e0c5b526..ad78cae4b 100644
--- a/src/ui/dialog/new-from-template.cpp
+++ b/src/ui/dialog/new-from-template.cpp
@@ -12,8 +12,8 @@
 #include "config.h"
 #endif
 
-#include "new-from-template.h"
 #include "file.h"
+#include "new-from-template.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/object-attributes.cpp b/src/ui/dialog/object-attributes.cpp
index f3e93ded8..915d413bf 100644
--- a/src/ui/dialog/object-attributes.cpp
+++ b/src/ui/dialog/object-attributes.cpp
@@ -29,8 +29,8 @@
 #include "object/sp-anchor.h"
 #include "object/sp-image.h"
 
-#include "ui/dialog/object-attributes.h"
 #include "ui/dialog/dialog-manager.h"
+#include "ui/dialog/object-attributes.h"
 
 #include "widgets/sp-attribute-widget.h"
 
diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index c2ee66cd7..4bd016684 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -17,10 +17,10 @@
 
 #include "objects.h"
 
+#include <glibmm/main.h>
 #include <gtkmm/icontheme.h>
 #include <gtkmm/imagemenuitem.h>
 #include <gtkmm/separatormenuitem.h>
-#include <glibmm/main.h>
 
 #include "desktop-style.h"
 #include "desktop.h"
diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp
index 4302161dc..2959b4037 100644
--- a/src/ui/dialog/ocaldialogs.cpp
+++ b/src/ui/dialog/ocaldialogs.cpp
@@ -18,24 +18,24 @@
 
 #include "ocaldialogs.h"
 
-#include "path-prefix.h"
 #include "filedialogimpl-gtkmm.h"
-#include "ui/interface.h"
 #include "inkgc/gc-core.h"
 #include "io/sys.h"
+#include "path-prefix.h"
 #include "preferences.h"
+#include "ui/interface.h"
 
+#include <gdkmm/general.h>
 #include <gtkmm/notebook.h>
 #include <gtkmm/spinner.h>
-#include <gdkmm/general.h>
 #include <libxml/tree.h>
 
-#include <glibmm/i18n.h>
-#include <glibmm/miscutils.h>
-#include <glibmm/markup.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"
 
diff --git a/src/ui/dialog/pixelartdialog.cpp b/src/ui/dialog/pixelartdialog.cpp
index 5b96febb7..ebc8cea0d 100644
--- a/src/ui/dialog/pixelartdialog.cpp
+++ b/src/ui/dialog/pixelartdialog.cpp
@@ -22,8 +22,8 @@
 #  include <glibmm/dispatcher.h>
 #  define GLIBMM_DISABLE_DEPRECATED 1
 #else // GLIBMM_DISABLE_DEPRECATED
-#  include <glibmm/thread.h>
 #  include <glibmm/dispatcher.h>
+#  include <glibmm/thread.h>
 #endif // GLIBMM_DISABLE_DEPRECATED
 
 #include <glibmm/i18n.h>
diff --git a/src/ui/dialog/print.cpp b/src/ui/dialog/print.cpp
index ea99ffa19..68a4991f1 100644
--- a/src/ui/dialog/print.cpp
+++ b/src/ui/dialog/print.cpp
@@ -19,13 +19,13 @@
 #include "preferences.h"
 #include "print.h"
 
+#include "document.h"
 #include "extension/internal/cairo-render-context.h"
 #include "extension/internal/cairo-renderer.h"
-#include "document.h"
 
-#include "util/units.h"
 #include "helper/png-write.h"
 #include "svg/svg-color.h"
+#include "util/units.h"
 
 #include <glibmm/i18n.h>
 
diff --git a/src/ui/dialog/save-template-dialog.cpp b/src/ui/dialog/save-template-dialog.cpp
index 5b7540039..0544a8544 100644
--- a/src/ui/dialog/save-template-dialog.cpp
+++ b/src/ui/dialog/save-template-dialog.cpp
@@ -2,8 +2,8 @@
 #include "config.h"
 #endif
 
-#include "save-template-dialog.h"
 #include "file.h"
+#include "save-template-dialog.h"
 
 #include <glibmm/i18n.h>
 
diff --git a/src/ui/dialog/spellcheck.cpp b/src/ui/dialog/spellcheck.cpp
index 252782081..627da6874 100644
--- a/src/ui/dialog/spellcheck.cpp
+++ b/src/ui/dialog/spellcheck.cpp
@@ -15,18 +15,18 @@
 #include "spellcheck.h"
 #include "message-stack.h"
 
+#include "desktop.h"
+#include "document.h"
 #include "helper/window.h"
 #include "inkscape.h"
-#include "document.h"
-#include "desktop.h"
 
-#include "ui/tools-switch.h"
-#include "ui/tools/text-tool.h"
-#include "ui/interface.h"
-#include "text-editing.h"
-#include "selection-chemistry.h"
 #include "display/curve.h"
 #include "document-undo.h"
+#include "selection-chemistry.h"
+#include "text-editing.h"
+#include "ui/interface.h"
+#include "ui/tools-switch.h"
+#include "ui/tools/text-tool.h"
 #include "verbs.h"
 
 #include "object/sp-defs.h"
diff --git a/src/ui/dialog/styledialog.cpp b/src/ui/dialog/styledialog.cpp
index 17850712f..51cbf27d8 100644
--- a/src/ui/dialog/styledialog.cpp
+++ b/src/ui/dialog/styledialog.cpp
@@ -12,11 +12,11 @@
  */
 
 #include "styledialog.h"
-#include "verbs.h"
-#include "selection.h"
 #include "attribute-rel-svg.h"
-#include "inkscape.h"
 #include "document-undo.h"
+#include "inkscape.h"
+#include "selection.h"
+#include "verbs.h"
 
 
 #include "ui/widget/addtoicon.h"
diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp
index 19d67916a..b13c8b599 100644
--- a/src/ui/dialog/svg-fonts-dialog.cpp
+++ b/src/ui/dialog/svg-fonts-dialog.cpp
@@ -15,28 +15,28 @@
 #include "config.h"
 #endif
 
-#include "svg-fonts-dialog.h"
+#include "desktop.h"
 #include "document-private.h"
 #include "document-undo.h"
-#include <gtkmm/notebook.h>
-#include <gtkmm/scale.h>
-#include <gtkmm/imagemenuitem.h>
-#include <message-stack.h>
 #include "selection.h"
+#include "svg-fonts-dialog.h"
 #include "svg/svg.h"
 #include "xml/repr.h"
-#include "desktop.h"
+#include <gtkmm/imagemenuitem.h>
+#include <gtkmm/notebook.h>
+#include <gtkmm/scale.h>
+#include <message-stack.h>
 
-#include <sstream>
 #include "display/nr-svgfonts.h"
 #include "verbs.h"
+#include <sstream>
 
+#include "object/sp-defs.h"
 #include "object/sp-font-face.h"
-#include "object/sp-glyph.h"
-#include "object/sp-missing-glyph.h"
 #include "object/sp-font.h"
 #include "object/sp-glyph-kerning.h"
-#include "object/sp-defs.h"
+#include "object/sp-glyph.h"
+#include "object/sp-missing-glyph.h"
 
 #include <glibmm/i18n.h>
 #include <glibmm/stringutils.h>
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index e57dde639..965ea9952 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -9,52 +9,52 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <map>
 #include <algorithm>
 #include <iomanip>
+#include <map>
 #include <set>
 
 #include "swatches.h"
 #include <gtkmm/radiomenuitem.h>
 
-#include <gtkmm/menu.h>
 #include <gtkmm/checkmenuitem.h>
+#include <gtkmm/menu.h>
+#include <gtkmm/menubutton.h>
 #include <gtkmm/radiomenuitem.h>
 #include <gtkmm/separatormenuitem.h>
-#include <gtkmm/menubutton.h>
 
+#include <glibmm/fileutils.h>
 #include <glibmm/i18n.h>
 #include <glibmm/main.h>
-#include <glibmm/timer.h>
-#include <glibmm/fileutils.h>
 #include <glibmm/miscutils.h>
+#include <glibmm/timer.h>
 
 #include "color-item.h"
 #include "desktop.h"
 
 #include "desktop-style.h"
-#include "document.h"
 #include "document-private.h"
 #include "document-undo.h"
+#include "document.h"
 #include "extension/db.h"
 #include "inkscape.h"
-#include "io/sys.h"
 #include "io/resource.h"
+#include "io/sys.h"
 #include "message-context.h"
 #include "path-prefix.h"
 
+#include "display/cairo-utils.h"
 #include "ui/previewholder.h"
 #include "widgets/desktop-widget.h"
 #include "widgets/gradient-vector.h"
-#include "display/cairo-utils.h"
 
 #include "object/sp-defs.h"
 #include "object/sp-gradient-reference.h"
 
 #include "dialog-manager.h"
-#include "verbs.h"
 #include "gradient-chemistry.h"
 #include "helper/action.h"
+#include "verbs.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp
index 0ef631a3a..6edb47efd 100644
--- a/src/ui/dialog/symbols.cpp
+++ b/src/ui/dialog/symbols.cpp
@@ -12,20 +12,20 @@
 # include "config.h"
 #endif
 
-#include <iostream>
 #include <algorithm>
-#include <locale>
-#include <sstream>
 #include <fstream>
+#include <iostream>
+#include <locale>
 #include <regex>
+#include <sstream>
 
+#include <glibmm/markup.h>
 #include <glibmm/regex.h>
 #include <glibmm/stringutils.h>
-#include <glibmm/markup.h>
 
-#include "path-prefix.h"
-#include "io/sys.h"
 #include "io/resource.h"
+#include "io/sys.h"
+#include "path-prefix.h"
 
 #include "display/cairo-utils.h"
 #include "ui/cache/svg_preview_cache.h"
@@ -34,16 +34,16 @@
 
 #include "symbols.h"
 
-#include "selection.h"
 #include "desktop.h"
+#include "selection.h"
 
 #include "document.h"
 #include "inkscape.h"
 
-#include "object/sp-root.h"
-#include "object/sp-use.h"
 #include "object/sp-defs.h"
+#include "object/sp-root.h"
 #include "object/sp-symbol.h"
+#include "object/sp-use.h"
 
 #ifdef WITH_LIBVISIO
   #include <libvisio/libvisio.h>
@@ -65,8 +65,8 @@
   #endif
 #endif
 
-#include "verbs.h"
 #include "helper/action.h"
+#include "verbs.h"
 #include <glibmm/i18n.h>
 
 namespace Inkscape {
diff --git a/src/ui/dialog/tags.cpp b/src/ui/dialog/tags.cpp
index 24f167500..cabb0d679 100644
--- a/src/ui/dialog/tags.cpp
+++ b/src/ui/dialog/tags.cpp
@@ -14,31 +14,31 @@
 #endif
 
 #include "tags.h"
+#include <glibmm/main.h>
 #include <gtkmm/icontheme.h>
 #include <gtkmm/imagemenuitem.h>
-#include <glibmm/main.h>
 
-#include "desktop.h"
 #include "desktop-style.h"
-#include "document.h"
+#include "desktop.h"
 #include "document-undo.h"
+#include "document.h"
 #include "helper/action.h"
 #include "inkscape.h"
 #include "layer-fns.h"
 #include "layer-manager.h"
 
 #include "svg/css-ostringstream.h"
-#include "ui/widget/layertypeicon.h"
+#include "ui/tools/tool-base.h" //"event-context.h"
 #include "ui/widget/addtoicon.h"
+#include "ui/widget/layertypeicon.h"
 #include "verbs.h"
 #include "xml/node-observer.h"
-#include "ui/tools/tool-base.h" //"event-context.h"
 //#include "dialogs/dialog-events.h"
-#include "ui/widget/color-notebook.h"
 #include "filter-chemistry.h"
+#include "ui/widget/color-notebook.h"
 
-#include "object/sp-item.h"
 #include "object/sp-defs.h"
+#include "object/sp-item.h"
 #include "object/sp-object-group.h"
 
 //#define DUMP_LAYERS 1
diff --git a/src/ui/dialog/template-load-tab.cpp b/src/ui/dialog/template-load-tab.cpp
index d39c03709..e528e2da8 100644
--- a/src/ui/dialog/template-load-tab.cpp
+++ b/src/ui/dialog/template-load-tab.cpp
@@ -11,18 +11,18 @@
 #include "template-widget.h"
 #include "new-from-template.h"
 
+#include <glibmm/fileutils.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/stringutils.h>
-#include <glibmm/fileutils.h>
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/scrolledwindow.h>
 #include <iostream>
 
 #include "extension/db.h"
-#include "inkscape.h"
-#include "ui/interface.h"
 #include "file.h"
+#include "inkscape.h"
 #include "path-prefix.h"
+#include "ui/interface.h"
 
 using namespace Inkscape::IO::Resource;
 
diff --git a/src/ui/dialog/template-widget.cpp b/src/ui/dialog/template-widget.cpp
index 12c6b0298..746cc473c 100644
--- a/src/ui/dialog/template-widget.cpp
+++ b/src/ui/dialog/template-widget.cpp
@@ -14,8 +14,8 @@
 #include <gtkmm/messagedialog.h>
 
 #include "desktop.h"
-#include "document.h"
 #include "document-undo.h"
+#include "document.h"
 #include "file.h"
 #include "inkscape.h"
 
diff --git a/src/ui/dialog/tracedialog.cpp b/src/ui/dialog/tracedialog.cpp
index a1d4d88b8..f142cbcc3 100644
--- a/src/ui/dialog/tracedialog.cpp
+++ b/src/ui/dialog/tracedialog.cpp
@@ -16,20 +16,20 @@
 #endif
 
 #include "tracedialog.h"
-#include <gtkmm/notebook.h>
+#include "ui/widget/frame.h"
+#include "ui/widget/spinbutton.h"
 #include <gtkmm/frame.h>
+#include <gtkmm/notebook.h>
 #include <gtkmm/radiobutton.h>
-#include "ui/widget/spinbutton.h"
-#include "ui/widget/frame.h"
 
 #include <glibmm/i18n.h>
 
-#include "desktop.h"
 #include "desktop-tracker.h"
+#include "desktop.h"
 #include "selection.h"
 
-#include "trace/potrace/inkscape-potrace.h"
 #include "inkscape.h"
+#include "trace/potrace/inkscape-potrace.h"
 
 
 namespace Inkscape {
diff --git a/src/ui/dialog/undo-history.cpp b/src/ui/dialog/undo-history.cpp
index 2486e8897..35522552b 100644
--- a/src/ui/dialog/undo-history.cpp
+++ b/src/ui/dialog/undo-history.cpp
@@ -17,8 +17,8 @@
 
 #include "undo-history.h"
 
-#include "document.h"
 #include "document-undo.h"
+#include "document.h"
 #include "inkscape.h"
 
 #include "util/signal-blocker.h"
diff --git a/src/ui/draw-anchor.cpp b/src/ui/draw-anchor.cpp
index c3bc5676d..a0710040d 100644
--- a/src/ui/draw-anchor.cpp
+++ b/src/ui/draw-anchor.cpp
@@ -15,11 +15,11 @@
 
 #include "ui/draw-anchor.h"
 #include "desktop.h"
-#include "ui/tools/tool-base.h"
-#include "ui/tools/lpe-tool.h"
-#include "display/sodipodi-ctrl.h"
 #include "display/curve.h"
+#include "display/sodipodi-ctrl.h"
 #include "ui/control-manager.h"
+#include "ui/tools/lpe-tool.h"
+#include "ui/tools/tool-base.h"
 
 using Inkscape::ControlManager;
 
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index 4ae0f4a6d..6d0700fed 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -23,10 +23,10 @@
 #include <config.h>
 #endif
 
+#include <glibmm/miscutils.h>
 #include <gtkmm/icontheme.h>
 #include <gtkmm/radiomenuitem.h>
 #include <gtkmm/separatormenuitem.h>
-#include <glibmm/miscutils.h>
 
 #include "desktop-style.h"
 #include "desktop.h"
diff --git a/src/ui/previewholder.cpp b/src/ui/previewholder.cpp
index dfe75c0b7..0537586ff 100644
--- a/src/ui/previewholder.cpp
+++ b/src/ui/previewholder.cpp
@@ -13,11 +13,11 @@
 #include "previewable.h"
 #include "previewholder.h"
 
-#include <gtkmm/scrolledwindow.h>
-#include <gtkmm/sizegroup.h>
-#include <gtkmm/scrollbar.h>
 #include <gtkmm/adjustment.h>
 #include <gtkmm/grid.h>
+#include <gtkmm/scrollbar.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/sizegroup.h>
 
 #define COLUMNS_FOR_SMALL 16
 #define COLUMNS_FOR_LARGE 8
diff --git a/src/ui/selected-color.cpp b/src/ui/selected-color.cpp
index 08f4bd979..ba5fd565c 100644
--- a/src/ui/selected-color.cpp
+++ b/src/ui/selected-color.cpp
@@ -14,8 +14,8 @@
 #include <config.h>
 #endif
 
-#include <glibmm/ustring.h>
 #include <cmath>
+#include <glibmm/ustring.h>
 
 #include "svg/svg-icc-color.h"
 #include "ui/selected-color.h"
diff --git a/src/ui/shape-editor-knotholders.cpp b/src/ui/shape-editor-knotholders.cpp
index 1027dea7f..c648109ee 100644
--- a/src/ui/shape-editor-knotholders.cpp
+++ b/src/ui/shape-editor-knotholders.cpp
@@ -17,10 +17,10 @@
 
 #include <glibmm/i18n.h>
 
-#include "preferences.h"
 #include "desktop.h"
-#include "knotholder.h"
 #include "knot-holder-entity.h"
+#include "knotholder.h"
+#include "preferences.h"
 
 #include "live_effects/effect.h"
 
diff --git a/src/ui/shape-editor.cpp b/src/ui/shape-editor.cpp
index b40bec86f..d0823a69f 100644
--- a/src/ui/shape-editor.cpp
+++ b/src/ui/shape-editor.cpp
@@ -11,13 +11,13 @@
 #include <config.h>
 #endif
 
-#include <string.h>
 #include <glibmm/i18n.h>
+#include <string.h>
 
 #include "desktop.h"
 #include "document.h"
-#include "knotholder.h"
 #include "inkscape.h"
+#include "knotholder.h"
 
 #include "object/sp-path.h"
 
diff --git a/src/ui/tool/control-point-selection.cpp b/src/ui/tool/control-point-selection.cpp
index a5611addc..fade7cf55 100644
--- a/src/ui/tool/control-point-selection.cpp
+++ b/src/ui/tool/control-point-selection.cpp
@@ -9,14 +9,14 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <boost/none.hpp>
-#include "ui/tool/selectable-control-point.h"
-#include <2geom/transforms.h>
 #include "desktop.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/event-utils.h"
-#include "ui/tool/transform-handle-set.h"
 #include "ui/tool/node.h"
+#include "ui/tool/selectable-control-point.h"
+#include "ui/tool/transform-handle-set.h"
+#include <2geom/transforms.h>
+#include <boost/none.hpp>
 
 
 
diff --git a/src/ui/tool/control-point.cpp b/src/ui/tool/control-point.cpp
index 005e60c62..aa897f1be 100644
--- a/src/ui/tool/control-point.cpp
+++ b/src/ui/tool/control-point.cpp
@@ -16,16 +16,16 @@
 #include "desktop.h"
 #include "message-context.h"
 
-#include "display/sp-canvas.h"
 #include "display/snap-indicator.h"
+#include "display/sp-canvas.h"
 
 #include "object/sp-namedview.h"
 
-#include "ui/tools/tool-base.h"
 #include "ui/control-manager.h"
 #include "ui/tool/control-point.h"
 #include "ui/tool/event-utils.h"
 #include "ui/tool/transform-handle-set.h"
+#include "ui/tools/tool-base.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tool/curve-drag-point.cpp b/src/ui/tool/curve-drag-point.cpp
index 685823aaa..78fdc8aba 100644
--- a/src/ui/tool/curve-drag-point.cpp
+++ b/src/ui/tool/curve-drag-point.cpp
@@ -7,12 +7,12 @@
  */
 
 #include "ui/tool/curve-drag-point.h"
-#include <glib/gi18n.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 <glib/gi18n.h>
 
 #include "object/sp-namedview.h"
 #include "object/sp-path.h"
diff --git a/src/ui/tool/event-utils.cpp b/src/ui/tool/event-utils.cpp
index 6b8d5f0dc..de2feb9e5 100644
--- a/src/ui/tool/event-utils.cpp
+++ b/src/ui/tool/event-utils.cpp
@@ -8,11 +8,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "display/sp-canvas.h"
+#include "ui/tool/event-utils.h"
 #include <cstring>
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
-#include "display/sp-canvas.h"
-#include "ui/tool/event-utils.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tool/modifier-tracker.cpp b/src/ui/tool/modifier-tracker.cpp
index f502acab2..196626006 100644
--- a/src/ui/tool/modifier-tracker.cpp
+++ b/src/ui/tool/modifier-tracker.cpp
@@ -8,10 +8,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gdk/gdk.h>
-#include <gdk/gdkkeysyms.h>
 #include "ui/tool/event-utils.h"
 #include "ui/tool/modifier-tracker.h"
+#include <gdk/gdk.h>
+#include <gdk/gdkkeysyms.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tool/multi-path-manipulator.cpp b/src/ui/tool/multi-path-manipulator.cpp
index b982a622f..7bb0d58da 100644
--- a/src/ui/tool/multi-path-manipulator.cpp
+++ b/src/ui/tool/multi-path-manipulator.cpp
@@ -14,8 +14,8 @@
 #include <glibmm/i18n.h>
 
 #include "desktop.h"
-#include "document.h"
 #include "document-undo.h"
+#include "document.h"
 #include "message-stack.h"
 #include "node.h"
 #include "verbs.h"
diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
index 94a80a882..ad7c07921 100644
--- a/src/ui/tool/node.cpp
+++ b/src/ui/tool/node.cpp
@@ -6,12 +6,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <boost/utility.hpp>
 #include <iostream>
 #include <stdexcept>
-#include <boost/utility.hpp>
 
-#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
+#include <glib/gi18n.h>
 
 #include <2geom/bezier-utils.h>
 
@@ -19,16 +19,16 @@
 #include "multi-path-manipulator.h"
 #include "snap.h"
 
-#include "display/sp-ctrlline.h"
-#include "display/sp-canvas.h"
 #include "display/sp-canvas-util.h"
+#include "display/sp-canvas.h"
+#include "display/sp-ctrlline.h"
 
 #include "ui/control-manager.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/event-utils.h"
 #include "ui/tool/path-manipulator.h"
-#include "ui/tools/node-tool.h"
 #include "ui/tools-switch.h"
+#include "ui/tools/node-tool.h"
 
 namespace {
 
diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp
index 192a02fe2..4b253d327 100644
--- a/src/ui/tool/path-manipulator.cpp
+++ b/src/ui/tool/path-manipulator.cpp
@@ -13,17 +13,17 @@
 #include <2geom/bezier-utils.h>
 #include <2geom/path-sink.h>
 
-#include "display/sp-canvas.h"
-#include "display/sp-canvas-util.h"
-#include "display/curve.h"
 #include "display/canvas-bpath.h"
+#include "display/curve.h"
+#include "display/sp-canvas-util.h"
+#include "display/sp-canvas.h"
 
 #include "helper/geom.h"
 
-#include "live_effects/lpeobject.h"
-#include "live_effects/lpeobject-reference.h"
-#include "live_effects/lpe-powerstroke.h"
 #include "live_effects/lpe-bspline.h"
+#include "live_effects/lpe-powerstroke.h"
+#include "live_effects/lpeobject-reference.h"
+#include "live_effects/lpeobject.h"
 #include "live_effects/parameter/path.h"
 
 #include "object/sp-path.h"
diff --git a/src/ui/tool/selector.cpp b/src/ui/tool/selector.cpp
index 84e96173d..cf14d8c6c 100644
--- a/src/ui/tool/selector.cpp
+++ b/src/ui/tool/selector.cpp
@@ -13,9 +13,9 @@
 #include "desktop.h"
 
 #include "display/sodipodi-ctrlrect.h"
-#include "ui/tools/tool-base.h"
 #include "ui/tool/event-utils.h"
 #include "ui/tool/selector.h"
+#include "ui/tools/tool-base.h"
 
 #include <gdk/gdkkeysyms.h>
 
diff --git a/src/ui/tool/transform-handle-set.cpp b/src/ui/tool/transform-handle-set.cpp
index 23cd6b79d..16258a16a 100644
--- a/src/ui/tool/transform-handle-set.cpp
+++ b/src/ui/tool/transform-handle-set.cpp
@@ -9,8 +9,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <math.h>
 #include <algorithm>
+#include <math.h>
 
 #include <glib/gi18n.h>
 
diff --git a/src/ui/tools-switch.cpp b/src/ui/tools-switch.cpp
index 5953887ce..0194134ba 100644
--- a/src/ui/tools-switch.cpp
+++ b/src/ui/tools-switch.cpp
@@ -13,20 +13,20 @@
 
 #include <gtkmm.h> // prevents deprecation warnings
 
-#include "inkscape.h"
 #include "desktop.h"
+#include "inkscape.h"
 
 #include <glibmm/i18n.h>
 
 #include "ui/tools-switch.h"
 
-#include "object/sp-rect.h"
 #include "object/sp-ellipse.h"
 #include "object/sp-flowtext.h"
 #include "object/sp-offset.h"
 #include "object/sp-path.h"
-#include "object/sp-star.h"
+#include "object/sp-rect.h"
 #include "object/sp-spiral.h"
+#include "object/sp-star.h"
 #include "object/sp-text.h"
 
 // TODO: How many of these are actually needed?
diff --git a/src/ui/tools/arc-tool.cpp b/src/ui/tools/arc-tool.cpp
index 34b29f3bb..d88e2982f 100644
--- a/src/ui/tools/arc-tool.cpp
+++ b/src/ui/tools/arc-tool.cpp
@@ -19,8 +19,8 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <glibmm/i18n.h>
 #include <gdk/gdkkeysyms.h>
+#include <glibmm/i18n.h>
 
 #include "context-fns.h"
 #include "desktop-style.h"
@@ -34,20 +34,20 @@
 #include "snap.h"
 #include "verbs.h"
 
-#include "display/sp-canvas.h"
 #include "display/sp-canvas-item.h"
+#include "display/sp-canvas.h"
 
 #include "object/sp-ellipse.h"
 #include "object/sp-namedview.h"
 
 #include "pixmaps/cursor-ellipse.xpm"
 
-#include "ui/tools/arc-tool.h"
 #include "ui/shape-editor.h"
+#include "ui/tools/arc-tool.h"
 #include "ui/tools/tool-base.h"
 
-#include "xml/repr.h"
 #include "xml/node-event-vector.h"
+#include "xml/repr.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/ui/tools/calligraphic-tool.cpp b/src/ui/tools/calligraphic-tool.cpp
index c080571d0..3d8784c01 100644
--- a/src/ui/tools/calligraphic-tool.cpp
+++ b/src/ui/tools/calligraphic-tool.cpp
@@ -23,16 +23,16 @@
 
 #define noDYNA_DRAW_VERBOSE
 
-#include <gtk/gtk.h>
+#include <cstring>
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
-#include <string>
-#include <cstring>
+#include <gtk/gtk.h>
 #include <numeric>
+#include <string>
 
-#include <2geom/pathvector.h>
 #include <2geom/bezier-utils.h>
 #include <2geom/circle.h>
+#include <2geom/pathvector.h>
 
 #include "context-fns.h"
 #include "desktop-events.h"
diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp
index c1175f592..6ae39431d 100644
--- a/src/ui/tools/connector-tool.cpp
+++ b/src/ui/tools/connector-tool.cpp
@@ -66,12 +66,12 @@
  *
  */
 
-#include <string>
 #include <cstring>
+#include <string>
 
+#include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
 #include <glibmm/stringutils.h>
-#include <gdk/gdkkeysyms.h>
 
 #include "context-fns.h"
 #include "desktop-style.h"
diff --git a/src/ui/tools/dropper-tool.cpp b/src/ui/tools/dropper-tool.cpp
index 07fc4b719..d66af2c65 100644
--- a/src/ui/tools/dropper-tool.cpp
+++ b/src/ui/tools/dropper-tool.cpp
@@ -15,12 +15,12 @@
 #include <config.h>
 #endif
 
-#include <glibmm/i18n.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
+#include <glibmm/i18n.h>
 
-#include <2geom/transforms.h>
 #include <2geom/circle.h>
+#include <2geom/transforms.h>
 
 #include "color-rgba.h"
 #include "desktop-style.h"
@@ -33,10 +33,10 @@
 #include "sp-cursor.h"
 #include "verbs.h"
 
-#include "display/canvas-bpath.h"
+#include "display/cairo-utils.h"
 #include "display/canvas-arena.h"
+#include "display/canvas-bpath.h"
 #include "display/curve.h"
-#include "display/cairo-utils.h"
 
 #include "object/sp-namedview.h"
 
diff --git a/src/ui/tools/dynamic-base.cpp b/src/ui/tools/dynamic-base.cpp
index 1026c26c6..fa913e37b 100644
--- a/src/ui/tools/dynamic-base.cpp
+++ b/src/ui/tools/dynamic-base.cpp
@@ -1,10 +1,10 @@
 
 #include "ui/tools/dynamic-base.h"
 
-#include "message-context.h"
-#include "display/sp-canvas-item.h"
 #include "desktop.h"
 #include "display/curve.h"
+#include "display/sp-canvas-item.h"
+#include "message-context.h"
 
 #define MIN_PRESSURE      0.0
 #define MAX_PRESSURE      1.0
diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp
index 6d1c24f07..4920de584 100644
--- a/src/ui/tools/eraser-tool.cpp
+++ b/src/ui/tools/eraser-tool.cpp
@@ -24,13 +24,13 @@
 
 #define noERASER_VERBOSE
 
-#include <string>
 #include <cstring>
 #include <numeric>
+#include <string>
 
-#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
+#include <gtk/gtk.h>
 
 #include <2geom/bezier-utils.h>
 #include <2geom/pathvector.h>
@@ -52,10 +52,10 @@
 #include "splivarot.h"
 #include "verbs.h"
 
-#include "display/sp-canvas.h"
 #include "display/canvas-arena.h"
 #include "display/canvas-bpath.h"
 #include "display/curve.h"
+#include "display/sp-canvas.h"
 
 #include "object/sp-clippath.h"
 #include "object/sp-item-group.h"
diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index a9b3ff8f5..8a22dfe94 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -30,8 +30,8 @@
 
 #include "live_effects/lpe-bendpath.h"
 #include "live_effects/lpe-patternalongpath.h"
-#include "live_effects/lpe-simplify.h"
 #include "live_effects/lpe-powerstroke.h"
+#include "live_effects/lpe-simplify.h"
 
 #include "svg/svg.h"
 
diff --git a/src/ui/tools/gradient-tool.cpp b/src/ui/tools/gradient-tool.cpp
index b0c2a0185..1e2347769 100644
--- a/src/ui/tools/gradient-tool.cpp
+++ b/src/ui/tools/gradient-tool.cpp
@@ -16,8 +16,8 @@
 #include <config.h>
 #endif
 
-#include <glibmm/i18n.h>
 #include <gdk/gdkkeysyms.h>
+#include <glibmm/i18n.h>
 
 #include "desktop.h"
 #include "document-undo.h"
diff --git a/src/ui/tools/lpe-tool.cpp b/src/ui/tools/lpe-tool.cpp
index f62a70c34..d52a19121 100644
--- a/src/ui/tools/lpe-tool.cpp
+++ b/src/ui/tools/lpe-tool.cpp
@@ -29,9 +29,9 @@
 #include "message-stack.h"
 #include "selection.h"
 
-#include "display/curve.h"
 #include "display/canvas-bpath.h"
 #include "display/canvas-text.h"
+#include "display/curve.h"
 
 #include "object/sp-path.h"
 
@@ -39,8 +39,8 @@
 
 #include "util/units.h"
 
-#include "ui/tools/lpe-tool.h"
 #include "ui/shape-editor.h"
+#include "ui/tools/lpe-tool.h"
 
 using Inkscape::Util::unit_table;
 using Inkscape::UI::Tools::PenTool;
diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index c2bc23d8b..e2e55a580 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -14,8 +14,8 @@
 #include <config.h>
 #endif
 
-#include <gtkmm.h>
 #include <glibmm/i18n.h>
+#include <gtkmm.h>
 
 #include <boost/none_t.hpp>
 
diff --git a/src/ui/tools/mesh-tool.cpp b/src/ui/tools/mesh-tool.cpp
index e94da4813..5cf7316a7 100644
--- a/src/ui/tools/mesh-tool.cpp
+++ b/src/ui/tools/mesh-tool.cpp
@@ -29,8 +29,8 @@
 #include "desktop.h"
 #include "document-undo.h"
 #include "document.h"
-#include "gradient-drag.h"
 #include "gradient-chemistry.h"
+#include "gradient-drag.h"
 #include "macros.h"
 #include "message-context.h"
 #include "message-stack.h"
@@ -39,8 +39,8 @@
 #include "snap.h"
 #include "verbs.h"
 
-#include "display/sp-ctrlcurve.h"
 #include "display/curve.h"
+#include "display/sp-ctrlcurve.h"
 
 #include "object/sp-defs.h"
 #include "object/sp-mesh-gradient.h"
@@ -48,8 +48,8 @@
 #include "object/sp-text.h"
 #include "style.h"
 
-#include "pixmaps/cursor-gradient.xpm"
 #include "pixmaps/cursor-gradient-add.xpm"
+#include "pixmaps/cursor-gradient.xpm"
 
 #include "ui/control-manager.h"
 #include "ui/tools/mesh-tool.h"
diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp
index d54adba89..301566f6e 100644
--- a/src/ui/tools/node-tool.cpp
+++ b/src/ui/tools/node-tool.cpp
@@ -10,8 +10,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
+#include <glib/gi18n.h>
 
 
 
diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 7dd120077..6f98919ef 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -50,8 +50,8 @@
 #include "ui/tools/pen-tool.h"
 
 // we include the necessary files for BSpline & Spiro
-#include "live_effects/lpeobject.h"
 #include "live_effects/lpeobject-reference.h"
+#include "live_effects/lpeobject.h"
 #include "live_effects/parameter/path.h"
 
 #define INKSCAPE_LPE_SPIRO_C
diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp
index 590ef3634..ff84ee138 100644
--- a/src/ui/tools/pencil-tool.cpp
+++ b/src/ui/tools/pencil-tool.cpp
@@ -19,8 +19,8 @@
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
 
-#include <2geom/sbasis-to-bezier.h>
 #include <2geom/bezier-utils.h>
+#include <2geom/sbasis-to-bezier.h>
 
 #include "ui/tools/pencil-tool.h"
 
@@ -40,8 +40,8 @@
 #include "display/curve.h"
 #include "display/sp-canvas.h"
 
-#include "live_effects/lpe-powerstroke.h"
 #include "live_effects/lpe-powerstroke-interpolators.h"
+#include "live_effects/lpe-powerstroke.h"
 
 #include "object/sp-path.h"
 #include "style.h"
diff --git a/src/ui/tools/rect-tool.cpp b/src/ui/tools/rect-tool.cpp
index 7442c6eca..c4d942435 100644
--- a/src/ui/tools/rect-tool.cpp
+++ b/src/ui/tools/rect-tool.cpp
@@ -34,8 +34,8 @@
 #include "display/sp-canvas-item.h"
 #include "display/sp-canvas.h"
 
-#include "object/sp-rect.h"
 #include "object/sp-namedview.h"
+#include "object/sp-rect.h"
 
 #include "pixmaps/cursor-rect.xpm"
 
diff --git a/src/ui/tools/select-tool.cpp b/src/ui/tools/select-tool.cpp
index ddc6e2881..a70620be8 100644
--- a/src/ui/tools/select-tool.cpp
+++ b/src/ui/tools/select-tool.cpp
@@ -37,8 +37,8 @@
 #include "sp-cursor.h"
 
 #include "display/drawing-item.h"
-#include "display/sp-canvas.h"
 #include "display/sp-canvas-item.h"
+#include "display/sp-canvas.h"
 
 #include "object/box3d.h"
 #include "style.h"
diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 603d5e80a..8f5800f72 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -57,11 +57,11 @@
 
 #include "pixmaps/cursor-spray.xpm"
 
-#include "svg/svg.h"
 #include "svg/svg-color.h"
+#include "svg/svg.h"
 
-#include "ui/tools/spray-tool.h"
 #include "ui/dialog/dialog-manager.h"
+#include "ui/tools/spray-tool.h"
 
 
 using Inkscape::DocumentUndo;
diff --git a/src/ui/tools/star-tool.cpp b/src/ui/tools/star-tool.cpp
index 3a5615c3b..46412a6ab 100644
--- a/src/ui/tools/star-tool.cpp
+++ b/src/ui/tools/star-tool.cpp
@@ -34,8 +34,8 @@
 #include "selection.h"
 #include "verbs.h"
 
-#include "display/sp-canvas.h"
 #include "display/sp-canvas-item.h"
+#include "display/sp-canvas.h"
 
 #include "object/sp-namedview.h"
 #include "object/sp-star.h"
diff --git a/src/ui/tools/text-tool.cpp b/src/ui/tools/text-tool.cpp
index 8db6c323c..41c2f4061 100644
--- a/src/ui/tools/text-tool.cpp
+++ b/src/ui/tools/text-tool.cpp
@@ -18,11 +18,11 @@
 #endif
 
 #include <gdk/gdkkeysyms.h>
-#include <gtkmm/clipboard.h>
 #include <glibmm/i18n.h>
+#include <gtkmm/clipboard.h>
 
-#include <display/sp-ctrlline.h>
 #include <display/sodipodi-ctrlrect.h>
+#include <display/sp-ctrlline.h>
 #include <display/sp-ctrlquadr.h>
 
 #include "context-fns.h"
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index 9f9a155c2..c643f16e1 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -21,8 +21,8 @@
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
 
-#include "shortcuts.h"
 #include "file.h"
+#include "shortcuts.h"
 
 
 
@@ -38,24 +38,24 @@
 #include "selection.h"
 #include "sp-cursor.h"
 
-#include "display/sp-canvas.h"
-#include "display/sp-canvas-group.h"
 #include "display/canvas-rotate.h"
+#include "display/sp-canvas-group.h"
+#include "display/sp-canvas.h"
 
 #include "object/sp-guide.h"
 
 #include "ui/contextmenu.h"
-#include "ui/interface.h"
 #include "ui/event-debug.h"
-#include "ui/tool/control-point.h"
+#include "ui/interface.h"
 #include "ui/shape-editor.h"
-#include "ui/tools/tool-base.h"
-#include "ui/tools-switch.h"
-#include "ui/tools/lpe-tool.h"
 #include "ui/tool/commit-events.h"
+#include "ui/tool/control-point.h"
 #include "ui/tool/event-utils.h"
-#include "ui/tools/node-tool.h"
 #include "ui/tool/shape-record.h"
+#include "ui/tools-switch.h"
+#include "ui/tools/lpe-tool.h"
+#include "ui/tools/node-tool.h"
+#include "ui/tools/tool-base.h"
 
 #include "widgets/desktop-widget.h"
 
diff --git a/src/ui/tools/tweak-tool.cpp b/src/ui/tools/tweak-tool.cpp
index 6698316c7..e8bc87ecc 100644
--- a/src/ui/tools/tweak-tool.cpp
+++ b/src/ui/tools/tweak-tool.cpp
@@ -13,9 +13,9 @@
 
 #include <numeric>
 
-#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
+#include <gtk/gtk.h>
 
 #include <2geom/circle.h>
 
diff --git a/src/ui/tools/zoom-tool.cpp b/src/ui/tools/zoom-tool.cpp
index 6f7fca242..3ebb987c4 100644
--- a/src/ui/tools/zoom-tool.cpp
+++ b/src/ui/tools/zoom-tool.cpp
@@ -15,12 +15,12 @@
 #include <gdk/gdkkeysyms.h>
 
 #include "macros.h"
-#include "rubberband.h"
+#include "desktop.h"
 #include "display/sp-canvas-item.h"
 #include "display/sp-canvas-util.h"
-#include "desktop.h"
-#include "pixmaps/cursor-zoom.xpm"
 #include "pixmaps/cursor-zoom-out.xpm"
+#include "pixmaps/cursor-zoom.xpm"
+#include "rubberband.h"
 #include "selection-chemistry.h"
 
 #include "ui/tools/zoom-tool.h"
diff --git a/src/ui/uxmanager.cpp b/src/ui/uxmanager.cpp
index 3ec38edf9..d81e1afc4 100644
--- a/src/ui/uxmanager.cpp
+++ b/src/ui/uxmanager.cpp
@@ -15,10 +15,10 @@
 
 #include "widgets/desktop-widget.h"
 
-#include "uxmanager.h"
 #include "desktop.h"
 #include "ui/monitor.h"
 #include "util/ege-tags.h"
+#include "uxmanager.h"
 #include "widgets/toolbox.h"
 
 
diff --git a/src/ui/view/view.cpp b/src/ui/view/view.cpp
index 47e2a1e0d..5322c93d7 100644
--- a/src/ui/view/view.cpp
+++ b/src/ui/view/view.cpp
@@ -14,13 +14,13 @@
 # include "config.h"
 #endif
 
-#include <2geom/point.h>
 #include "document.h"
-#include "view.h"
-#include "message-stack.h"
+#include "inkscape.h"
 #include "message-context.h"
+#include "message-stack.h"
 #include "verbs.h"
-#include "inkscape.h"
+#include "view.h"
+#include <2geom/point.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/addtoicon.cpp b/src/ui/widget/addtoicon.cpp
index e5119fc60..a8a5b0d9e 100644
--- a/src/ui/widget/addtoicon.cpp
+++ b/src/ui/widget/addtoicon.cpp
@@ -16,9 +16,9 @@
 
 #include <gtkmm/icontheme.h>
 
-#include "widgets/toolbox.h"
-#include "ui/icon-names.h"
 #include "layertypeicon.h"
+#include "ui/icon-names.h"
+#include "widgets/toolbox.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/clipmaskicon.cpp b/src/ui/widget/clipmaskicon.cpp
index eceff13ca..bd6375f80 100644
--- a/src/ui/widget/clipmaskicon.cpp
+++ b/src/ui/widget/clipmaskicon.cpp
@@ -15,9 +15,9 @@
 
 #include <gtkmm/icontheme.h>
 
-#include "widgets/toolbox.h"
-#include "ui/icon-names.h"
 #include "layertypeicon.h"
+#include "ui/icon-names.h"
+#include "widgets/toolbox.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp
index 32f99747a..a37559323 100644
--- a/src/ui/widget/color-icc-selector.cpp
+++ b/src/ui/widget/color-icc-selector.cpp
@@ -4,8 +4,8 @@
 
 #include <set>
 
-#include <gtkmm/adjustment.h>
 #include <glibmm/i18n.h>
+#include <gtkmm/adjustment.h>
 
 #include "colorspace.h"
 #include "document.h"
@@ -23,9 +23,9 @@
 #define noDEBUG_LCMS
 
 #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
-#include "object/color-profile.h"
 #include "cms-system.h"
 #include "color-profile-cms-fns.h"
+#include "object/color-profile.h"
 
 #ifdef DEBUG_LCMS
 #include "preferences.h"
diff --git a/src/ui/widget/color-picker.cpp b/src/ui/widget/color-picker.cpp
index 5c6820e83..4b74759f9 100644
--- a/src/ui/widget/color-picker.cpp
+++ b/src/ui/widget/color-picker.cpp
@@ -11,10 +11,10 @@
  */
 
 #include "color-picker.h"
-#include "inkscape.h"
 #include "desktop.h"
-#include "document.h"
 #include "document-undo.h"
+#include "document.h"
+#include "inkscape.h"
 #include "ui/dialog-events.h"
 
 #include "ui/widget/color-notebook.h"
diff --git a/src/ui/widget/color-scales.cpp b/src/ui/widget/color-scales.cpp
index cb6349c4b..6d8621027 100644
--- a/src/ui/widget/color-scales.cpp
+++ b/src/ui/widget/color-scales.cpp
@@ -6,8 +6,8 @@
 #include <config.h>
 #endif
 
-#include <gtkmm/adjustment.h>
 #include <glibmm/i18n.h>
+#include <gtkmm/adjustment.h>
 
 #include "ui/dialog-events.h"
 #include "ui/widget/color-scales.h"
diff --git a/src/ui/widget/color-slider.cpp b/src/ui/widget/color-slider.cpp
index ed034598e..3af52e469 100644
--- a/src/ui/widget/color-slider.cpp
+++ b/src/ui/widget/color-slider.cpp
@@ -20,9 +20,9 @@
 #include <gtkmm/adjustment.h>
 #include <gtkmm/stylecontext.h>
 
+#include "preferences.h"
 #include "ui/widget/color-scales.h"
 #include "ui/widget/color-slider.h"
-#include "preferences.h"
 
 static const gint SLIDER_WIDTH = 96;
 static const gint SLIDER_HEIGHT = 8;
diff --git a/src/ui/widget/color-wheel-selector.cpp b/src/ui/widget/color-wheel-selector.cpp
index ffdf173ba..c8f1f8e30 100644
--- a/src/ui/widget/color-wheel-selector.cpp
+++ b/src/ui/widget/color-wheel-selector.cpp
@@ -4,14 +4,14 @@
 
 #include "color-wheel-selector.h"
 
-#include <glibmm/i18n.h>
-#include <gtkmm/adjustment.h>
-#include <gtkmm/label.h>
-#include <gtkmm/spinbutton.h>
 #include "ui/dialog-events.h"
 #include "ui/widget/color-scales.h"
 #include "ui/widget/color-slider.h"
 #include "widgets/gimp/gimpcolorwheel.h"
+#include <glibmm/i18n.h>
+#include <gtkmm/adjustment.h>
+#include <gtkmm/label.h>
+#include <gtkmm/spinbutton.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/dock-item.cpp b/src/ui/widget/dock-item.cpp
index 29f22977a..85671e3d9 100644
--- a/src/ui/widget/dock-item.cpp
+++ b/src/ui/widget/dock-item.cpp
@@ -13,8 +13,8 @@
 #include "inkscape.h"
 #include "ui/icon-names.h"
 
-#include <gtkmm/icontheme.h>
 #include <glibmm/exceptionhandler.h>
+#include <gtkmm/icontheme.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/dock.cpp b/src/ui/widget/dock.cpp
index 9c1f0f783..f72c05836 100644
--- a/src/ui/widget/dock.cpp
+++ b/src/ui/widget/dock.cpp
@@ -11,9 +11,9 @@
  */
 
 #include "dock.h"
+#include "desktop.h"
 #include "inkscape.h"
 #include "preferences.h"
-#include "desktop.h"
 
 #include <gtkmm/adjustment.h>
 #include <gtkmm/paned.h>
diff --git a/src/ui/widget/entity-entry.cpp b/src/ui/widget/entity-entry.cpp
index 67412b1e0..f15f55911 100644
--- a/src/ui/widget/entity-entry.cpp
+++ b/src/ui/widget/entity-entry.cpp
@@ -19,8 +19,8 @@
 
 #include "entity-entry.h"
 
-#include <gtkmm/scrolledwindow.h>
 #include <gtkmm/entry.h>
+#include <gtkmm/scrolledwindow.h>
 
 #include "document-private.h"
 #include "document-undo.h"
diff --git a/src/ui/widget/font-selector-toolbar.cpp b/src/ui/widget/font-selector-toolbar.cpp
index c997e0920..fa6cf4c28 100644
--- a/src/ui/widget/font-selector-toolbar.cpp
+++ b/src/ui/widget/font-selector-toolbar.cpp
@@ -16,14 +16,14 @@
 
 #include "font-selector-toolbar.h"
 
-#include "libnrtype/font-lister.h"
 #include "libnrtype/font-instance.h"
+#include "libnrtype/font-lister.h"
 
 #include "ui/icon-names.h"
 
 // For updating from selection
-#include "inkscape.h"
 #include "desktop.h"
+#include "inkscape.h"
 #include "object/sp-text.h"
 
 // TEMP TEMP TEMP
diff --git a/src/ui/widget/font-selector.cpp b/src/ui/widget/font-selector.cpp
index 69777f528..13c2af2e9 100644
--- a/src/ui/widget/font-selector.cpp
+++ b/src/ui/widget/font-selector.cpp
@@ -15,12 +15,12 @@
 
 #include "font-selector.h"
 
-#include "libnrtype/font-lister.h"
 #include "libnrtype/font-instance.h"
+#include "libnrtype/font-lister.h"
 
 // For updating from selection
-#include "inkscape.h"
 #include "desktop.h"
+#include "inkscape.h"
 #include "object/sp-text.h"
 
 namespace Inkscape {
diff --git a/src/ui/widget/font-variants.cpp b/src/ui/widget/font-variants.cpp
index ac464e1d6..eab1dba0b 100644
--- a/src/ui/widget/font-variants.cpp
+++ b/src/ui/widget/font-variants.cpp
@@ -11,8 +11,8 @@
 #include <config.h>
 #endif
 
-#include <gtkmm.h>
 #include <glibmm/i18n.h>
+#include <gtkmm.h>
 
 #include <libnrtype/font-instance.h>
 
diff --git a/src/ui/widget/font-variations.cpp b/src/ui/widget/font-variations.cpp
index d0464e080..f339fe033 100644
--- a/src/ui/widget/font-variations.cpp
+++ b/src/ui/widget/font-variations.cpp
@@ -12,11 +12,11 @@
 #include <config.h>
 #endif
 
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 
-#include <gtkmm.h>
 #include <glibmm/i18n.h>
+#include <gtkmm.h>
 
 #include <libnrtype/font-instance.h>
 
diff --git a/src/ui/widget/imageicon.cpp b/src/ui/widget/imageicon.cpp
index 8e7df7a68..37223a868 100644
--- a/src/ui/widget/imageicon.cpp
+++ b/src/ui/widget/imageicon.cpp
@@ -12,11 +12,11 @@
  */
 
 #include "imageicon.h"
-#include "svg-view-widget.h"
 #include "document.h"
 #include "inkscape.h"
-#include <glibmm/fileutils.h>
+#include "svg-view-widget.h"
 #include <glibmm/convert.h>
+#include <glibmm/fileutils.h>
 
 namespace Inkscape
 {
diff --git a/src/ui/widget/imagetoggler.cpp b/src/ui/widget/imagetoggler.cpp
index 38c84ca51..b6844ffb3 100644
--- a/src/ui/widget/imagetoggler.cpp
+++ b/src/ui/widget/imagetoggler.cpp
@@ -13,8 +13,8 @@
 
 #include <gtkmm/icontheme.h>
 
-#include "widgets/toolbox.h"
 #include "ui/icon-names.h"
+#include "widgets/toolbox.h"
 
 #include <iostream>
 
diff --git a/src/ui/widget/ink-select-one-action.cpp b/src/ui/widget/ink-select-one-action.cpp
index 9ab4a7f45..9a2c302fb 100644
--- a/src/ui/widget/ink-select-one-action.cpp
+++ b/src/ui/widget/ink-select-one-action.cpp
@@ -19,16 +19,16 @@
 
 #include "ink-select-one-action.h"
 
-#include <iostream>
-#include <gtkmm/toolitem.h>
+#include <gtkmm/box.h>
+#include <gtkmm/combobox.h>
+#include <gtkmm/image.h>
+#include <gtkmm/label.h>
+#include <gtkmm/menu.h>
 #include <gtkmm/menuitem.h>
 #include <gtkmm/radioaction.h>
 #include <gtkmm/radiomenuitem.h>
-#include <gtkmm/combobox.h>
-#include <gtkmm/menu.h>
-#include <gtkmm/box.h>
-#include <gtkmm/label.h>
-#include <gtkmm/image.h>
+#include <gtkmm/toolitem.h>
+#include <iostream>
 
 InkSelectOneAction* InkSelectOneAction::create(const Glib::ustring &name,
                                                const Glib::ustring &group_label,
diff --git a/src/ui/widget/ink-spinscale.cpp b/src/ui/widget/ink-spinscale.cpp
index 87a2bd11c..d05c10a41 100644
--- a/src/ui/widget/ink-spinscale.cpp
+++ b/src/ui/widget/ink-spinscale.cpp
@@ -16,9 +16,9 @@
 */
 
 #include "ink-spinscale.h"
-#include <gdkmm/general.h>
 #include <gdkmm/cursor.h>
 #include <gdkmm/event.h>
+#include <gdkmm/general.h>
 
 #include <gtkmm/spinbutton.h>
 
diff --git a/src/ui/widget/insertordericon.cpp b/src/ui/widget/insertordericon.cpp
index 5d1f64a54..18dd13988 100644
--- a/src/ui/widget/insertordericon.cpp
+++ b/src/ui/widget/insertordericon.cpp
@@ -11,9 +11,9 @@
  
 #include <gtkmm/icontheme.h>
 
-#include "widgets/toolbox.h"
-#include "ui/icon-names.h"
 #include "layertypeicon.h"
+#include "ui/icon-names.h"
+#include "widgets/toolbox.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/layer-selector.cpp b/src/ui/widget/layer-selector.cpp
index e0a52a868..466d5e75e 100644
--- a/src/ui/widget/layer-selector.cpp
+++ b/src/ui/widget/layer-selector.cpp
@@ -18,14 +18,14 @@
 #include <string>
 
 #include "ui/dialog/layer-properties.h"
-#include <glibmm/i18n.h>
 #include <boost/range/adaptor/filtered.hpp>
 #include <boost/range/adaptor/reversed.hpp>
+#include <glibmm/i18n.h>
 
 #include "desktop.h"
 
-#include "document.h"
 #include "document-undo.h"
+#include "document.h"
 #include "layer-manager.h"
 #include "ui/icon-names.h"
 #include "ui/util.h"
diff --git a/src/ui/widget/layertypeicon.cpp b/src/ui/widget/layertypeicon.cpp
index 3a8ffab44..2e33f2453 100644
--- a/src/ui/widget/layertypeicon.cpp
+++ b/src/ui/widget/layertypeicon.cpp
@@ -15,8 +15,8 @@
 
 #include <gtkmm/icontheme.h>
 
-#include "widgets/toolbox.h"
 #include "ui/icon-names.h"
+#include "widgets/toolbox.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/licensor.cpp b/src/ui/widget/licensor.cpp
index 1e9ee361d..58fe644b0 100644
--- a/src/ui/widget/licensor.cpp
+++ b/src/ui/widget/licensor.cpp
@@ -21,12 +21,12 @@
 #include <gtkmm/entry.h>
 #include <gtkmm/radiobutton.h>
 
+#include "document-private.h"
+#include "document-undo.h"
+#include "inkscape.h"
+#include "rdf.h"
 #include "ui/widget/entity-entry.h"
 #include "ui/widget/registry.h"
-#include "rdf.h"
-#include "inkscape.h"
-#include "document-undo.h"
-#include "document-private.h"
 #include "verbs.h"
 
 
diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp
index 3677233bc..70086a5f0 100644
--- a/src/ui/widget/object-composite-settings.cpp
+++ b/src/ui/widget/object-composite-settings.cpp
@@ -17,15 +17,15 @@
 #include "desktop.h"
 
 #include "desktop-style.h"
-#include "document.h"
+#include "display/sp-canvas.h"
 #include "document-undo.h"
+#include "document.h"
 #include "filter-chemistry.h"
 #include "inkscape.h"
 #include "style.h"
 #include "svg/css-ostringstream.h"
-#include "verbs.h"
-#include "display/sp-canvas.h"
 #include "ui/widget/style-subject.h"
+#include "verbs.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index 805333f8e..fa83f7e65 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -22,11 +22,11 @@
 #endif
 
 #include "page-sizer.h"
-#include <glibmm/i18n.h>
-#include "verbs.h"
 #include "helper/action.h"
 #include "object/sp-root.h"
 #include "ui/widget/button.h"
+#include "verbs.h"
+#include <glibmm/i18n.h>
 
 using std::pair;
 using Inkscape::Util::unit_table;
diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index 281e6e21a..0c4aafd63 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -19,8 +19,8 @@
 
 #include <glibmm/i18n.h>
 
-#include "panel.h"
 #include "desktop.h"
+#include "panel.h"
 
 #include "inkscape.h"
 #include "widgets/eek-preview.h"
diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp
index 078aba9cf..d72f5b9d1 100644
--- a/src/ui/widget/preferences-widget.cpp
+++ b/src/ui/widget/preferences-widget.cpp
@@ -14,8 +14,8 @@
 #include <config.h>
 #endif
 
-#include <glibmm/i18n.h>
 #include <glibmm/convert.h>
+#include <glibmm/i18n.h>
 #include <glibmm/regex.h>
 
 #include <gtkmm/box.h>
diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp
index 753b72c2e..02bb3cf6d 100644
--- a/src/ui/widget/registered-widget.cpp
+++ b/src/ui/widget/registered-widget.cpp
@@ -25,8 +25,8 @@
 
 #include "object/sp-root.h"
 
-#include "svg/svg-color.h"
 #include "svg/stringstream.h"
+#include "svg/svg-color.h"
 
 #include "widgets/spinbutton-events.h"
 
diff --git a/src/ui/widget/rotateable.cpp b/src/ui/widget/rotateable.cpp
index 0e290730d..fef507b88 100644
--- a/src/ui/widget/rotateable.cpp
+++ b/src/ui/widget/rotateable.cpp
@@ -11,11 +11,11 @@
 #include <config.h>
 #endif
 
+#include "rotateable.h"
+#include "ui/tools/tool-base.h"
+#include <2geom/point.h>
 #include <gtkmm/box.h>
 #include <gtkmm/eventbox.h>
-#include <2geom/point.h>
-#include "ui/tools/tool-base.h"
-#include "rotateable.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/spinbutton.cpp b/src/ui/widget/spinbutton.cpp
index 0c082d3ce..53b329293 100644
--- a/src/ui/widget/spinbutton.cpp
+++ b/src/ui/widget/spinbutton.cpp
@@ -13,10 +13,10 @@
 
 #include "spinbutton.h"
 
+#include "ui/tools/tool-base.h"
 #include "unit-menu.h"
 #include "unit-tracker.h"
 #include "util/expression-evaluator.h"
-#include "ui/tools/tool-base.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/style-subject.cpp b/src/ui/widget/style-subject.cpp
index e23627080..5680f7ee5 100644
--- a/src/ui/widget/style-subject.cpp
+++ b/src/ui/widget/style-subject.cpp
@@ -7,8 +7,8 @@
 
 #include "style-subject.h"
 
-#include "desktop.h"
 #include "desktop-style.h"
+#include "desktop.h"
 #include "selection.h"
 
 #include "xml/sp-css-attr.h"
diff --git a/src/ui/widget/tolerance-slider.cpp b/src/ui/widget/tolerance-slider.cpp
index d2c338571..4e326af19 100644
--- a/src/ui/widget/tolerance-slider.cpp
+++ b/src/ui/widget/tolerance-slider.cpp
@@ -22,10 +22,10 @@
 #include <gtkmm/radiobutton.h>
 #include <gtkmm/scale.h>
 
-#include "inkscape.h"
-#include "document.h"
-#include "document-undo.h"
 #include "desktop.h"
+#include "document-undo.h"
+#include "document.h"
+#include "inkscape.h"
 
 #include "object/sp-namedview.h"
 
diff --git a/src/util/ege-tags.cpp b/src/util/ege-tags.cpp
index dcc28f370..636d93b85 100644
--- a/src/util/ege-tags.cpp
+++ b/src/util/ege-tags.cpp
@@ -44,9 +44,9 @@
 #define _(s) gettext(s)
 #endif // !defined(_)
 
-#include <set>
 #include <algorithm>
 #include <functional>
+#include <set>
 
 #include "ege-tags.h"
 
diff --git a/src/util/units.cpp b/src/util/units.cpp
index cf4bfd146..e31f78c3b 100644
--- a/src/util/units.cpp
+++ b/src/util/units.cpp
@@ -13,20 +13,20 @@
 # include <config.h>
 #endif
 
-#include <cmath>
 #include <cerrno>
-#include <iomanip>
-#include <iostream>
+#include <cmath>
 #include <glib.h>
-#include <glibmm/regex.h>
 #include <glibmm/fileutils.h>
 #include <glibmm/markup.h>
+#include <glibmm/regex.h>
+#include <iomanip>
+#include <iostream>
 
 #include <2geom/coord.h>
 
-#include "util/units.h"
 #include "path-prefix.h"
 #include "streq.h"
+#include "util/units.h"
 
 using Inkscape::Util::UNIT_TYPE_DIMENSIONLESS;
 using Inkscape::Util::UNIT_TYPE_LINEAR;
diff --git a/src/util/ziptool.cpp b/src/util/ziptool.cpp
index b8253627c..d9d769e89 100644
--- a/src/util/ziptool.cpp
+++ b/src/util/ziptool.cpp
@@ -31,8 +31,8 @@
  */
 
 
-#include <stdio.h>
 #include <stdarg.h>
+#include <stdio.h>
 #include <time.h>
 
 #include <string>
diff --git a/src/version.cpp b/src/version.cpp
index 7610cd8e7..a4d4decb9 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -12,9 +12,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "version.h"
 #include <glib.h>
 #include <sstream>
-#include "version.h"
 
 bool sp_version_from_string(const char *string, Inkscape::Version *version)
 {
diff --git a/src/widgets/box3d-toolbar.cpp b/src/widgets/box3d-toolbar.cpp
index 4b944314d..e6463547a 100644
--- a/src/widgets/box3d-toolbar.cpp
+++ b/src/widgets/box3d-toolbar.cpp
@@ -28,8 +28,8 @@
 #include <config.h>
 #endif
 
-#include <gtk/gtk.h>
 #include <glibmm/i18n.h>
+#include <gtk/gtk.h>
 
 #include "box3d-toolbar.h"
 
diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp
index 7dcfc9771..79a52c31d 100644
--- a/src/widgets/button.cpp
+++ b/src/widgets/button.cpp
@@ -15,9 +15,9 @@
 
 #include "button.h"
 #include "helper/action-context.h"
-#include "ui/interface.h"
-#include "shortcuts.h"
 #include "helper/action.h"
+#include "shortcuts.h"
+#include "ui/interface.h"
 
 static void sp_button_dispose(GObject *object);
 static void sp_button_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width);
diff --git a/src/widgets/calligraphy-toolbar.cpp b/src/widgets/calligraphy-toolbar.cpp
index ed9779f1a..b46ad842a 100644
--- a/src/widgets/calligraphy-toolbar.cpp
+++ b/src/widgets/calligraphy-toolbar.cpp
@@ -29,18 +29,18 @@
 #endif
 
 #include "ui/dialog/calligraphic-profile-rename.h"
-#include <glibmm/i18n.h>
 #include "calligraphy-toolbar.h"
+#include <glibmm/i18n.h>
 
 #include "desktop.h"
 #include "document-undo.h"
-#include "widgets/ege-adjustment-action.h"
-#include "widgets/ink-action.h"
-#include "widgets/ink-toggle-action.h"
 #include "toolbox.h"
 #include "ui/icon-names.h"
 #include "ui/uxmanager.h"
 #include "ui/widget/ink-select-one-action.h"
+#include "widgets/ege-adjustment-action.h"
+#include "widgets/ink-action.h"
+#include "widgets/ink-toggle-action.h"
 
 using Inkscape::UI::UXManager;
 using Inkscape::DocumentUndo;
diff --git a/src/widgets/connector-toolbar.cpp b/src/widgets/connector-toolbar.cpp
index 2030e7acb..64058886f 100644
--- a/src/widgets/connector-toolbar.cpp
+++ b/src/widgets/connector-toolbar.cpp
@@ -30,8 +30,8 @@
 
 #include <glibmm/i18n.h>
 
-#include "connector-toolbar.h"
 #include "conn-avoid-ref.h"
+#include "connector-toolbar.h"
 
 #include "desktop.h"
 #include "document-undo.h"
diff --git a/src/widgets/dropper-toolbar.cpp b/src/widgets/dropper-toolbar.cpp
index 7a9cf1779..c3f70ab39 100644
--- a/src/widgets/dropper-toolbar.cpp
+++ b/src/widgets/dropper-toolbar.cpp
@@ -30,11 +30,11 @@
 
 #include <glibmm/i18n.h>
 
-#include "dropper-toolbar.h"
 #include "document-undo.h"
-#include "widgets/ege-output-action.h"
+#include "dropper-toolbar.h"
 #include "ink-toggle-action.h"
 #include "preferences.h"
+#include "widgets/ege-output-action.h"
 #include "widgets/spinbutton-events.h"
 
 using Inkscape::DocumentUndo;
diff --git a/src/widgets/eek-preview.cpp b/src/widgets/eek-preview.cpp
index 38d5173fa..bf69ad985 100644
--- a/src/widgets/eek-preview.cpp
+++ b/src/widgets/eek-preview.cpp
@@ -40,9 +40,9 @@
 #include <algorithm>
 using std::min;
 
-#include <gtk/gtk.h>
 #include "eek-preview.h"
 #include "preferences.h"
+#include <gtk/gtk.h>
 
 #define PRIME_BUTTON_MAGIC_NUMBER 1
 
diff --git a/src/widgets/ege-adjustment-action.cpp b/src/widgets/ege-adjustment-action.cpp
index 318e6ced2..3e09c3d78 100644
--- a/src/widgets/ege-adjustment-action.cpp
+++ b/src/widgets/ege-adjustment-action.cpp
@@ -39,19 +39,19 @@
 
 /* Note: this file should be kept compilable as both .cpp and .c */
 
+#include <algorithm>
 #include <cmath>
 #include <string.h>
 #include <vector>
-#include <algorithm>
 
+#include <gdk/gdkkeysyms.h>
+#include <gtkmm/adjustment.h>
 #include <gtkmm/container.h>
 #include <gtkmm/radiomenuitem.h>
-#include <gtkmm/adjustment.h>
-#include <gdk/gdkkeysyms.h>
 
-#include "widgets/ege-adjustment-action.h"
 #include "ui/icon-names.h"
 #include "ui/widget/ink-spinscale.h"
+#include "widgets/ege-adjustment-action.h"
 
 static void ege_adjustment_action_finalize( GObject* object );
 static void ege_adjustment_action_get_property( GObject* obj, guint propId, GValue* value, GParamSpec * pspec );
diff --git a/src/widgets/ege-paint-def.cpp b/src/widgets/ege-paint-def.cpp
index 8e0ec9352..a7f65e739 100644
--- a/src/widgets/ege-paint-def.cpp
+++ b/src/widgets/ege-paint-def.cpp
@@ -38,14 +38,14 @@
 
 #include <libintl.h>
 
-#include <stdint.h>
-#include <string>
+#include <glibmm/i18n.h>
+#include <glibmm/stringutils.h>
 #include <iostream>
 #include <sstream>
-#include <string.h>
+#include <stdint.h>
 #include <stdio.h>
-#include <glibmm/i18n.h>
-#include <glibmm/stringutils.h>
+#include <string>
+#include <string.h>
 
 #if !defined(_)
 #define _(s) gettext(s)
diff --git a/src/widgets/eraser-toolbar.cpp b/src/widgets/eraser-toolbar.cpp
index ddda02c59..d187f0956 100644
--- a/src/widgets/eraser-toolbar.cpp
+++ b/src/widgets/eraser-toolbar.cpp
@@ -36,14 +36,14 @@
 
 #include "desktop.h"
 #include "document-undo.h"
-#include "widgets/ege-adjustment-action.h"
 #include "ink-action.h"
 #include "ink-radio-action.h"
 #include "ink-toggle-action.h"
 #include "toolbox.h"
-#include "ui/widget/ink-select-one-action.h"
 #include "ui/icon-names.h"
 #include "ui/tools/eraser-tool.h"
+#include "ui/widget/ink-select-one-action.h"
+#include "widgets/ege-adjustment-action.h"
 
 using Inkscape::DocumentUndo;
 using Inkscape::UI::ToolboxFactory;
diff --git a/src/widgets/fill-style.cpp b/src/widgets/fill-style.cpp
index 8b3a31516..a1865f396 100644
--- a/src/widgets/fill-style.cpp
+++ b/src/widgets/fill-style.cpp
@@ -22,8 +22,8 @@
 #include <config.h>
 #endif
 
-#include <gtkmm/box.h>
 #include <glibmm/i18n.h>
+#include <gtkmm/box.h>
 
 #include "desktop-style.h"
 #include "desktop.h"
diff --git a/src/widgets/gimp/ruler.cpp b/src/widgets/gimp/ruler.cpp
index 8d73ada3b..da25df3b4 100644
--- a/src/widgets/gimp/ruler.cpp
+++ b/src/widgets/gimp/ruler.cpp
@@ -29,14 +29,14 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <cstring>
 #include <cmath>
 #include <cstdio>
+#include <cstring>
 #include <set>
 
 #include "ruler.h"
-#include <glibmm/i18n.h>
 #include "util/units.h"
+#include <glibmm/i18n.h>
 
 #define ROUND(x) ((int) round(x))
 
diff --git a/src/widgets/gradient-image.cpp b/src/widgets/gradient-image.cpp
index 65b1a6733..d02c19512 100644
--- a/src/widgets/gradient-image.cpp
+++ b/src/widgets/gradient-image.cpp
@@ -12,8 +12,8 @@
 
 #include <sigc++/sigc++.h>
 
-#include <glibmm/refptr.h>
 #include <gdkmm/pixbuf.h>
+#include <glibmm/refptr.h>
 
 #include <cairomm/surface.h>
 
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index 412f0b7e2..7678cb6be 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -31,15 +31,15 @@
 
 
 
-#include "document-private.h"
-#include "gradient-chemistry.h"
-#include "inkscape.h"
-#include "preferences.h"
 #include "desktop.h"
+#include "document-private.h"
 #include "document-undo.h"
+#include "gradient-chemistry.h"
 #include "gradient-vector.h"
+#include "inkscape.h"
 #include "layer-manager.h"
 #include "macros.h"
+#include "preferences.h"
 #include "selection-chemistry.h"
 #include "verbs.h"
 
@@ -439,9 +439,9 @@ void SPGradientVectorSelector::setSwatched()
   ###                 Vector Editing Widget
   ##################################################################*/
 
+#include "svg/svg-color.h"
 #include "widgets/widget-sizes.h"
 #include "xml/node-event-vector.h"
-#include "svg/svg-color.h"
 
 #define PAD 4
 
diff --git a/src/widgets/ink-comboboxentry-action.cpp b/src/widgets/ink-comboboxentry-action.cpp
index 2fecb06a4..10d9e7422 100644
--- a/src/widgets/ink-comboboxentry-action.cpp
+++ b/src/widgets/ink-comboboxentry-action.cpp
@@ -23,15 +23,15 @@
  * we must keep track of things like active entry ourselves.
  */
 
+#include <glibmm/ustring.h>
 #include <iostream>
 #include <string.h>
-#include <glibmm/ustring.h>
 
-#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
 
-#include "widgets/ink-comboboxentry-action.h"
 #include "ui/icon-names.h"
+#include "widgets/ink-comboboxentry-action.h"
 
 // Must handle both tool and menu items!
 static GtkWidget* create_tool_item( GtkAction* action );
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index 991d81d4a..de0018115 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -684,7 +684,7 @@ static void sp_paint_selector_set_mode_color(SPPaintSelector *psel, SPPaintSelec
     sp_paint_selector_set_style_buttons(psel, psel->solid);
     gtk_widget_set_sensitive(psel->style, TRUE);
 
-    if ((psel->mode == SPPaintSelector::MODE_SOLID_COLOR)) {
+    if (psel->mode = SPPaintSelector::MODE_SOLID_COLOR) {
         /* Already have color selector */
         // Do nothing
     } else {
diff --git a/src/widgets/paintbucket-toolbar.cpp b/src/widgets/paintbucket-toolbar.cpp
index 280cf0eb1..e7d69b0cc 100644
--- a/src/widgets/paintbucket-toolbar.cpp
+++ b/src/widgets/paintbucket-toolbar.cpp
@@ -30,9 +30,9 @@
 
 #include <glibmm/i18n.h>
 
-#include "paintbucket-toolbar.h"
 #include "desktop.h"
 #include "document-undo.h"
+#include "paintbucket-toolbar.h"
 
 #include "ui/icon-names.h"
 #include "ui/tools/flood-tool.h"
@@ -40,8 +40,8 @@
 #include "ui/widget/ink-select-one-action.h"
 #include "ui/widget/unit-tracker.h"
 
-#include "widgets/ink-action.h"
 #include "widgets/ege-adjustment-action.h"
+#include "widgets/ink-action.h"
 #include "widgets/toolbox.h"
 
 using Inkscape::UI::Widget::UnitTracker;
diff --git a/src/widgets/pencil-toolbar.cpp b/src/widgets/pencil-toolbar.cpp
index d2939c720..e6f085d8f 100644
--- a/src/widgets/pencil-toolbar.cpp
+++ b/src/widgets/pencil-toolbar.cpp
@@ -28,8 +28,8 @@
 #include <config.h>
 #endif
 
-#include <gtkmm.h>
 #include <glibmm/i18n.h>
+#include <gtkmm.h>
 
 #include "pencil-toolbar.h"
 
diff --git a/src/widgets/rect-toolbar.cpp b/src/widgets/rect-toolbar.cpp
index afa090ba7..50fde9ded 100644
--- a/src/widgets/rect-toolbar.cpp
+++ b/src/widgets/rect-toolbar.cpp
@@ -28,8 +28,8 @@
 #include <config.h>
 #endif
 
-#include <gtk/gtk.h>
 #include <glibmm/i18n.h>
+#include <gtk/gtk.h>
 
 #include "rect-toolbar.h"
 
diff --git a/src/widgets/sp-attribute-widget.cpp b/src/widgets/sp-attribute-widget.cpp
index d89e6296c..c296c1136 100644
--- a/src/widgets/sp-attribute-widget.cpp
+++ b/src/widgets/sp-attribute-widget.cpp
@@ -18,9 +18,9 @@
 
 #include "sp-attribute-widget.h"
 
-#include "macros.h"
-#include "document.h"
 #include "document-undo.h"
+#include "document.h"
+#include "macros.h"
 #include "verbs.h"
 
 #include "object/sp-object.h"
diff --git a/src/widgets/sp-color-selector.cpp b/src/widgets/sp-color-selector.cpp
index 8a30b276b..222a41b19 100644
--- a/src/widgets/sp-color-selector.cpp
+++ b/src/widgets/sp-color-selector.cpp
@@ -7,10 +7,10 @@
 #include <config.h>
 #endif
 
-#include <math.h>
-#include <gtk/gtk.h>
-#include <glibmm/i18n.h>
 #include "sp-color-selector.h"
+#include <glibmm/i18n.h>
+#include <gtk/gtk.h>
+#include <math.h>
 
 enum {
     GRABBED,
diff --git a/src/widgets/sp-widget.cpp b/src/widgets/sp-widget.cpp
index 707e62c12..8295aa017 100644
--- a/src/widgets/sp-widget.cpp
+++ b/src/widgets/sp-widget.cpp
@@ -14,9 +14,9 @@
  */
 
 #include "document.h"
+#include "helper/sp-marshal.h"
 #include "inkscape.h"
 #include "sp-widget.h"
-#include "helper/sp-marshal.h"
 
 using Inkscape::SPWidgetImpl;
 
diff --git a/src/widgets/sp-xmlview-attr-list.cpp b/src/widgets/sp-xmlview-attr-list.cpp
index e99605b97..4d38cee8f 100644
--- a/src/widgets/sp-xmlview-attr-list.cpp
+++ b/src/widgets/sp-xmlview-attr-list.cpp
@@ -16,8 +16,8 @@
 #include <cstring>
 #include <glibmm/i18n.h>
 
-#include "helper/sp-marshal.h"
 #include "../xml/node-event-vector.h"
+#include "helper/sp-marshal.h"
 #include "sp-xmlview-attr-list.h"
 
 static void sp_xmlview_attr_list_destroy(GtkWidget * object);
diff --git a/src/widgets/sp-xmlview-content.cpp b/src/widgets/sp-xmlview-content.cpp
index 6e59ba3cd..0da6cdb19 100644
--- a/src/widgets/sp-xmlview-content.cpp
+++ b/src/widgets/sp-xmlview-content.cpp
@@ -13,13 +13,13 @@
 #include <cstring>
 #include <glibmm/i18n.h>
 
-#include "xml/node-event-vector.h"
-#include "sp-xmlview-content.h"
 #include "desktop.h"
 #include "document-private.h"
 #include "document-undo.h"
 #include "inkscape.h"
+#include "sp-xmlview-content.h"
 #include "verbs.h"
+#include "xml/node-event-vector.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/widgets/spinbutton-events.cpp b/src/widgets/spinbutton-events.cpp
index 9666fc636..2f8eb9147 100644
--- a/src/widgets/spinbutton-events.cpp
+++ b/src/widgets/spinbutton-events.cpp
@@ -15,8 +15,8 @@
 #include <config.h>
 #endif
 
-#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
 
 #include "ui/tools/tool-base.h"
 
diff --git a/src/widgets/spiral-toolbar.cpp b/src/widgets/spiral-toolbar.cpp
index 79ea30e8e..66eaeedc3 100644
--- a/src/widgets/spiral-toolbar.cpp
+++ b/src/widgets/spiral-toolbar.cpp
@@ -28,8 +28,8 @@
 #include <config.h>
 #endif
 
-#include <gtk/gtk.h>
 #include <glibmm/i18n.h>
+#include <gtk/gtk.h>
 
 #include "spiral-toolbar.h"
 
diff --git a/src/widgets/spray-toolbar.cpp b/src/widgets/spray-toolbar.cpp
index 361364992..d930366fa 100644
--- a/src/widgets/spray-toolbar.cpp
+++ b/src/widgets/spray-toolbar.cpp
@@ -31,18 +31,18 @@
 
 #include <gtkmm.h>
 
-#include "spray-toolbar.h"
 #include "desktop.h"
-#include "inkscape.h"
-#include "widgets/ege-adjustment-action.h"
 #include "ink-radio-action.h"
 #include "ink-toggle-action.h"
+#include "inkscape.h"
+#include "spray-toolbar.h"
 #include "toolbox.h"
 #include "ui/dialog/clonetiler.h"
 #include "ui/dialog/dialog-manager.h"
 #include "ui/dialog/panel-dialog.h"
-#include "ui/widget/ink-select-one-action.h"
 #include "ui/icon-names.h"
+#include "ui/widget/ink-select-one-action.h"
+#include "widgets/ege-adjustment-action.h"
 
 #include <glibmm/i18n.h>
 
diff --git a/src/widgets/spw-utilities.cpp b/src/widgets/spw-utilities.cpp
index 992f1f6b7..cf717ae7c 100644
--- a/src/widgets/spw-utilities.cpp
+++ b/src/widgets/spw-utilities.cpp
@@ -18,8 +18,8 @@
 #include <string>
 
 #include <gtkmm/box.h>
-#include <gtkmm/label.h>
 #include <gtkmm/grid.h>
+#include <gtkmm/label.h>
 
 #include "selection.h"
 
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 5894391ff..907cb5421 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -30,11 +30,11 @@
 #include "config.h"
 #endif
 
-#include <gtkmm/box.h>
+#include <glibmm/i18n.h>
 #include <gtkmm/action.h>
 #include <gtkmm/actiongroup.h>
+#include <gtkmm/box.h>
 #include <gtkmm/toolitem.h>
-#include <glibmm/i18n.h>
 
 #include "desktop-style.h"
 #include "desktop.h"
@@ -77,8 +77,8 @@
 #include "eraser-toolbar.h"
 #include "gradient-toolbar.h"
 #include "lpe-toolbar.h"
-#include "mesh-toolbar.h"
 #include "measure-toolbar.h"
+#include "mesh-toolbar.h"
 #include "node-toolbar.h"
 #include "rect-toolbar.h"
 
@@ -88,11 +88,11 @@
 
 #include "pencil-toolbar.h"
 #include "select-toolbar.h"
-#include "spray-toolbar.h"
 #include "spiral-toolbar.h"
+#include "spray-toolbar.h"
 #include "star-toolbar.h"
-#include "tweak-toolbar.h"
 #include "text-toolbar.h"
+#include "tweak-toolbar.h"
 #include "zoom-toolbar.h"
 
 #include "toolbox.h"
diff --git a/src/xml/composite-node-observer.cpp b/src/xml/composite-node-observer.cpp
index 581a4c226..e104d1ef3 100644
--- a/src/xml/composite-node-observer.cpp
+++ b/src/xml/composite-node-observer.cpp
@@ -15,11 +15,11 @@
 #include <cstring>
 #include <glib.h>
 
+#include "debug/event-tracker.h"
+#include "debug/simple-event.h"
 #include "util/find-if-before.h"
 #include "xml/composite-node-observer.h"
 #include "xml/node-event-vector.h"
-#include "debug/event-tracker.h"
-#include "debug/simple-event.h"
 
 namespace Inkscape {
 
diff --git a/src/xml/croco-node-iface.cpp b/src/xml/croco-node-iface.cpp
index 6bd5a6920..dd92e93d5 100644
--- a/src/xml/croco-node-iface.cpp
+++ b/src/xml/croco-node-iface.cpp
@@ -1,6 +1,6 @@
 #include <cstring>
-#include <string>
 #include <glib.h>
+#include <string>
 
 #include "xml/croco-node-iface.h"
 #include "xml/node.h"
diff --git a/src/xml/event.cpp b/src/xml/event.cpp
index 54f55d5c3..36ee93199 100644
--- a/src/xml/event.cpp
+++ b/src/xml/event.cpp
@@ -13,16 +13,16 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib.h> // g_assert()
 #include <cstdio>
+#include <glib.h> // g_assert()
 
-#include "event.h"
+#include "debug/event-tracker.h"
+#include "debug/simple-event.h"
 #include "event-fns.h"
+#include "event.h"
 #include "util/reverse-list.h"
 #include "xml/document.h"
 #include "xml/node-observer.h"
-#include "debug/event-tracker.h"
-#include "debug/simple-event.h"
 
 using Inkscape::Util::List;
 using Inkscape::Util::reverse_list;
diff --git a/src/xml/log-builder.cpp b/src/xml/log-builder.cpp
index 12577cf69..34f5bf0e3 100644
--- a/src/xml/log-builder.cpp
+++ b/src/xml/log-builder.cpp
@@ -14,8 +14,8 @@
  */
 
 #include "xml/log-builder.h"
-#include "xml/event.h"
 #include "xml/event-fns.h"
+#include "xml/event.h"
 
 namespace Inkscape {
 namespace XML {
diff --git a/src/xml/node-fns.cpp b/src/xml/node-fns.cpp
index e1506e3f2..9ceafc593 100644
--- a/src/xml/node-fns.cpp
+++ b/src/xml/node-fns.cpp
@@ -1,14 +1,14 @@
 #ifdef HAVE_CONFIG_H
 #endif
 
-#include <map>
 #include <cstring>
-#include <string>
 #include <glib.h> // g_assert()
+#include <map>
+#include <string>
 
-#include "xml/node-iterators.h"
-#include "util/find-if-before.h"
 #include "node-fns.h"
+#include "util/find-if-before.h"
+#include "xml/node-iterators.h"
 
 namespace Inkscape {
 namespace XML {
diff --git a/src/xml/repr-css.cpp b/src/xml/repr-css.cpp
index 63ad05e04..438585f25 100644
--- a/src/xml/repr-css.cpp
+++ b/src/xml/repr-css.cpp
@@ -19,8 +19,8 @@
 #define SP_REPR_CSS_C
 
 #include <cstring>
-#include <string>
 #include <sstream>
+#include <string>
 
 #include <glibmm/ustring.h>
 
diff --git a/src/xml/repr-io.cpp b/src/xml/repr-io.cpp
index 2ff9d4776..cbee11848 100644
--- a/src/xml/repr-io.cpp
+++ b/src/xml/repr-io.cpp
@@ -15,21 +15,21 @@
 #endif
 
 #include <cstring>
-#include <string>
 #include <stdexcept>
+#include <string>
 
 #include <libxml/parser.h>
 
-#include "xml/repr.h"
 #include "xml/attribute-record.h"
 #include "xml/rebase-hrefs.h"
+#include "xml/repr.h"
 #include "xml/simple-document.h"
 #include "xml/text-node.h"
 
+#include "io/gzipstream.h"
+#include "io/stringstream.h"
 #include "io/sys.h"
 #include "io/uristream.h"
-#include "io/stringstream.h"
-#include "io/gzipstream.h"
 
 #include "extension/extension.h"
 
diff --git a/src/xml/repr-sorting.cpp b/src/xml/repr-sorting.cpp
index 09a39acb2..95094beb7 100644
--- a/src/xml/repr-sorting.cpp
+++ b/src/xml/repr-sorting.cpp
@@ -1,8 +1,8 @@
 
 #include "util/longest-common-suffix.h"
-#include "xml/repr.h"
-#include "xml/node-iterators.h"
 #include "repr-sorting.h"
+#include "xml/node-iterators.h"
+#include "xml/repr.h"
 
 static bool same_repr(Inkscape::XML::Node const &a, Inkscape::XML::Node const &b)
 {
diff --git a/src/xml/repr-util.cpp b/src/xml/repr-util.cpp
index 6da1233db..187e0a658 100644
--- a/src/xml/repr-util.cpp
+++ b/src/xml/repr-util.cpp
@@ -22,14 +22,14 @@
 # include <cstdlib>
 
 
-#include <glib.h>
-#include <2geom/point.h>
-#include "svg/stringstream.h"
 #include "svg/css-ostringstream.h"
+#include "svg/stringstream.h"
 #include "svg/svg-length.h"
+#include <2geom/point.h>
+#include <glib.h>
 
-#include "xml/repr.h"
 #include "xml/repr-sorting.h"
+#include "xml/repr.h"
 
 
 #define OSB_NS_URI "http://www.openswatchbook.org/uri/2009/osb"
diff --git a/src/xml/repr.cpp b/src/xml/repr.cpp
index 8ad1ac06b..09c3e3bec 100644
--- a/src/xml/repr.cpp
+++ b/src/xml/repr.cpp
@@ -23,10 +23,10 @@
 #include <cstring>
 
 #include "xml/repr.h"
-#include "xml/text-node.h"
-#include "xml/element-node.h"
 #include "xml/comment-node.h"
+#include "xml/element-node.h"
 #include "xml/simple-document.h"
+#include "xml/text-node.h"
 
 using Inkscape::Util::share_string;
 
diff --git a/src/xml/simple-document.cpp b/src/xml/simple-document.cpp
index cf7851897..0e1c7a3ad 100644
--- a/src/xml/simple-document.cpp
+++ b/src/xml/simple-document.cpp
@@ -13,14 +13,14 @@
  *
  */
 
+#include "xml/simple-document.h"
 #include <glib.h> // g_assert()
 
-#include "xml/simple-document.h"
-#include "xml/event-fns.h"
-#include "xml/element-node.h"
-#include "xml/text-node.h"
 #include "xml/comment-node.h"
+#include "xml/element-node.h"
+#include "xml/event-fns.h"
 #include "xml/pi-node.h"
+#include "xml/text-node.h"
 
 namespace Inkscape {
 
diff --git a/src/xml/simple-document.h b/src/xml/simple-document.h
index 01933076f..66f6b1381 100644
--- a/src/xml/simple-document.h
+++ b/src/xml/simple-document.h
@@ -16,9 +16,9 @@
 #define SEEN_INKSCAPE_XML_SIMPLE_DOCUMENT_H
 
 #include "xml/document.h"
-#include "xml/simple-node.h"
 #include "xml/node-observer.h"
 #include "xml/log-builder.h"
+#include "xml/simple-node.h"
 
 namespace Inkscape {
 
diff --git a/src/xml/simple-node.cpp b/src/xml/simple-node.cpp
index 78fc52a27..4d4efc668 100644
--- a/src/xml/simple-node.cpp
+++ b/src/xml/simple-node.cpp
@@ -21,12 +21,12 @@
 
 #include "preferences.h"
 
-#include "xml/simple-node.h"
-#include "xml/node-event-vector.h"
-#include "xml/node-fns.h"
 #include "debug/event-tracker.h"
 #include "debug/simple-event.h"
 #include "util/format.h"
+#include "xml/node-event-vector.h"
+#include "xml/node-fns.h"
+#include "xml/simple-node.h"
 
 #include "attribute-rel-util.h"
 
diff --git a/src/xml/subtree.cpp b/src/xml/subtree.cpp
index 94c1436a9..52237340f 100644
--- a/src/xml/subtree.cpp
+++ b/src/xml/subtree.cpp
@@ -13,8 +13,8 @@
  */
 
 #include "xml/node.h"
-#include "xml/subtree.h"
 #include "xml/node-iterators.h"
+#include "xml/subtree.h"
 
 namespace Inkscape {
 namespace XML {