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

77 files changed, 324 insertions, 324 deletions

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)