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

This reverts commit bba4ff6672494fab59286b50f6c645ad62a47e60.

59 files changed, 231 insertions, 232 deletions

diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index 5333abf54..1e691eb4d 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -16,7 +16,6 @@
 #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"
@@ -28,7 +27,6 @@
 #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"
@@ -39,8 +37,8 @@
 #include "live_effects/lpe-interpolate_points.h"
 #include "live_effects/lpe-jointype.h"
 #include "live_effects/lpe-knot.h"
-#include "live_effects/lpe-lattice.h"
 #include "live_effects/lpe-lattice2.h"
+#include "live_effects/lpe-lattice.h"
 #include "live_effects/lpe-line_segment.h"
 #include "live_effects/lpe-measure-segments.h"
 #include "live_effects/lpe-mirror_symmetry.h"
@@ -53,43 +51,45 @@
 #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-rough-hatches.h"
 #include "live_effects/lpe-roughen.h"
+#include "live_effects/lpe-rough-hatches.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 "display/curve.h"
+#include "message-stack.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 "ui/tools-switch.h"
-#include "ui/tools/node-tool.h"
-#include "ui/tools/pen-tool.h"
+#include "display/curve.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 0a10c03b9..ea2965c6a 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 "2geom/path-sink.h"
 #include "display/curve.h"
-#include <math.h>
+#include "2geom/path-sink.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 af500b1aa..11694249a 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 6cc8b1a1d..01b019cec 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/affine.h"
+#include "2geom/path.h"
 #include "2geom/bezier-curve.h"
 #include "2geom/path-sink.h"
