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

This reverts commit bba4ff6672494fab59286b50f6c645ad62a47e60.

48 files changed, 134 insertions, 134 deletions

diff --git a/src/display/cairo-utils.cpp b/src/display/cairo-utils.cpp
index 1ae16c8a4..82373c27c 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/affine.h>
-#include <2geom/curves.h>
-#include <2geom/path.h>
 #include <2geom/pathvector.h>
+#include <2geom/curves.h>
+#include <2geom/affine.h>
 #include <2geom/point.h>
-#include <2geom/sbasis-to-bezier.h>
+#include <2geom/path.h>
 #include <2geom/transforms.h>
+#include <2geom/sbasis-to-bezier.h>
 
 #include <boost/operators.hpp>
 #include <boost/optional/optional.hpp>
 
-#include "cairo-templates.h"
 #include "color.h"
+#include "cairo-templates.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 8c989a9b9..366b3c7d1 100644
--- a/src/display/canvas-arena.cpp
+++ b/src/display/canvas-arena.cpp
@@ -13,14 +13,14 @@
 
 #include <gtkmm.h>
 
-#include "display/cairo-utils.h"
+#include "display/sp-canvas-util.h"
+#include "helper/sp-marshal.h"
 #include "display/canvas-arena.h"
+#include "display/cairo-utils.h"
 #include "display/drawing-context.h"
-#include "display/drawing-group.h"
 #include "display/drawing-item.h"
+#include "display/drawing-group.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 455c039c9..82ef69579 100644
--- a/src/display/canvas-axonomgrid.cpp
+++ b/src/display/canvas-axonomgrid.cpp
@@ -18,30 +18,30 @@
 #endif
 
 #include <gtkmm/box.h>
-#include <gtkmm/grid.h>
 #include <gtkmm/label.h>
+#include <gtkmm/grid.h>
 
 #include <glibmm/i18n.h>
 
 #include "display/canvas-axonomgrid.h"
 
-#include "desktop.h"
 #include "ui/widget/registered-widget.h"
+#include "desktop.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 dbb8ef8b1..fc6b79b43 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/cairo-utils.h"
-#include "display/canvas-bpath.h"
-#include "display/curve.h"
 #include "display/sp-canvas-group.h"
 #include "display/sp-canvas-util.h"
-#include "display/sp-canvas.h"
+#include "display/canvas-bpath.h"
+#include "display/curve.h"
+#include "display/cairo-utils.h"
 #include "helper/geom.h"
+#include "display/sp-canvas.h"
 
 static void sp_canvas_bpath_destroy(SPCanvasItem *object);
 
diff --git a/src/display/canvas-debug.cpp b/src/display/canvas-debug.cpp
index 35c88c5bd..00a4f3fee 100644
--- a/src/display/canvas-debug.cpp
+++ b/src/display/canvas-debug.cpp
@@ -10,8 +10,8 @@
  */
 
 #include "canvas-debug.h"
-#include "cairo-utils.h"
 #include "sp-canvas.h"
