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

33 files changed, 248 insertions, 248 deletions

diff --git a/src/extension/internal/bitmap/colorize.cpp b/src/extension/internal/bitmap/colorize.cpp
index 1c4b8a696..e0db0ca71 100644
--- a/src/extension/internal/bitmap/colorize.cpp
+++ b/src/extension/internal/bitmap/colorize.cpp
@@ -15,8 +15,8 @@
 
 #include "color.h"
 
-#include <iostream>
 #include <Magick++.h>
+#include <iostream>
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/bitmap/crop.cpp b/src/extension/internal/bitmap/crop.cpp
index 99faef9d3..dee5f111b 100644
--- a/src/extension/internal/bitmap/crop.cpp
+++ b/src/extension/internal/bitmap/crop.cpp
@@ -10,9 +10,9 @@
 #include "extension/system.h"
 
 #include "crop.h"
-#include "selection-chemistry.h"
-#include "object/sp-item.h"
 #include "object/sp-item-transform.h"
+#include "object/sp-item.h"
+#include "selection-chemistry.h"
 #include <Magick++.h>
 
 namespace Inkscape {
diff --git a/src/extension/internal/bitmap/imagemagick.cpp b/src/extension/internal/bitmap/imagemagick.cpp
index 636b9d6a4..f32afa2e5 100644
--- a/src/extension/internal/bitmap/imagemagick.cpp
+++ b/src/extension/internal/bitmap/imagemagick.cpp
@@ -14,8 +14,8 @@
 
 #include <libintl.h>
 
-#include <gtkmm/box.h>
 #include <gtkmm/adjustment.h>
+#include <gtkmm/box.h>
 #include <gtkmm/spinbutton.h>
 
 #include <glib/gstdio.h>
diff --git a/src/extension/internal/bluredge.cpp b/src/extension/internal/bluredge.cpp
index f04007d00..f446227cc 100644
--- a/src/extension/internal/bluredge.cpp
+++ b/src/extension/internal/bluredge.cpp
@@ -12,15 +12,15 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <vector>
 #include "desktop.h"
 #include "document.h"
-#include "selection.h"
-#include "helper/action.h"
 #include "helper/action-context.h"
-#include "preferences.h"
-#include "path-chemistry.h"
+#include "helper/action.h"
 #include "object/sp-item.h"
+#include "path-chemistry.h"
+#include "preferences.h"
+#include "selection.h"
+#include <vector>
 
 #include "extension/effect.h"
 #include "extension/system.h"
diff --git a/src/extension/internal/cairo-png-out.cpp b/src/extension/internal/cairo-png-out.cpp
index 3cdbee8c1..c4d33252d 100644
--- a/src/extension/internal/cairo-png-out.cpp
+++ b/src/extension/internal/cairo-png-out.cpp
@@ -22,20 +22,20 @@
 #include "cairo-png-out.h"
 #include "cairo-render-context.h"
 #include "cairo-renderer.h"
-#include <print.h>
-#include "extension/system.h"
-#include "extension/print.h"
+#include "display/drawing.h"
 #include "extension/db.h"
 #include "extension/output.h"
-#include "display/drawing.h"
+#include "extension/print.h"
+#include "extension/system.h"
+#include <print.h>
 
-#include "display/curve.h"
 #include "display/canvas-bpath.h"
+#include "display/curve.h"
 #include "object/sp-item.h"
 #include "object/sp-root.h"
 
-#include "io/sys.h"
 #include "document.h"
+#include "io/sys.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp
index 287cf636f..08c748175 100644
--- a/src/extension/internal/cairo-ps-out.cpp
+++ b/src/extension/internal/cairo-ps-out.cpp
@@ -24,21 +24,21 @@
 #include "cairo-ps-out.h"
 #include "cairo-render-context.h"
 #include "cairo-renderer.h"
-#include "latex-text-renderer.h"
-#include <print.h>
-#include "extension/system.h"
-#include "extension/print.h"
+#include "display/drawing.h"
 #include "extension/db.h"
 #include "extension/output.h"
-#include "display/drawing.h"
+#include "extension/print.h"
+#include "extension/system.h"
+#include "latex-text-renderer.h"
+#include <print.h>
 
-#include "display/curve.h"
 #include "display/canvas-bpath.h"
+#include "display/curve.h"
 #include "object/sp-item.h"
 #include "object/sp-root.h"
 
-#include "io/sys.h"
 #include "document.h"
+#include "io/sys.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp
index 1878b2c89..8bdf25ee4 100644
--- a/src/extension/internal/cairo-render-context.cpp
+++ b/src/extension/internal/cairo-render-context.cpp
@@ -25,26 +25,26 @@
 #endif
 
 
-#include <signal.h>
-#include <errno.h>
 #include <2geom/pathvector.h>
+#include <errno.h>
+#include <signal.h>
 
 #include <glib.h>
 
-#include <glibmm/i18n.h>
-#include "display/drawing.h"
-#include "display/curve.h"
-#include "display/canvas-bpath.h"
 #include "display/cairo-utils.h"
-#include "object/sp-item.h"
-#include "object/sp-item-group.h"
+#include "display/canvas-bpath.h"
+#include "display/curve.h"
+#include "display/drawing.h"
+#include "object/sp-clippath.h"
 #include "object/sp-hatch.h"
+#include "object/sp-item-group.h"
+#include "object/sp-item.h"
 #include "object/sp-linear-gradient.h"
-#include "object/sp-radial-gradient.h"
+#include "object/sp-mask.h"
 #include "object/sp-mesh-gradient.h"
 #include "object/sp-pattern.h"
-#include "object/sp-mask.h"
-#include "object/sp-clippath.h"
+#include "object/sp-radial-gradient.h"
+#include <glibmm/i18n.h>
 
 #include "util/units.h"
 #ifdef WIN32
diff --git a/src/extension/internal/cairo-renderer-pdf-out.cpp b/src/extension/internal/cairo-renderer-pdf-out.cpp
index 5b9759c15..91e152706 100644
--- a/src/extension/internal/cairo-renderer-pdf-out.cpp
+++ b/src/extension/internal/cairo-renderer-pdf-out.cpp
@@ -23,21 +23,21 @@
 #include "cairo-renderer-pdf-out.h"
 #include "cairo-render-context.h"
 #include "cairo-renderer.h"
-#include "latex-text-renderer.h"
-#include <print.h>
-#include "extension/system.h"
-#include "extension/print.h"
+#include "display/drawing.h"
 #include "extension/db.h"
 #include "extension/output.h"
-#include "display/drawing.h"
+#include "extension/print.h"
+#include "extension/system.h"
+#include "latex-text-renderer.h"
+#include <print.h>
 
-#include "display/curve.h"
 #include "display/canvas-bpath.h"
+#include "display/curve.h"
 #include "object/sp-item.h"
 #include "object/sp-root.h"
 
-#include <2geom/affine.h>
 #include "document.h"
+#include <2geom/affine.h>
 
 #include "util/units.h"
 
diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp
index b48be2ed7..ecaeeb5d2 100644
--- a/src/extension/internal/cairo-renderer.cpp
+++ b/src/extension/internal/cairo-renderer.cpp
@@ -25,48 +25,48 @@
 #endif
 
 
-#include <signal.h>
 #include <errno.h>
+#include <signal.h>
 
 #include "libnrtype/Layout-TNG.h"
-#include <2geom/transforms.h>
 #include <2geom/pathvector.h>
+#include <2geom/transforms.h>
 
 #include <glib.h>
 
-#include <glibmm/i18n.h>
-#include "display/curve.h"
-#include "display/canvas-bpath.h"
 #include "display/cairo-utils.h"
-#include "object/sp-item.h"
+#include "display/canvas-bpath.h"
+#include "display/curve.h"
+#include "object/sp-clippath.h"
+#include "object/sp-flowtext.h"
+#include "object/sp-hatch-path.h"
+#include "object/sp-image.h"
 #include "object/sp-item-group.h"
-#include "object/sp-marker.h"
+#include "object/sp-item.h"
 #include "object/sp-linear-gradient.h"
+#include "object/sp-marker.h"
+#include "object/sp-mask.h"
+#include "object/sp-pattern.h"
 #include "object/sp-radial-gradient.h"
 #include "object/sp-root.h"
 #include "object/sp-shape.h"
-#include "object/sp-use.h"
-#include "object/sp-text.h"
-#include "object/sp-flowtext.h"
-#include "object/sp-hatch-path.h"
-#include "object/sp-image.h"
 #include "object/sp-symbol.h"
-#include "object/sp-pattern.h"
-#include "object/sp-mask.h"
-#include "object/sp-clippath.h"
+#include "object/sp-text.h"
+#include "object/sp-use.h"
+#include <glibmm/i18n.h>
 
-#include "util/units.h"
-#include "helper/png-write.h"
 #include "helper/pixbuf-ops.h"
+#include "helper/png-write.h"
+#include "util/units.h"
 
-#include "cairo-renderer.h"
 #include "cairo-render-context.h"
+#include "cairo-renderer.h"
 #include "extension/system.h"
 
 #include "io/sys.h"
 
-#include <cairo.h>
 #include "document.h"
+#include <cairo.h>
 
 // include support for only the compiled-in surface types
 #ifdef CAIRO_HAS_PDF_SURFACE
diff --git a/src/extension/internal/cdr-input.cpp b/src/extension/internal/cdr-input.cpp
index bfba67282..00165032d 100644
--- a/src/extension/internal/cdr-input.cpp
+++ b/src/extension/internal/cdr-input.cpp
@@ -13,15 +13,15 @@
  *
  */
 
-#include <stdio.h>
 #include "config.h"
+#include <stdio.h>
 
 #include "cdr-input.h"
 
 #ifdef WITH_LIBCDR
 
-#include <string>
 #include <cstring>
+#include <string>
 
 #include <libcdr/libcdr.h>
 
@@ -43,11 +43,11 @@
 #include <gtkmm/grid.h>
 #include <gtkmm/spinbutton.h>
 
-#include "extension/system.h"
 #include "extension/input.h"
+#include "extension/system.h"
 
-#include "document.h"
 #include "document-private.h"
+#include "document.h"
 #include "inkscape.h"
 
 #include "ui/dialog-events.h"
diff --git a/src/extension/internal/emf-inout.cpp b/src/extension/internal/emf-inout.cpp
index 54099271b..f5335eaf6 100644
--- a/src/extension/internal/emf-inout.cpp
+++ b/src/extension/internal/emf-inout.cpp
@@ -27,29 +27,29 @@
 # include "config.h"
 #endif
 
+#include <3rdparty/libuemf/symbol_convert.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdint.h>
-#include <3rdparty/libuemf/symbol_convert.h>
 
+#include "clear-n_.h"
+#include "display/drawing-item.h"
+#include "display/drawing.h"
 #include "document.h"
-#include "object/sp-root.h"
-#include "object/sp-path.h"
-#include "print.h"
-#include "extension/system.h"
-#include "extension/print.h"
 #include "extension/db.h"
 #include "extension/input.h"
 #include "extension/output.h"
-#include "display/drawing.h"
-#include "display/drawing-item.h"
-#include "clear-n_.h"
+#include "extension/print.h"
+#include "extension/system.h"
+#include "inkscape.h"   // even though it is included indirectly by emf-inout.h
+#include "object/sp-path.h"
+#include "object/sp-root.h"
+#include "print.h"
 #include "svg/svg.h"
 #include "util/units.h" // even though it is included indirectly by emf-inout.h
-#include "inkscape.h"   // even though it is included indirectly by emf-inout.h
 
-#include "emf-print.h"
 #include "emf-inout.h"
+#include "emf-print.h"
 
 #define PRINT_EMF "org.inkscape.print.emf"
 
diff --git a/src/extension/internal/emf-print.cpp b/src/extension/internal/emf-print.cpp
index 0b005f8da..dedd241a5 100644
--- a/src/extension/internal/emf-print.cpp
+++ b/src/extension/internal/emf-print.cpp
@@ -26,42 +26,42 @@
 # include "config.h"
 #endif
 
-#include <string.h>
-#include <glibmm/miscutils.h>
-#include <3rdparty/libuemf/symbol_convert.h>
-#include <2geom/sbasis-to-bezier.h>
+#include <2geom/curves.h>
 #include <2geom/path.h>
 #include <2geom/pathvector.h>
 #include <2geom/rect.h>
-#include <2geom/curves.h>
+#include <2geom/sbasis-to-bezier.h>
+#include <3rdparty/libuemf/symbol_convert.h>
+#include <glibmm/miscutils.h>
+#include <string.h>
 
-#include "helper/geom.h"
 #include "helper/geom-curves.h"
+#include "helper/geom.h"
 #include "util/units.h"
 
 #include "inkscape-version.h"
 
-#include "extension/system.h"
-#include "extension/print.h"
 #include "document.h"
+#include "extension/print.h"
+#include "extension/system.h"
 #include "path-prefix.h"
 
-#include "object/sp-pattern.h"
-#include "object/sp-image.h"
+#include "display/cairo-utils.h"
+#include "object/sp-clippath.h"
 #include "object/sp-gradient.h"
-#include "object/sp-radial-gradient.h"
-#include "object/sp-linear-gradient.h"
+#include "object/sp-image.h"
 #include "object/sp-item.h"
+#include "object/sp-linear-gradient.h"
+#include "object/sp-pattern.h"
+#include "object/sp-radial-gradient.h"
 #include "object/sp-root.h"
 #include "object/sp-shape.h"
-#include "object/sp-clippath.h"
 #include "style.h"
-#include "display/cairo-utils.h"
 
-#include "splivarot.h"             // pieces for union on shapes
 #include "2geom/svg-path-parser.h" // to get from SVG text to Geom::Path
-#include "display/canvas-bpath.h"  // for SPWindRule
 #include "display/cairo-utils.h"  // for Inkscape::Pixbuf::PF_CAIRO
+#include "display/canvas-bpath.h"  // for SPWindRule
+#include "splivarot.h"             // pieces for union on shapes
 
 #include "emf-print.h"
 
diff --git a/src/extension/internal/filter/filter-file.cpp b/src/extension/internal/filter/filter-file.cpp
index c18879430..962381da6 100644
--- a/src/extension/internal/filter/filter-file.cpp
+++ b/src/extension/internal/filter/filter-file.cpp
@@ -7,21 +7,21 @@
 
 #include "filter.h"
 
-#include "io/sys.h"
-#include "io/resource.h"
 #include "io/inkscapestream.h"
+#include "io/resource.h"
+#include "io/sys.h"
 
 /* Directory includes */
-#include "path-prefix.h"
 #include "inkscape.h"
+#include "path-prefix.h"
 
 /* Extension */
 #include "extension/extension.h"
 #include "extension/system.h"
 
 /* System includes */
-#include <glibmm/i18n.h>
 #include <glibmm/fileutils.h>
+#include <glibmm/i18n.h>
 
 using namespace Inkscape::IO::Resource;
 
diff --git a/src/extension/internal/filter/filter.cpp b/src/extension/internal/filter/filter.cpp
index 166e5406f..99dfffc6c 100644
--- a/src/extension/internal/filter/filter.cpp
+++ b/src/extension/internal/filter/filter.cpp
@@ -8,15 +8,15 @@
  */
 
 #include "desktop.h"
-#include "selection.h"
 #include "document-private.h"
-#include "extension/extension.h"
 #include "extension/effect.h"
+#include "extension/extension.h"
 #include "extension/system.h"
+#include "object/sp-defs.h"
+#include "selection.h"
+#include "xml/attribute-record.h"
 #include "xml/repr.h"
 #include "xml/simple-node.h"
-#include "xml/attribute-record.h"
-#include "object/sp-defs.h"
 
 #include "filter.h"
 
diff --git a/src/extension/internal/gdkpixbuf-input.cpp b/src/extension/internal/gdkpixbuf-input.cpp
index efac1a02e..7cfaded41 100644
--- a/src/extension/internal/gdkpixbuf-input.cpp
+++ b/src/extension/internal/gdkpixbuf-input.cpp
@@ -2,21 +2,21 @@
 #include <gdkmm/pixbuf.h>
 #include <gdkmm/pixbufformat.h>
 
-#include <glib/gprintf.h>
-#include <glibmm/i18n.h>
 #include "dir-util.h"
 #include "display/cairo-utils.h"
 #include "document-private.h"
 #include "document-undo.h"
 #include "extension/input.h"
 #include "extension/system.h"
-#include "image-resolution.h"
 #include "gdkpixbuf-input.h"
-#include "preferences.h"
-#include "selection-chemistry.h"
+#include "image-resolution.h"
 #include "object/sp-image.h"
 #include "object/sp-root.h"
+#include "preferences.h"
+#include "selection-chemistry.h"
 #include "util/units.h"
+#include <glib/gprintf.h>
+#include <glibmm/i18n.h>
 #include <set>
 
 namespace Inkscape {
diff --git a/src/extension/internal/gimpgrad.cpp b/src/extension/internal/gimpgrad.cpp
index e6a429d34..fbae04ca5 100644
--- a/src/extension/internal/gimpgrad.cpp
+++ b/src/extension/internal/gimpgrad.cpp
@@ -16,17 +16,17 @@
 # include <config.h>
 #endif
 
-#include <color-rgba.h>
 #include "io/sys.h"
 #include "extension/system.h"
 #include "svg/css-ostringstream.h"
 #include "svg/svg-color.h"
+#include <color-rgba.h>
 
+#include "document.h"
+#include "extension/extension.h"
 #include "gimpgrad.h"
 #include "streq.h"
 #include "strneq.h"
-#include "document.h"
-#include "extension/extension.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/grid.cpp b/src/extension/internal/grid.cpp
index c7ebf2494..e77525f1b 100644
--- a/src/extension/internal/grid.cpp
+++ b/src/extension/internal/grid.cpp
@@ -15,15 +15,15 @@
 # include <config.h>
 #endif
 
-#include <gtkmm/box.h>
 #include <gtkmm/adjustment.h>
+#include <gtkmm/box.h>
 #include <gtkmm/spinbutton.h>
 
 #include "desktop.h"
 
+#include "2geom/geom.h"
 #include "document.h"
 #include "selection.h"
-#include "2geom/geom.h"
 
 #include "svg/path-string.h"
 
diff --git a/src/extension/internal/javafx-out.cpp b/src/extension/internal/javafx-out.cpp
index d4666fcee..7608454e7 100644
--- a/src/extension/internal/javafx-out.cpp
+++ b/src/extension/internal/javafx-out.cpp
@@ -21,31 +21,31 @@
 # include <config.h>
 #endif
 
-#include <glibmm/miscutils.h>
+#include "helper/geom-curves.h"
+#include "helper/geom.h"
 #include "javafx-out.h"
-#include <inkscape.h>
-#include <inkscape-version.h>
-#include <display/curve.h>
-#include <display/canvas-bpath.h>
-#include <svg/svg.h>
-#include <extension/system.h>
+#include <2geom/curves.h>
 #include <2geom/pathvector.h>
 #include <2geom/rect.h>
-#include <2geom/curves.h>
-#include "helper/geom.h"
-#include "helper/geom-curves.h"
+#include <display/canvas-bpath.h>
+#include <display/curve.h>
+#include <extension/system.h>
+#include <glibmm/miscutils.h>
+#include <inkscape-version.h>
+#include <inkscape.h>
 #include <io/sys.h>
+#include <svg/svg.h>
 
-#include "object/sp-root.h"
-#include "object/sp-path.h"
 #include "object/sp-linear-gradient.h"
+#include "object/sp-path.h"
 #include "object/sp-radial-gradient.h"
+#include "object/sp-root.h"
 #include "style.h"
 
-#include <string>
-#include <stdio.h>
-#include <stdarg.h>
 #include "extension/extension.h"
+#include <stdarg.h>
+#include <stdio.h>
+#include <string>
 
 
 namespace Inkscape
diff --git a/src/extension/internal/latex-pstricks-out.cpp b/src/extension/internal/latex-pstricks-out.cpp
index 0581f8edd..8d2e67c43 100644
--- a/src/extension/internal/latex-pstricks-out.cpp
+++ b/src/extension/internal/latex-pstricks-out.cpp
@@ -13,12 +13,12 @@
 # include <config.h>
 #endif
 #include "latex-pstricks-out.h"
-#include <print.h>
-#include "extension/system.h"
-#include "extension/print.h"
-#include "extension/db.h"
 #include "display/drawing.h"
+#include "extension/db.h"
+#include "extension/print.h"
+#include "extension/system.h"
 #include "object/sp-root.h"
+#include <print.h>
 
 
 #include "document.h"
diff --git a/src/extension/internal/latex-pstricks.cpp b/src/extension/internal/latex-pstricks.cpp
index 83100d11e..23dcd002f 100644
--- a/src/extension/internal/latex-pstricks.cpp
+++ b/src/extension/internal/latex-pstricks.cpp
@@ -15,21 +15,21 @@
 #endif
 
 
+#include "helper/geom-curves.h"
+#include "util/units.h"
+#include <2geom/curves.h>
 #include <2geom/pathvector.h>
 #include <2geom/sbasis-to-bezier.h>
-#include <2geom/curves.h>
 #include <errno.h>
 #include <signal.h>
-#include "util/units.h"
-#include "helper/geom-curves.h"
 
+#include "document.h"
 #include "extension/print.h"
 #include "extension/system.h"
 #include "inkscape-version.h"
 #include "io/sys.h"
 #include "latex-pstricks.h"
 #include "style.h"
-#include "document.h"
 #include <cstring>
 
 namespace Inkscape {
diff --git a/src/extension/internal/latex-text-renderer.cpp b/src/extension/internal/latex-text-renderer.cpp
index 85426e376..b16c78826 100644
--- a/src/extension/internal/latex-text-renderer.cpp
+++ b/src/extension/internal/latex-text-renderer.cpp
@@ -21,21 +21,21 @@
 
 #include "latex-text-renderer.h"
 
-#include <signal.h>
 #include <errno.h>
+#include <signal.h>
 
 #include "libnrtype/Layout-TNG.h"
-#include <2geom/transforms.h>
 #include <2geom/rect.h>
+#include <2geom/transforms.h>
 #include <glibmm/i18n.h>
 
-#include "object/sp-item.h"
+#include "object/sp-flowtext.h"
 #include "object/sp-item-group.h"
+#include "object/sp-item.h"
+#include "object/sp-rect.h"
 #include "object/sp-root.h"
-#include "object/sp-use.h"
 #include "object/sp-text.h"
-#include "object/sp-flowtext.h"
-#include "object/sp-rect.h"
+#include "object/sp-use.h"
 #include "style.h"
 
 #include "text-editing.h"
@@ -45,9 +45,9 @@
 #include "extension/output.h"
 #include "extension/system.h"
 
+#include "document.h"
 #include "inkscape-version.h"
 #include "io/sys.h"
-#include "document.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/metafile-inout.cpp b/src/extension/internal/metafile-inout.cpp
index ae79c8a8a..2d8d17cfe 100644
--- a/src/extension/internal/metafile-inout.cpp
+++ b/src/extension/internal/metafile-inout.cpp
@@ -18,18 +18,18 @@
 #include <glibmm/miscutils.h>
 
 #include "display/curve.h"
+#include "document-undo.h"
+#include "document.h"
 #include "extension/internal/metafile-inout.h" // picks up PNG
 #include "extension/print.h"
-#include "path-prefix.h"
-#include "document.h"
-#include "util/units.h"
-#include "ui/shape-editor.h"
-#include "document-undo.h"
 #include "inkscape.h"
+#include "path-prefix.h"
 #include "preferences.h"
+#include "ui/shape-editor.h"
+#include "util/units.h"
 
-#include "object/sp-root.h"
 #include "object/sp-namedview.h"
+#include "object/sp-root.h"
 #include "svg/stringstream.h"
 
 namespace Inkscape {
diff --git a/src/extension/internal/metafile-print.cpp b/src/extension/internal/metafile-print.cpp
index fb44f8499..43e605491 100644
--- a/src/extension/internal/metafile-print.cpp
+++ b/src/extension/internal/metafile-print.cpp
@@ -12,22 +12,22 @@
 # include "config.h"
 #endif
 
+#include <2geom/curves.h>
+#include <2geom/rect.h>
+#include <2geom/svg-path-parser.h>
 #include <cstring>
 #include <fstream>
 #include <glib.h>
 #include <glibmm/miscutils.h>
-#include <2geom/rect.h>
-#include <2geom/curves.h>
-#include <2geom/svg-path-parser.h>
 
 #include "extension/internal/metafile-print.h"
 #include "extension/print.h"
-#include "path-prefix.h"
 #include "object/sp-gradient.h"
 #include "object/sp-image.h"
 #include "object/sp-linear-gradient.h"
 #include "object/sp-pattern.h"
 #include "object/sp-radial-gradient.h"
+#include "path-prefix.h"
 #include "style.h"
 
 namespace Inkscape {
diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp
index 42c2bbae3..689bd0101 100644
--- a/src/extension/internal/odf.cpp
+++ b/src/extension/internal/odf.cpp
@@ -44,48 +44,48 @@
 #include "odf.h"
 
 //# System includes
+#include <math.h>
 #include <stdio.h>
 #include <time.h>
 #include <vector>
-#include <math.h>
 
 //# Inkscape includes
 #include "clear-n_.h"
-#include "inkscape.h"
 #include "display/curve.h"
-#include <2geom/pathvector.h>
+#include "extension/system.h"
+#include "helper/geom-curves.h"
+#include "inkscape.h"
 #include <2geom/curves.h>
+#include <2geom/pathvector.h>
 #include <2geom/transforms.h>
 #include <helper/geom.h>
-#include "helper/geom-curves.h"
-#include "extension/system.h"
 
-#include "xml/repr.h"
-#include "xml/attribute-record.h"
-#include "object/sp-image.h"
+#include "object/sp-flowtext.h"
 #include "object/sp-gradient.h"
-#include "object/sp-stop.h"
+#include "object/sp-image.h"
 #include "object/sp-linear-gradient.h"
-#include "object/sp-radial-gradient.h"
 #include "object/sp-path.h"
+#include "object/sp-radial-gradient.h"
+#include "object/sp-stop.h"
 #include "object/sp-text.h"
-#include "object/sp-flowtext.h"
 #include "object/uri.h"
 #include "style.h"
+#include "xml/attribute-record.h"
+#include "xml/repr.h"
 
 #include "svg/svg.h"
 #include "text-editing.h"
 #include "util/units.h"
 
 
-#include "inkscape-version.h"
 #include "document.h"
 #include "extension/extension.h"
+#include "inkscape-version.h"
 
-#include "io/inkscapestream.h"
 #include "io/bufferstream.h"
-#include <util/ziptool.h>
+#include "io/inkscapestream.h"
 #include <iomanip>
+#include <util/ziptool.h>
 namespace Inkscape
 {
 namespace Extension
diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
index 552051eed..1f37befaa 100644
--- a/src/extension/internal/pdfinput/pdf-input.cpp
+++ b/src/extension/internal/pdfinput/pdf-input.cpp
@@ -18,17 +18,17 @@
 #include "pdf-input.h"
 
 #ifdef HAVE_POPPLER
-#include <poppler/goo/GooString.h>
+#include <poppler/Catalog.h>
 #include <poppler/ErrorCodes.h>
 #include <poppler/GlobalParams.h>
 #include <poppler/PDFDoc.h>
 #include <poppler/Page.h>
-#include <poppler/Catalog.h>
+#include <poppler/goo/GooString.h>
 
 #ifdef HAVE_POPPLER_CAIRO
-#include <poppler/glib/poppler.h>
 #include <poppler/glib/poppler-document.h>
 #include <poppler/glib/poppler-page.h>
+#include <poppler/glib/poppler.h>
 #endif
 
 #include <gtkmm/checkbutton.h>
@@ -39,18 +39,18 @@
 #include <gtkmm/scale.h>
 
 #include <glibmm/convert.h>
+#include <glibmm/i18n.h>
 #include <glibmm/miscutils.h>
 #include <gtk/gtk.h>
-#include <glibmm/i18n.h>
 
 #include "ui/dialog-events.h"
-#include "ui/widget/spinbutton.h"
 #include "ui/widget/frame.h"
+#include "ui/widget/spinbutton.h"
 
-#include "extension/system.h"
 #include "extension/input.h"
-#include "svg-builder.h"
+#include "extension/system.h"
 #include "pdf-parser.h"
+#include "svg-builder.h"
 
 #include "document-private.h"
 #include "document-undo.h"
diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
index 6c498f981..2bc7ada12 100644
--- a/src/extension/internal/pdfinput/pdf-parser.cpp
+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
@@ -23,36 +23,36 @@
 
 extern "C" {
         
-#include <stdlib.h>
-#include <stdio.h>
+#include <math.h>
 #include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <math.h>
 
 }
 
-#include "svg-builder.h"
 #include "Gfx.h"
 #include "pdf-parser.h"
+#include "svg-builder.h"
 #include "util/units.h"
 
-#include "goo/gmem.h"
-#include "goo/GooTimer.h"
-#include "goo/GooHash.h"
-#include "GlobalParams.h"
-#include "CharTypes.h"
-#include "Object.h"
+#include "Annot.h"
 #include "Array.h"
+#include "CharTypes.h"
 #include "Dict.h"
-#include "Stream.h"
-#include "Lexer.h"
-#include "Parser.h"
+#include "Error.h"
 #include "GfxFont.h"
 #include "GfxState.h"
+#include "GlobalParams.h"
+#include "Lexer.h"
+#include "Object.h"
 #include "OutputDev.h"
 #include "Page.h"
-#include "Annot.h"
-#include "Error.h"
+#include "Parser.h"
+#include "Stream.h"
+#include "goo/GooHash.h"
+#include "goo/GooTimer.h"
+#include "goo/gmem.h"
 
 // the MSVC math.h doesn't define this
 #ifndef M_PI
diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
index 8e5a5f639..1f3c76b3a 100644
--- a/src/extension/internal/pdfinput/svg-builder.cpp
+++ b/src/extension/internal/pdfinput/svg-builder.cpp
@@ -19,34 +19,34 @@
 
 #ifdef HAVE_POPPLER
 
-#include "svg-builder.h"
 #include "pdf-parser.h"
+#include "svg-builder.h"
 
 #include <png.h>
 
-#include "document-private.h"
-#include "xml/document.h"
-#include "xml/node.h"
-#include "xml/repr.h"
-#include "svg/svg.h"
-#include "svg/path-string.h"
-#include "svg/css-ostringstream.h"
-#include "svg/svg-color.h"
 #include "color.h"
-#include "util/units.h"
-#include "io/stringstream.h"
-#include "io/base64stream.h"
 #include "display/nr-filter-utils.h"
+#include "document-private.h"
+#include "io/base64stream.h"
+#include "io/stringstream.h"
 #include "libnrtype/font-instance.h"
 #include "object/sp-defs.h"
+#include "svg/css-ostringstream.h"
+#include "svg/path-string.h"
+#include "svg/svg-color.h"
+#include "svg/svg.h"
+#include "util/units.h"
+#include "xml/document.h"
+#include "xml/node.h"
+#include "xml/repr.h"
 
 #include "Function.h"
-#include "GfxState.h"
 #include "GfxFont.h"
-#include "Stream.h"
+#include "GfxState.h"
+#include "GlobalParams.h"
 #include "Page.h"
+#include "Stream.h"
 #include "UnicodeMap.h"
-#include "GlobalParams.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/pov-out.cpp b/src/extension/internal/pov-out.cpp
index 15acb97ec..a53133e8d 100644
--- a/src/extension/internal/pov-out.cpp
+++ b/src/extension/internal/pov-out.cpp
@@ -22,26 +22,26 @@
 # include <config.h>
 #endif
 #include "pov-out.h"
-#include <inkscape.h>
-#include <inkscape-version.h>
-#include <display/curve.h>
-#include <extension/system.h>
+#include "helper/geom-curves.h"
+#include "helper/geom.h"
+#include <2geom/curves.h>
 #include <2geom/pathvector.h>
 #include <2geom/rect.h>
-#include <2geom/curves.h>
-#include "helper/geom.h"
-#include "helper/geom-curves.h"
+#include <display/curve.h>
+#include <extension/system.h>
+#include <inkscape-version.h>
+#include <inkscape.h>
 #include <io/sys.h>
 
-#include "object/sp-root.h"
 #include "object/sp-path.h"
+#include "object/sp-root.h"
 #include "style.h"
 
-#include <string>
-#include <stdio.h>
-#include <stdarg.h>
 #include "document.h"
 #include "extension/extension.h"
+#include <stdarg.h>
+#include <stdio.h>
+#include <string>
 
 
 namespace Inkscape
diff --git a/src/extension/internal/svg.cpp b/src/extension/internal/svg.cpp
index 7bf4f34e6..780f8d6bc 100644
--- a/src/extension/internal/svg.cpp
+++ b/src/extension/internal/svg.cpp
@@ -18,17 +18,17 @@
 # include <config.h>
 #endif
 
-#include <vector>
 #include <giomm/file.h>
+#include <vector>
 
 
-#include "svg.h"
-#include "file.h"
-#include "extension/system.h"
+#include "document.h"
 #include "extension/output.h"
+#include "extension/system.h"
+#include "file.h"
+#include "svg.h"
 #include "xml/attribute-record.h"
 #include "xml/simple-document.h"
-#include "document.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/vsd-input.cpp b/src/extension/internal/vsd-input.cpp
index 7c92a895d..6069fc2af 100644
--- a/src/extension/internal/vsd-input.cpp
+++ b/src/extension/internal/vsd-input.cpp
@@ -13,15 +13,15 @@
  *
  */
 
-#include <stdio.h>
 #include "config.h"
+#include <stdio.h>
 
 #include "vsd-input.h"
 
 #ifdef WITH_LIBVISIO
 
-#include <string>
 #include <cstring>
+#include <string>
 
 #include <libvisio/libvisio.h>
 
@@ -42,11 +42,11 @@
 
 #include <gtkmm/spinbutton.h>
 
-#include "extension/system.h"
 #include "extension/input.h"
+#include "extension/system.h"
 
-#include "document.h"
 #include "document-private.h"
+#include "document.h"
 #include "inkscape.h"
 
 #include "ui/dialog-events.h"
diff --git a/src/extension/internal/wmf-inout.cpp b/src/extension/internal/wmf-inout.cpp
index 45f59ec03..7d810b456 100644
--- a/src/extension/internal/wmf-inout.cpp
+++ b/src/extension/internal/wmf-inout.cpp
@@ -28,26 +28,26 @@
 #endif
 
 //#include <png.h>   //This must precede text_reassemble.h or it blows up in pngconf.h when compiling
+#include <3rdparty/libuemf/symbol_convert.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdint.h>
-#include <3rdparty/libuemf/symbol_convert.h>
 
+#include "clear-n_.h"
+#include "display/drawing-item.h"
+#include "display/drawing.h"
 #include "document.h"
-#include "object/sp-root.h" // even though it is included indirectly by wmf-inout.h
-#include "object/sp-path.h"
-#include "print.h"
-#include "extension/system.h"
-#include "extension/print.h"
 #include "extension/db.h"
 #include "extension/input.h"
 #include "extension/output.h"
-#include "display/drawing.h"
-#include "display/drawing-item.h"
-#include "clear-n_.h"
+#include "extension/print.h"
+#include "extension/system.h"
+#include "inkscape.h" // even though it is included indirectly by wmf-inout.h
+#include "object/sp-path.h"
+#include "object/sp-root.h" // even though it is included indirectly by wmf-inout.h
+#include "print.h"
 #include "svg/svg.h"
 #include "util/units.h" // even though it is included indirectly by wmf-inout.h
-#include "inkscape.h" // even though it is included indirectly by wmf-inout.h
 
 
 #include "wmf-inout.h"
diff --git a/src/extension/internal/wmf-print.cpp b/src/extension/internal/wmf-print.cpp
index cdc59298b..feb6e78de 100644
--- a/src/extension/internal/wmf-print.cpp
+++ b/src/extension/internal/wmf-print.cpp
@@ -29,42 +29,42 @@
 #endif
 
 
-#include <2geom/sbasis-to-bezier.h>
 #include <2geom/elliptical-arc.h>
+#include <2geom/sbasis-to-bezier.h>
 
+#include "helper/geom-curves.h"
+#include "helper/geom.h"
+#include <2geom/curves.h>
 #include <2geom/path.h>
 #include <2geom/pathvector.h>
 #include <2geom/rect.h>
-#include <2geom/curves.h>
-#include "helper/geom.h"
-#include "helper/geom-curves.h"
 
 #include "inkscape-version.h"
 
 #include "util/units.h"
 
-#include "extension/system.h"
-#include "extension/print.h"
 #include "document.h"
+#include "extension/print.h"
+#include "extension/system.h"
 #include "path-prefix.h"
 
-#include "object/sp-pattern.h"
-#include "object/sp-image.h"
 #include "object/sp-gradient.h"
-#include "object/sp-radial-gradient.h"
+#include "object/sp-image.h"
+#include "object/sp-item.h"
 #include "object/sp-linear-gradient.h"
+#include "object/sp-pattern.h"
+#include "object/sp-radial-gradient.h"
 #include "object/sp-root.h"
-#include "object/sp-item.h"
 
+#include "display/cairo-utils.h"   // for Inkscape::Pixbuf::PF_CAIRO
+#include "display/canvas-bpath.h"  // for SPWindRule
 #include "splivarot.h"             // pieces for union on shapes
 #include <2geom/svg-path-parser.h> // to get from SVG text to Geom::Path
-#include "display/canvas-bpath.h"  // for SPWindRule
-#include "display/cairo-utils.h"   // for Inkscape::Pixbuf::PF_CAIRO
 
 #include "wmf-print.h"
 
-#include <string.h>
 #include <3rdparty/libuemf/symbol_convert.h>
+#include <string.h>
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/wpg-input.cpp b/src/extension/internal/wpg-input.cpp
index 2f3bfe27b..8a4f0d24c 100644
--- a/src/extension/internal/wpg-input.cpp
+++ b/src/extension/internal/wpg-input.cpp
@@ -39,17 +39,17 @@
  * Corel Corporation or Corel Corporation Limited."
  */
 
-#include <stdio.h>
 #include "config.h"
+#include <stdio.h>
 
 #ifdef WITH_LIBWPG
 
-#include "wpg-input.h"
-#include "extension/system.h"
-#include "extension/input.h"
 #include "document.h"
+#include "extension/input.h"
+#include "extension/system.h"
 #include "object/sp-root.h"
 #include "util/units.h"
+#include "wpg-input.h"
 #include <cstring>
 
 // Take a guess and fallback to 0.2.x if no configure has run