-#include "2geom/path.h"
+#include "2geom/affine.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 a15b992b0..7834ff108 100644
--- a/src/live_effects/lpe-bspline.cpp
+++ b/src/live_effects/lpe-bspline.cpp
@@ -1,18 +1,17 @@
 /*
  * 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 "preferences.h"
 #include "svg/svg.h"
-#include "ui/widget/scalar.h"
-#include "verbs.h"
 #include "xml/repr.h"
-#include <glib.h>
-#include <gtkmm.h>
+#include "preferences.h"
+#include "document-undo.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-clone-original.cpp b/src/live_effects/lpe-clone-original.cpp
index c4b8a36bb..f384c8bec 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 "display/curve.h"
-#include "live_effects/lpe-bspline.h"
 #include "live_effects/lpe-spiro.h"
-#include "live_effects/lpeobject-reference.h"
+#include "live_effects/lpe-bspline.h"
 #include "live_effects/lpeobject.h"
+#include "live_effects/lpeobject-reference.h"
+#include "display/curve.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 a51a3531e..74ee0cfda 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 "display/curve.h"
-#include "helper/geom.h"
+#include <gtkmm.h>
+#include <gdk/gdk.h>
+#include <2geom/path-intersection.h>
+#include <2geom/sbasis-to-bezier.h>
+#include <2geom/intersection-graph.h>
 #include "live_effects/lpe-copy_rotate.h"
 #include "live_effects/lpeobject.h"
-#include "path-chemistry.h"
+#include "display/curve.h"
 #include "svg/path-string.h"
 #include "svg/svg.h"
+#include "helper/geom.h"
 #include "xml/sp-css-attr.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 "path-chemistry.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 1adce4586..7b1e1b578 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/path.h"
 #include "2geom/pathvector.h"
+#include "2geom/path.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 294ca884a..28e7058d7 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 bb1bd13d5..972d29b9c 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-ordering.h"
 #include "live_effects/lpe-embrodery-stitch.h"
+#include "live_effects/lpe-embrodery-stitch-ordering.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 32599b4f9..9715d7ff8 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 32667e924..dffd09ec3 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 "display/curve.h"
-#include "knotholder.h"
 #include <2geom/elliptical-arc.h>
+#include "knotholder.h"
+#include "display/curve.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 3c0b1aabc..d62965ca8 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 "helper/geom.h"
-#include <2geom/basic-intersection.h>
-#include <2geom/bezier-to-sbasis.h>
 #include <2geom/sbasis-to-bezier.h>
+#include <2geom/bezier-to-sbasis.h>
+#include <2geom/basic-intersection.h>
+#include "helper/geom.h"
 
-#include "object/sp-path.h"
 #include "object/sp-shape.h"
+#include "object/sp-path.h"
 #include "style.h"
 
 // for change crossing undo
-#include "document-undo.h"
-#include "document.h"
 #include "verbs.h"
+#include "document.h"
+#include "document-undo.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 67b87cb73..df4da4590 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/bezier-to-sbasis.h>
 #include <2geom/sbasis-2d.h>
+#include <2geom/bezier-to-sbasis.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 3699d7660..8c2c3ec31 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 "live_effects/lpe-lattice2.h"
-#include <2geom/bezier-to-sbasis.h>
 #include <2geom/sbasis-2d.h>
-#include <gtkmm.h>
+#include <2geom/bezier-to-sbasis.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 0c911b532..5f62f0281 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 "inkscape.h"
-#include "libnrtype/Layout-TNG.h"
-#include "live_effects/lpe-measure-segments.h"
-#include "live_effects/lpeobject-reference.h"
+#include "text-editing.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, "#%06lx", rgb24);
+    sprintf(c, "#%06x", 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, "#%06lx", rgb24);
+    sprintf(c, "#%06x", 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 b9a51cdee..1e62a98d5 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 "2geom/affine.h"
-#include "2geom/intersection-graph.h"
-#include "2geom/path-intersection.h"
+#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/intersection-graph.h"
+#include "2geom/path-intersection.h"
+#include "2geom/affine.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-lpe-item.h"
 #include "object/sp-path.h"
+#include "object/sp-lpe-item.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 070c333ea..257d02c83 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 "helper/geom-pathstroke.h"
-#include "helper/geom.h"
 #include "inkscape.h"
-#include "knot-holder-entity.h"
-#include "knot.h"
-#include "knotholder.h"
-#include "live_effects/lpe-offset.h"
-#include "object/sp-shape.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 <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 "object/sp-shape.h"
+#include "knot-holder-entity.h"
+#include "knotholder.h"
+#include "knot.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 ace7ff2d0..9c3b714cc 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 "display/curve.h"
 #include "object/sp-shape.h"
+#include "display/curve.h"
 
 #include "knotholder.h"
 
diff --git a/src/live_effects/lpe-patternalongpath.cpp b/src/live_effects/lpe-patternalongpath.cpp
index 13d8cd621..115c777d0 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 <algorithm>
 #include <cmath>
+#include <algorithm>
 
 #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 5ebe5ac54..e95cdfd4b 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 "display/curve.h"
-#include "helper/geom.h"
+#include <gtkmm.h>
 #include "live_effects/lpe-perspective-envelope.h"
+#include "helper/geom.h"
+#include "display/curve.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 d5cb1ca90..deed40bde 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 "knot-holder-entity.h"
-#include "knotholder.h"
 #include "live_effects/lpe-perspective_path.h"
 #include "live_effects/lpeobject.h"
+#include "knot-holder-entity.h"
+#include "knotholder.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 5f9223d51..b4c342930 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 "path-chemistry.h"
 #include "ui/tools-switch.h"
-#include <2geom/intersection-graph.h>
-#include <2geom/path-intersection.h>
+#include "path-chemistry.h"
+#include "extract-uri.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 e757b1847..577d8a841 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 "path-chemistry.h"
-#include "svg/stringstream.h"
-#include "svg/svg-color.h"
 #include "svg/svg.h"
+#include "svg/svg-color.h"
+#include "svg/stringstream.h"
 #include "ui/tools-switch.h"
-#include <2geom/intersection-graph.h>
-#include <2geom/path-intersection.h>
+#include "path-chemistry.h"
+#include "extract-uri.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 aed63b844..1d64e9042 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 "display/curve.h"
 #include "svg/css-ostringstream.h"
-#include "svg/svg-color.h"
+#include "display/curve.h"
 
-#include "helper/geom.h"
-#include <2geom/circle.h>
 #include <2geom/elliptical-arc.h>
-#include <2geom/path-intersection.h>
 #include <2geom/path-sink.h>
+#include <2geom/path-intersection.h>
+#include <2geom/circle.h>
+#include "helper/geom.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 d13b77da3..4fd145646 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 <display/curve.h>
-#include <object/sp-item-group.h>
+#include <object/sp-shape.h>
 #include <object/sp-item.h>
 #include <object/sp-path.h>
-#include <object/sp-shape.h>
+#include <object/sp-item-group.h>
 #include <svg/svg.h>
+#include <display/curve.h>
 
+#include <2geom/path.h>
 #include <2geom/circle.h>
 #include <2geom/ellipse.h>
-#include <2geom/elliptical-arc.h>
-#include <2geom/path.h>
 #include <2geom/pathvector.h>
+#include <2geom/elliptical-arc.h>
 
 #include <glib/gi18n.h>
 
diff --git a/src/live_effects/lpe-rough-hatches.cpp b/src/live_effects/lpe-rough-hatches.cpp
index 43c25eeab..79ce89c9f 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/bezier-to-sbasis.h>
 #include <2geom/sbasis-math.h>
+#include <2geom/bezier-to-sbasis.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 85d78c683..e78ab99fd 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 "display/curve.h"
-#include "helper/geom.h"
+#include <gtkmm.h>
 #include "live_effects/lpe-roughen.h"
+#include "display/curve.h"
 #include <boost/functional/hash.hpp>
-#include <gtkmm.h>
+#include "helper/geom.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 af8604e58..35da722d0 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 "desktop-style.h"
-#include "display/curve.h"
-#include "helper/geom.h"
+#include <gtkmm.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 "helper/geom.h"
+#include "desktop-style.h"
+#include "display/curve.h"
+#include "svg/svg.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 2a7c6a1d3..e676f37a0 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 "live_effects/lpe-simplify.h"
+#include <2geom/svg-path-parser.h>
 #include "svg/svg.h"
-#include "ui/icon-names.h"
 #include "ui/tools/node-tool.h"
-#include <2geom/svg-path-parser.h>
-#include <gtkmm.h>
+#include "ui/icon-names.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 82fd4e4cb..dfb860de8 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 6058bb16e..8ea57bee4 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 "helper/geom-curves.h"
-#include "helper/geom-nodetype.h"
 #include <2geom/curves.h>
+#include "helper/geom-nodetype.h"
+#include "helper/geom-curves.h"
 
 #include "live_effects/spiro.h"
 
 // For handling un-continuous paths:
-#include "inkscape.h"
 #include "message-stack.h"
+#include "inkscape.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 8d0c91e92..3a225c0be 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-object-group.h"
 #include "object/sp-shape.h"
+#include "object/sp-object-group.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 cc0b602d3..b5e440767 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 "svg/css-ostringstream.h"
+#include "display/curve.h"
 #include "svg/svg-color.h"
+#include "svg/css-ostringstream.h"
 #include "svg/svg.h"
 
 #include "knotholder.h"
 
-#include "object/sp-object-group.h"
 #include "object/sp-shape.h"
+#include "object/sp-object-group.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 36e0df24f..47f8864ce 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 "display/curve.h"
 #include "live_effects/lpe-transform_2pts.h"
-#include "object/sp-path.h"
-#include "svg/svg.h"
+#include "display/curve.h"
 #include "ui/icon-names.h"
+#include "svg/svg.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 5b339b8bf..6df6278b1 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 1d478bd48..bc5ff0576 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-private.h"
 #include "document.h"
-#include "xml/node-event-vector.h"
-#include "xml/repr.h"
+#include "document-private.h"
 
 #include "object/sp-defs.h"
 
diff --git a/src/live_effects/parameter/bool.cpp b/src/live_effects/parameter/bool.cpp
index fa0195aaa..bfbda2bfd 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 "helper-fns.h"
-#include "inkscape.h"
-#include "live_effects/effect.h"
 #include "live_effects/parameter/bool.h"
-#include "svg/stringstream.h"
+#include "live_effects/effect.h"
 #include "svg/svg.h"
+#include "svg/stringstream.h"
+#include "inkscape.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 9b5ff67d1..f6521d0c0 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 <gtkmm.h>
+#include "document.h"
+#include "document-undo.h"
 
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/parameter/fontbutton.cpp b/src/live_effects/parameter/fontbutton.cpp
index 337b1d7a4..49edb850a 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 "live_effects/effect.h"
+#include <gtkmm.h>
+#include "ui/widget/registered-widget.h"
 #include "live_effects/parameter/fontbutton.h"
-#include "svg/stringstream.h"
-#include "svg/svg.h"
+#include "live_effects/effect.h"
 #include "ui/widget/font-button.h"
-#include "ui/widget/registered-widget.h"
+#include "svg/svg.h"
+#include "svg/stringstream.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 a68a7229c..5a21f572b 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/stringstream.h"
 #include "svg/svg.h"
+#include "svg/stringstream.h"
 
 namespace Inkscape {
 
diff --git a/src/live_effects/parameter/item-reference.cpp b/src/live_effects/parameter/item-reference.cpp
index 407dc3be9..6540245d3 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 d3bc96f98..2107a5912 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 693396ce0..03eb2219f 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 "live_effects/effect.h"
+#include <gtkmm.h>
 #include "live_effects/parameter/message.h"
+#include "live_effects/effect.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 8e4bb0849..52e4c2fd8 100644
--- a/src/live_effects/parameter/originalitem.cpp
+++ b/src/live_effects/parameter/originalitem.cpp
@@ -8,8 +8,8 @@
 # include "config.h"
 #endif
 
-#include "live_effects/parameter/originalitem.h"
 #include <gtkmm/box.h>
+#include "live_effects/parameter/originalitem.h"
 
 #include <glibmm/i18n.h>
 #include <gtkmm/button.h>
@@ -18,8 +18,8 @@
 #include "display/curve.h"
 #include "live_effects/effect.h"
 
-#include "desktop.h"
 #include "inkscape.h"
+#include "desktop.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 f2ead5cea..a801d25f6 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/scrolledwindow.h>
 #include <gtkmm/separatormenuitem.h>
-#include <gtkmm/widget.h>
+#include <gtkmm/scrolledwindow.h>
 
 #include <glibmm/i18n.h>
 
 #include "inkscape.h"
-#include "originalitem.h"
-#include "svg/stringstream.h"
-#include "svg/svg.h"
 #include "ui/clipboard.h"
+#include "svg/svg.h"
+#include "svg/stringstream.h"
+#include "originalitem.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 e71df4a54..018e1e69e 100644
--- a/src/live_effects/parameter/originalpath.cpp
+++ b/src/live_effects/parameter/originalpath.cpp
@@ -8,8 +8,8 @@
 # include "config.h"
 #endif
 
-#include "live_effects/parameter/originalpath.h"
 #include <gtkmm/box.h>
+#include "live_effects/parameter/originalpath.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 "desktop.h"
 #include "inkscape.h"
+#include "desktop.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 309b6c989..70f17ccb8 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/lpe-bspline.h"
+#include "live_effects/parameter/originalpatharray.h"
 #include "live_effects/lpe-spiro.h"
-#include "live_effects/lpeobject-reference.h"
+#include "live_effects/lpe-bspline.h"
 #include "live_effects/lpeobject.h"
-#include "live_effects/parameter/originalpatharray.h"
+#include "live_effects/lpeobject-reference.h"
 
+#include <gtkmm/widget.h>
 #include <gtkmm/icontheme.h>
 #include <gtkmm/imagemenuitem.h>
-#include <gtkmm/scrolledwindow.h>
 #include <gtkmm/separatormenuitem.h>
-#include <gtkmm/widget.h>
+#include <gtkmm/scrolledwindow.h>
 
 #include <glibmm/i18n.h>
 
-#include "display/curve.h"
 #include "inkscape.h"
-#include "originalpath.h"
-#include "svg/stringstream.h"
-#include "svg/svg.h"
 #include "ui/clipboard.h"
+#include "svg/svg.h"
+#include "svg/stringstream.h"
+#include "originalpath.h"
+#include "display/curve.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 706b6d105..ab385daa6 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/d2.h>
-#include <2geom/pathvector.h>
-#include <2geom/sbasis-to-bezier.h>
 #include <2geom/svg-path-parser.h>
+#include <2geom/sbasis-to-bezier.h>
+#include <2geom/pathvector.h>
+#include <2geom/d2.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 "xml/repr.h"
+#include "document.h"
+#include "document-undo.h"
 
 // needed for on-canvas editing:
-#include "ui/shape-editor.h"
 #include "ui/tools-switch.h"
+#include "ui/shape-editor.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 2261ec59a..b811b7f2b 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/stringstream.h"
 #include "svg/svg.h"
+#include "svg/stringstream.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 a3739a09f..cf4adc5fd 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 "knotholder.h"
 #include "live_effects/effect.h"
+#include "knotholder.h"
 
 
 #include <2geom/piecewise.h>
diff --git a/src/live_effects/parameter/random.cpp b/src/live_effects/parameter/random.cpp
index 642a62bb4..23912bedb 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/effect.h"
 #include "live_effects/parameter/random.h"
+#include "live_effects/effect.h"
+#include <glibmm/i18n.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 d4254ec19..c6f5492d1 100644
--- a/src/live_effects/parameter/satellitesarray.cpp
+++ b/src/live_effects/parameter/satellitesarray.cpp
@@ -7,9 +7,9 @@
  */
 
 #include "knotholder.h"