+#include "cairo-utils.h"
 #include "ui/event-debug.h"
 
 namespace {
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp
index 5a1c0338d..a5cbcdf39 100644
--- a/src/display/canvas-grid.cpp
+++ b/src/display/canvas-grid.cpp
@@ -19,32 +19,32 @@
 #endif
 
 #include <gtkmm/box.h>
-#include <gtkmm/grid.h>
 #include <gtkmm/label.h>
+#include <gtkmm/grid.h>
 
 #include <glibmm/i18n.h>
 
 #include "desktop.h"
-#include "helper/mathfns.h"
 #include "sp-canvas-util.h"
+#include "helper/mathfns.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 "helper/mathfns.h"
+#include "util/units.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/stringstream.h"
 #include "svg/svg-color.h"
-#include "util/units.h"
-#include "verbs.h"
+#include "svg/stringstream.h"
+#include "helper/mathfns.h"
 #include "xml/node-event-vector.h"
+#include "verbs.h"
+#include "display/sp-canvas.h"
 
 using Inkscape::DocumentUndo;
 using Inkscape::Util::unit_table;
diff --git a/src/display/canvas-rotate.cpp b/src/display/canvas-rotate.cpp
index 95e8128e6..1d917a677 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 d87d89528..cb7145d61 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 "display/sp-canvas-item.h"
 #include <glib.h>
+#include "display/sp-canvas-item.h"
 
 namespace Inkscape {
 namespace Display {
diff --git a/src/display/canvas-text.cpp b/src/display/canvas-text.cpp
index a2bfdb27f..4117825e3 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 "desktop.h"
 #include "display/cairo-utils.h"
+#include "desktop.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 f41057c36..1115978e9 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 <glib.h>
+#include <2geom/point.h>
 
 /**
  * Routines for SPCurve and for its Geom::PathVector
diff --git a/src/display/drawing-context.cpp b/src/display/drawing-context.cpp
index 138d5589b..ffd60ef9f 100644
--- a/src/display/drawing-context.cpp
+++ b/src/display/drawing-context.cpp
@@ -10,8 +10,8 @@
  */
 
 #include "display/drawing-context.h"
-#include "display/cairo-utils.h"
 #include "display/drawing-surface.h"
+#include "display/cairo-utils.h"
 
 namespace Inkscape {
 
diff --git a/src/display/drawing-group.cpp b/src/display/drawing-group.cpp
index d6ba03b0f..6abce34a2 100644
--- a/src/display/drawing-group.cpp
+++ b/src/display/drawing-group.cpp
@@ -10,8 +10,8 @@
  */
 
 #include "display/drawing.h"
-#include "display/drawing-group.h"
 #include "display/drawing-item.h"
+#include "display/drawing-group.h"
 
 
 namespace Inkscape {
diff --git a/src/display/drawing-image.cpp b/src/display/drawing-image.cpp
index d61e04eb5..4be3099bf 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 94a0e7c8f..cc4673bc8 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-group.h"
 #include "display/drawing-item.h"
+#include "display/drawing-group.h"
 #include "display/drawing-pattern.h"
 #include "display/drawing-surface.h"
 #include "nr-filter.h"
 #include "preferences.h"
 #include "style.h"
 
-#include "display/cairo-templates.h"
 #include "display/cairo-utils.h"
+#include "display/cairo-templates.h"
 
 namespace Inkscape {
 
diff --git a/src/display/drawing-shape.cpp b/src/display/drawing-shape.cpp
index ee828cf67..d7329e670 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/path-sink.h>
 #include <2geom/pathvector.h>
+#include <2geom/path-sink.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 6dc8623eb..2752789e2 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/cairo-utils.h"
 #include "display/drawing-context.h"
+#include "display/cairo-utils.h"
 
 namespace Inkscape {
 
diff --git a/src/display/drawing-text.cpp b/src/display/drawing-text.cpp
index f32ca9dc9..3f6b5b34a 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 3b0a3a5b4..71fb94be0 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 6edb2f2f3..5978dbf2a 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 6b060f973..cde10f6c2 100644
--- a/src/display/guideline.cpp
+++ b/src/display/guideline.cpp
@@ -16,14 +16,14 @@
  */
 
 #include <2geom/coord.h>
-#include <2geom/line.h>
 #include <2geom/transforms.h>
+#include <2geom/line.h>
 
+#include "sp-canvas-util.h"
+#include "guideline.h"
 #include "display/cairo-utils.h"
-#include "display/sodipodi-ctrl.h"
 #include "display/sp-canvas.h"
-#include "guideline.h"
-#include "sp-canvas-util.h"
+#include "display/sodipodi-ctrl.h"
 
 static void sp_guideline_destroy(SPCanvasItem *object);
 
diff --git a/src/display/nr-3dutils.cpp b/src/display/nr-3dutils.cpp
index 2305ebcb5..d2ac7d82b 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 <2geom/affine.h>
-#include <2geom/point.h>
 #include <cmath>
+#include <2geom/point.h>
+#include <2geom/affine.h>
 
 namespace NR {
 
diff --git a/src/display/nr-filter-blend.cpp b/src/display/nr-filter-blend.cpp
index 8fddeddd4..49dfc7ec4 100644
--- a/src/display/nr-filter-blend.cpp
+++ b/src/display/nr-filter-blend.cpp
@@ -20,6 +20,7 @@
 #include "config.h"
 #endif
 
+#include <glibmm.h>
 #include "display/cairo-templates.h"
 #include "display/cairo-utils.h"
 #include "display/nr-filter-blend.h"
@@ -27,7 +28,6 @@
 #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 6be1d6640..77873d523 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 968f0c75c..b2545b76f 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 03cddb9ae..2aad528a6 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 8fd8b9784..ed5afa82a 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-color.h"
 #include "svg/svg-icc-color.h"
+#include "svg/svg-color.h"
 
 namespace Inkscape {
 namespace Filters {
diff --git a/src/display/nr-filter-flood.cpp b/src/display/nr-filter-flood.cpp
index da50daf8d..d1fe3e13f 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-color.h"
 #include "svg/svg-icc-color.h"
+#include "svg/svg-color.h"
+#include "color.h"
 
 namespace Inkscape {
 namespace Filters {
diff --git a/src/display/nr-filter-gaussian.cpp b/src/display/nr-filter-gaussian.cpp
index 5e2d28d9a..2227edfef 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-gaussian.h"
 #include "display/nr-filter-primitive.h"
-#include "display/nr-filter-slot.h"
+#include "display/nr-filter-gaussian.h"
 #include "display/nr-filter-types.h"
 #include "display/nr-filter-units.h"
-#include "preferences.h"
-#include "util/fixed_point.h"
+#include "display/nr-filter-slot.h"
 #include <2geom/affine.h>
+#include "util/fixed_point.h"
+#include "preferences.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 27ebece8e..551a86cbf 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-item.h"
 #include "display/drawing.h"
+#include "display/drawing-item.h"
+#include "display/nr-filter.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 2862738ce..fc2ce408f 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 4542cc3b2..a06033e80 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 ed09a608c..ec392ea06 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 "desktop.h"
 #include "inkscape.h"
+#include "desktop.h"
 
 #include "document.h"
 #include "style.h"
diff --git a/src/display/nr-filter-slot.cpp b/src/display/nr-filter-slot.cpp
index 3dc75e801..9d76462c0 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 f51699b24..e8d03d42e 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 <cmath>
 #include <glib.h>
+#include <cmath>
 
 #include "display/cairo-templates.h"
 #include "display/cairo-utils.h"
 #include "display/nr-3dutils.h"
-#include "display/nr-filter-slot.h"
 #include "display/nr-filter-specularlighting.h"
+#include "display/nr-filter-slot.h"
 #include "display/nr-filter-units.h"
 #include "display/nr-filter-utils.h"
 #include "display/nr-light.h"
-#include "svg/svg-color.h"
 #include "svg/svg-icc-color.h"
+#include "svg/svg-color.h"
 
 namespace Inkscape {
 namespace Filters {
diff --git a/src/display/nr-filter-tile.cpp b/src/display/nr-filter-tile.cpp
index 80ea91914..ad4e64768 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-slot.h"
 #include "display/nr-filter-tile.h"
+#include "display/nr-filter-slot.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 524557450..349bcc242 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 26961d5b9..4782f3f54 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 <cairo.h>
+#include <glib.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-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-colormatrix.h"
+#include "display/nr-filter-component-transfer.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-context.h"
+#include "display/drawing.h"
 #include "display/drawing-item.h"
+#include "display/drawing-context.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 e74b94383..47938f00c 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 8038fe16f..31bb27755 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 4797d3fa0..c3354bc0b 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 "svg/svg.h"
+#include "display/curve.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-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"
+#include "object/sp-font.h"
+#include "object/sp-glyph-kerning.h"
 
 // ************************//
 // UserFont Implementation //
diff --git a/src/display/snap-indicator.cpp b/src/display/snap-indicator.cpp
index 0c3a79dbf..f2271e0c6 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 "ui/tools-switch.h"
 #include <glibmm/i18n.h>
+#include "ui/tools-switch.h"
+#include "enums.h"
 
 namespace Inkscape {
 namespace Display {
diff --git a/src/display/sodipodi-ctrl.cpp b/src/display/sodipodi-ctrl.cpp
index c01e91786..04ec947f6 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 e37db95ae..a35f07c3d 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 bafe354b7..25b70824b 100644
--- a/src/display/sp-canvas-util.cpp
+++ b/src/display/sp-canvas-util.cpp
@@ -12,10 +12,10 @@
  */
 
 
-#include "sp-canvas-item.h"
+#include <2geom/affine.h>
 #include "sp-canvas-util.h"
+#include "sp-canvas-item.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 e930f4b37..c717bc7ae 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 "cms-system.h"
-#include "color.h"
-#include "debug/gdk-event-latency-tracker.h"
-#include "desktop.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 <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 <2geom/affine.h>
-#include <2geom/rect.h>
+#include "cms-system.h"
+#include "debug/gdk-event-latency-tracker.h"
+#include "desktop.h"
+#include "color.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 597484191..79ef20d6c 100644
--- a/src/display/sp-ctrlcurve.cpp
+++ b/src/display/sp-ctrlcurve.cpp
@@ -15,11 +15,11 @@
 # include "config.h"
 #endif
 
-#include "color.h"
-#include "display/cairo-utils.h"
+#include "display/sp-ctrlcurve.h"
 #include "display/sp-canvas-util.h"
+#include "display/cairo-utils.h"
+#include "color.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 934b7bae0..c4ced2a33 100644
--- a/src/display/sp-ctrlline.cpp
+++ b/src/display/sp-ctrlline.cpp
@@ -22,11 +22,11 @@
 # include "config.h"
 #endif
 
-#include "color.h"
-#include "display/cairo-utils.h"
+#include "display/sp-ctrlline.h"
 #include "display/sp-canvas-util.h"
+#include "display/cairo-utils.h"
+#include "color.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 d13861c02..760e93a6d 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-util.h"
 #include "sp-canvas.h"
+#include "sp-canvas-util.h"
 #include "sp-ctrlquadr.h"
+#include "display/cairo-utils.h"
+#include "color.h"
 
 struct SPCtrlQuadr : public SPCanvasItem{
     guint32 rgba;