-#include "live_effects/effect.h"
-#include "live_effects/parameter/satellitesarray.h"
 #include "ui/dialog/lpe-fillet-chamfer-properties.h"
+#include "live_effects/parameter/satellitesarray.h"
+#include "live_effects/effect.h"
 
 #include "inkscape.h"
 #include <preferences.h>
diff --git a/src/live_effects/parameter/text.cpp b/src/live_effects/parameter/text.cpp
index 2f48f87d5..37ae3a1d7 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 "display/canvas-text.h"
-#include "inkscape.h"
-#include "live_effects/effect.h"
 #include "live_effects/parameter/text.h"
-#include "svg/stringstream.h"
+#include "live_effects/effect.h"
 #include "svg/svg.h"
+#include "svg/stringstream.h"
+#include "inkscape.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 74ceda456..bb9d9a90e 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 "helper-fns.h"
-#include "inkscape.h"
-#include "live_effects/effect.h"
 #include "live_effects/parameter/togglebutton.h"
-#include "selection.h"
-#include "svg/stringstream.h"
+#include "live_effects/effect.h"
 #include "svg/svg.h"
+#include "svg/stringstream.h"
+#include "selection.h"
+#include "inkscape.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 bbdbc43f8..ab66e7256 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/stringstream.h"
 #include "svg/svg.h"
+#include "svg/stringstream.h"
 
-#include "desktop.h"
 #include "live_effects/effect.h"
+#include "desktop.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 9216c06ef..9199e592d 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/effect.h"
 #include "live_effects/parameter/unit.h"
-#include "util/units.h"
+#include "live_effects/effect.h"
 #include "verbs.h"
+#include "util/units.h"
 
 using Inkscape::Util::unit_table;
 
diff --git a/src/live_effects/parameter/vector.cpp b/src/live_effects/parameter/vector.cpp
index 2bcd6c83f..1207a05da 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/stringstream.h"
 #include "svg/svg.h"
+#include "svg/stringstream.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 06b9bbf84..ee214704c 100644
--- a/src/live_effects/spiro-converters.cpp
+++ b/src/live_effects/spiro-converters.cpp
@@ -7,8 +7,8 @@
  */

 

 #include "spiro-converters.h"

-#include "display/curve.h"

 #include <2geom/path.h>

+#include "display/curve.h"

 #include <glib.h>

 

 #define SPIRO_SHOW_INFINITE_COORDINATE_CALLS