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

This reverts commit bba4ff6672494fab59286b50f6c645ad62a47e60.

58 files changed, 350 insertions, 350 deletions

diff --git a/src/extension/db.cpp b/src/extension/db.cpp
index c821cae67..e885d3531 100644
--- a/src/extension/db.cpp
+++ b/src/extension/db.cpp
@@ -16,9 +16,9 @@
 #include <config.h>
 #endif
 #include "db.h"
-#include "effect.h"
 #include "input.h"
 #include "output.h"
+#include "effect.h"
 
 /* Globals */
 
diff --git a/src/extension/dependency.cpp b/src/extension/dependency.cpp
index d9c270dc9..5e843ee11 100644
--- a/src/extension/dependency.cpp
+++ b/src/extension/dependency.cpp
@@ -12,13 +12,13 @@
 #include <config.h>
 #endif
 
-#include "db.h"
+#include <glibmm/i18n.h>
+#include <glibmm/fileutils.h>
+#include <glibmm/miscutils.h>
 #include "dependency.h"
+#include "db.h"
 #include "extension.h"
 #include "io/resource.h"
-#include <glibmm/fileutils.h>
-#include <glibmm/i18n.h>
-#include <glibmm/miscutils.h>
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/effect.cpp b/src/extension/effect.cpp
index d13444296..e475b58a0 100644
--- a/src/extension/effect.cpp
+++ b/src/extension/effect.cpp
@@ -9,14 +9,14 @@
  */
 
 #include "prefdialog.h"
-#include "helper/action.h"
 #include "inkscape.h"
+#include "helper/action.h"
 #include "ui/view/view.h"
 
 #include "desktop.h"
+#include "implementation/implementation.h"
 #include "effect.h"
 #include "execution-env.h"
-#include "implementation/implementation.h"
 #include "timer.h"
 
 
diff --git a/src/extension/error-file.cpp b/src/extension/error-file.cpp
index fb84b6c0b..20dcc0f5f 100644
--- a/src/extension/error-file.cpp
+++ b/src/extension/error-file.cpp
@@ -14,11 +14,11 @@
 
 #include "ui/dialog/extensions.h"
 
-#include "extension/extension.h"
+#include <glibmm/i18n.h>
 #include "inkscape.h"
-#include "io/resource.h"
 #include "preferences.h"
-#include <glibmm/i18n.h>
+#include "extension/extension.h"
+#include "io/resource.h"
 
 #include "error-file.h"
 
diff --git a/src/extension/execution-env.cpp b/src/extension/execution-env.cpp
index 5a36da1a9..7e233d215 100644
--- a/src/extension/execution-env.cpp
+++ b/src/extension/execution-env.cpp
@@ -16,15 +16,15 @@
 #include <gtkmm/messagedialog.h>
 
 #include "execution-env.h"
-#include "implementation/implementation.h"
 #include "prefdialog.h"
+#include "implementation/implementation.h"
 
-#include "desktop.h"
-#include "document-undo.h"
-#include "document.h"
+#include "selection.h"
 #include "effect.h"
+#include "document.h"
+#include "document-undo.h"
+#include "desktop.h"
 #include "object/sp-namedview.h"
-#include "selection.h"
 
 #include "display/sp-canvas.h"
 
diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp
index 9d8466233..f07d334af 100644
--- a/src/extension/extension.cpp
+++ b/src/extension/extension.cpp
@@ -20,20 +20,20 @@
 #endif
 
 #include <gtkmm/box.h>
+#include <gtkmm/label.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/grid.h>
-#include <gtkmm/label.h>
 
-#include "extension.h"
-#include "extension/implementation/implementation.h"
-#include "inkscape.h"
 #include <glibmm/i18n.h>
+#include "inkscape.h"
+#include "extension/implementation/implementation.h"
+#include "extension.h"
 
 #include "db.h"
 #include "dependency.h"
-#include "io/resource.h"
-#include "param/parameter.h"
 #include "timer.h"
+#include "param/parameter.h"
+#include "io/resource.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/implementation/implementation.cpp b/src/extension/implementation/implementation.cpp
index 006b45745..6e6100d2b 100644
--- a/src/extension/implementation/implementation.cpp
+++ b/src/extension/implementation/implementation.cpp
@@ -15,12 +15,12 @@
 #endif
 #include "implementation.h"
 
-#include <extension/effect.h>
-#include <extension/input.h>
 #include <extension/output.h>
+#include <extension/input.h>
+#include <extension/effect.h>
 
-#include "desktop.h"
 #include "selection.h"
+#include "desktop.h"
 
 
 namespace Inkscape {
diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp
index f206a535d..f25c8a5d6 100644
--- a/src/extension/implementation/script.cpp
+++ b/src/extension/implementation/script.cpp
@@ -13,12 +13,12 @@
  */
 
 #include <glibmm.h>
-#include <glibmm/convert.h>
-#include <glibmm/miscutils.h>
-#include <gtkmm/main.h>
 #include <gtkmm/messagedialog.h>
+#include <gtkmm/main.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/textview.h>
+#include <glibmm/miscutils.h>
+#include <glibmm/convert.h>
 #include <unistd.h>
 
 #include <errno.h>
@@ -26,27 +26,27 @@
 
 
 #include "desktop.h"
-#include "extension/db.h"
+#include "ui/dialog-events.h"
 #include "extension/effect.h"
 #include "extension/execution-env.h"
-#include "extension/input.h"
 #include "extension/output.h"
-#include "extension/system.h"
+#include "extension/input.h"
+#include "extension/db.h"
 #include "inkscape.h"
 #include "io/resource.h"
-#include "object/sp-namedview.h"
-#include "object/sp-path.h"
 #include "preferences.h"
 #include "script.h"
 #include "selection.h"
-#include "ui/dialog-events.h"
-#include "ui/tool/control-point-selection.h"
-#include "ui/tool/multi-path-manipulator.h"
-#include "ui/tool/path-manipulator.h"
-#include "ui/tools/node-tool.h"
+#include "object/sp-namedview.h"
+#include "object/sp-path.h"
+#include "extension/system.h"
 #include "ui/view/view.h"
-#include "xml/attribute-record.h"
 #include "xml/node.h"
+#include "xml/attribute-record.h"
+#include "ui/tools/node-tool.h"
+#include "ui/tool/multi-path-manipulator.h"
+#include "ui/tool/path-manipulator.h"
+#include "ui/tool/control-point-selection.h"
 
 
 #include "path-prefix.h"
diff --git a/src/extension/implementation/xslt.cpp b/src/extension/implementation/xslt.cpp
index 19ab5db6c..d11283db7 100644
--- a/src/extension/implementation/xslt.cpp
+++ b/src/extension/implementation/xslt.cpp
@@ -16,17 +16,17 @@
 #include <config.h>
 #endif
 
+#include <glibmm/fileutils.h>
+#include "file.h"
+#include "xslt.h"
 #include "../extension.h"
 #include "../output.h"
 #include "extension/input.h"
-#include "file.h"
-#include "xslt.h"
-#include <glibmm/fileutils.h>
 
-#include "document.h"
 #include "io/resource.h"
-#include <cstring>
 #include <unistd.h>
+#include <cstring>
+#include "document.h"
 
 #include <libxslt/transform.h>
 #include <libxslt/xsltutils.h>
diff --git a/src/extension/init.cpp b/src/extension/init.cpp
index 2edb8a087..17c07ae1d 100644
--- a/src/extension/init.cpp
+++ b/src/extension/init.cpp
@@ -28,27 +28,27 @@
 #include <glibmm/i18n.h>
 #include <glibmm/ustring.h>
 
+#include "system.h"
 #include "db.h"
-#include "internal/emf-inout.h"
-#include "internal/emf-print.h"
-# include "internal/svgz.h"
+#include "internal/svgz.h"
+# include "internal/emf-inout.h"
+# include "internal/emf-print.h"
 # include "internal/wmf-inout.h"
 # include "internal/wmf-print.h"
-# include "system.h"
 #ifdef HAVE_CAIRO_PDF
+# include "internal/cairo-renderer-pdf-out.h"
 # include "internal/cairo-png-out.h"
 # include "internal/cairo-ps-out.h"
-# include "internal/cairo-renderer-pdf-out.h"
 #endif
-#include "internal/bluredge.h"
-#include "internal/gdkpixbuf-input.h"
-#include "internal/gimpgrad.h"
-#include "internal/grid.h"
+#include "internal/pov-out.h"
 #include "internal/javafx-out.h"
+#include "internal/odf.h"
 #include "internal/latex-pstricks-out.h"
 #include "internal/latex-pstricks.h"
-#include "internal/odf.h"
-#include "internal/pov-out.h"
+#include "internal/gdkpixbuf-input.h"
+#include "internal/bluredge.h"
+#include "internal/gimpgrad.h"
+#include "internal/grid.h"
 #ifdef WITH_LIBWPG
 #include "internal/wpg-input.h"
 #endif
@@ -58,14 +58,15 @@
 #ifdef WITH_LIBCDR
 #include "internal/cdr-input.h"
 #endif
-#include "io/resource.h"
-#include "io/sys.h"
 #include "preferences.h"
+#include "io/sys.h"
+#include "io/resource.h"
 #ifdef WITH_DBUS
 #include "dbus/dbus-init.h"
 #endif
 
 #ifdef WITH_IMAGE_MAGICK
+#include <Magick++.h>
 #include "internal/bitmap/adaptiveThreshold.h"
 #include "internal/bitmap/addNoise.h"
 #include "internal/bitmap/blur.h"
@@ -98,7 +99,6 @@
 #include "internal/bitmap/solarize.h"
 #include "internal/bitmap/spread.h"
 #include "internal/bitmap/swirl.h"
-#include <Magick++.h>
 //#include "internal/bitmap/threshold.h"
 #include "internal/bitmap/unsharpmask.h"
 #include "internal/bitmap/wave.h"
diff --git a/src/extension/input.cpp b/src/extension/input.cpp
index 1d154496d..862d4a4d3 100644
--- a/src/extension/input.cpp
+++ b/src/extension/input.cpp
@@ -12,8 +12,8 @@
 
 #include "prefdialog.h"
 #include "implementation/implementation.h"
-#include "input.h"
 #include "timer.h"
+#include "input.h"
 
 /* Inkscape::Extension::Input */
 
diff --git a/src/extension/internal/bitmap/colorize.cpp b/src/extension/internal/bitmap/colorize.cpp
index e0db0ca71..1c4b8a696 100644
--- a/src/extension/internal/bitmap/colorize.cpp
+++ b/src/extension/internal/bitmap/colorize.cpp
@@ -15,8 +15,8 @@
 
 #include "color.h"
 
-#include <Magick++.h>
 #include <iostream>
+#include <Magick++.h>
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/bitmap/crop.cpp b/src/extension/internal/bitmap/crop.cpp
index dee5f111b..99faef9d3 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 "object/sp-item-transform.h"
-#include "object/sp-item.h"
 #include "selection-chemistry.h"
+#include "object/sp-item.h"
+#include "object/sp-item-transform.h"
 #include <Magick++.h>
 
 namespace Inkscape {
diff --git a/src/extension/internal/bitmap/imagemagick.cpp b/src/extension/internal/bitmap/imagemagick.cpp
index f32afa2e5..636b9d6a4 100644
--- a/src/extension/internal/bitmap/imagemagick.cpp
+++ b/src/extension/internal/bitmap/imagemagick.cpp
@@ -14,8 +14,8 @@
 
 #include <libintl.h>
 
-#include <gtkmm/adjustment.h>
 #include <gtkmm/box.h>
+#include <gtkmm/adjustment.h>
 #include <gtkmm/spinbutton.h>
 
 #include <glib/gstdio.h>
diff --git a/src/extension/internal/bluredge.cpp b/src/extension/internal/bluredge.cpp
index f446227cc..f04007d00 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 "helper/action-context.h"
+#include "selection.h"
 #include "helper/action.h"
-#include "object/sp-item.h"
-#include "path-chemistry.h"
+#include "helper/action-context.h"
 #include "preferences.h"
-#include "selection.h"
-#include <vector>
+#include "path-chemistry.h"
+#include "object/sp-item.h"
 
 #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 c4d33252d..3cdbee8c1 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 "display/drawing.h"
+#include <print.h>
+#include "extension/system.h"
+#include "extension/print.h"
 #include "extension/db.h"
 #include "extension/output.h"
-#include "extension/print.h"
-#include "extension/system.h"
-#include <print.h>
+#include "display/drawing.h"
 
-#include "display/canvas-bpath.h"
 #include "display/curve.h"
+#include "display/canvas-bpath.h"
 #include "object/sp-item.h"
 #include "object/sp-root.h"
 
-#include "document.h"
 #include "io/sys.h"
+#include "document.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp
index 08c748175..287cf636f 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 "display/drawing.h"
-#include "extension/db.h"
-#include "extension/output.h"
-#include "extension/print.h"
-#include "extension/system.h"
 #include "latex-text-renderer.h"
 #include <print.h>
+#include "extension/system.h"
+#include "extension/print.h"
+#include "extension/db.h"
+#include "extension/output.h"
+#include "display/drawing.h"
 
-#include "display/canvas-bpath.h"
 #include "display/curve.h"
+#include "display/canvas-bpath.h"
 #include "object/sp-item.h"
 #include "object/sp-root.h"
 
-#include "document.h"
 #include "io/sys.h"
+#include "document.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp
index 8bdf25ee4..1878b2c89 100644
--- a/src/extension/internal/cairo-render-context.cpp
+++ b/src/extension/internal/cairo-render-context.cpp
@@ -25,26 +25,26 @@
 #endif
 
 
-#include <2geom/pathvector.h>
-#include <errno.h>
 #include <signal.h>
+#include <errno.h>
+#include <2geom/pathvector.h>
 
 #include <glib.h>
 
-#include "display/cairo-utils.h"
-#include "display/canvas-bpath.h"
-#include "display/curve.h"
+#include <glibmm/i18n.h>
 #include "display/drawing.h"
-#include "object/sp-clippath.h"
-#include "object/sp-hatch.h"
-#include "object/sp-item-group.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 "object/sp-hatch.h"
 #include "object/sp-linear-gradient.h"
-#include "object/sp-mask.h"
+#include "object/sp-radial-gradient.h"
 #include "object/sp-mesh-gradient.h"
 #include "object/sp-pattern.h"
-#include "object/sp-radial-gradient.h"
-#include <glibmm/i18n.h>
+#include "object/sp-mask.h"
+#include "object/sp-clippath.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 91e152706..5b9759c15 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 "display/drawing.h"
-#include "extension/db.h"
-#include "extension/output.h"
-#include "extension/print.h"
-#include "extension/system.h"
 #include "latex-text-renderer.h"
 #include <print.h>
+#include "extension/system.h"
+#include "extension/print.h"
+#include "extension/db.h"
+#include "extension/output.h"
+#include "display/drawing.h"
 
-#include "display/canvas-bpath.h"
 #include "display/curve.h"
+#include "display/canvas-bpath.h"
 #include "object/sp-item.h"
 #include "object/sp-root.h"
 
-#include "document.h"
 #include <2geom/affine.h>
+#include "document.h"
 
 #include "util/units.h"
 
diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp
index ecaeeb5d2..b48be2ed7 100644
--- a/src/extension/internal/cairo-renderer.cpp
+++ b/src/extension/internal/cairo-renderer.cpp
@@ -25,48 +25,48 @@
 #endif
 
 
-#include <errno.h>
 #include <signal.h>
+#include <errno.h>
 
 #include "libnrtype/Layout-TNG.h"
-#include <2geom/pathvector.h>
 #include <2geom/transforms.h>
+#include <2geom/pathvector.h>
 
 #include <glib.h>
 
-#include "display/cairo-utils.h"
-#include "display/canvas-bpath.h"
+#include <glibmm/i18n.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 "display/canvas-bpath.h"
+#include "display/cairo-utils.h"
 #include "object/sp-item.h"
-#include "object/sp-linear-gradient.h"
+#include "object/sp-item-group.h"
 #include "object/sp-marker.h"
-#include "object/sp-mask.h"
-#include "object/sp-pattern.h"
+#include "object/sp-linear-gradient.h"
 #include "object/sp-radial-gradient.h"
 #include "object/sp-root.h"
 #include "object/sp-shape.h"
-#include "object/sp-symbol.h"
-#include "object/sp-text.h"
 #include "object/sp-use.h"
-#include <glibmm/i18n.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 "helper/pixbuf-ops.h"
-#include "helper/png-write.h"
 #include "util/units.h"
+#include "helper/png-write.h"
+#include "helper/pixbuf-ops.h"
 
-#include "cairo-render-context.h"
 #include "cairo-renderer.h"
+#include "cairo-render-context.h"
 #include "extension/system.h"
 
 #include "io/sys.h"
 
-#include "document.h"
 #include <cairo.h>
+#include "document.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 00165032d..bfba67282 100644
--- a/src/extension/internal/cdr-input.cpp
+++ b/src/extension/internal/cdr-input.cpp
@@ -13,15 +13,15 @@
  *
  */
 
-#include "config.h"
 #include <stdio.h>
+#include "config.h"
 
 #include "cdr-input.h"
 
 #ifdef WITH_LIBCDR
 
-#include <cstring>
 #include <string>
+#include <cstring>
 
 #include <libcdr/libcdr.h>
 
@@ -43,11 +43,11 @@
 #include <gtkmm/grid.h>
 #include <gtkmm/spinbutton.h>
 
-#include "extension/input.h"
 #include "extension/system.h"
+#include "extension/input.h"
 
-#include "document-private.h"
 #include "document.h"
+#include "document-private.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 f5335eaf6..54099271b 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 "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 "display/drawing.h"
+#include "display/drawing-item.h"
+#include "clear-n_.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-inout.h"
 #include "emf-print.h"
+#include "emf-inout.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 dedd241a5..0b005f8da 100644
--- a/src/extension/internal/emf-print.cpp
+++ b/src/extension/internal/emf-print.cpp
@@ -26,42 +26,42 @@
 # include "config.h"
 #endif
 
-#include <2geom/curves.h>
+#include <string.h>
+#include <glibmm/miscutils.h>
+#include <3rdparty/libuemf/symbol_convert.h>
+#include <2geom/sbasis-to-bezier.h>
 #include <2geom/path.h>
 #include <2geom/pathvector.h>
 #include <2geom/rect.h>
-#include <2geom/sbasis-to-bezier.h>
-#include <3rdparty/libuemf/symbol_convert.h>
-#include <glibmm/miscutils.h>
-#include <string.h>
+#include <2geom/curves.h>
 
-#include "helper/geom-curves.h"
 #include "helper/geom.h"
+#include "helper/geom-curves.h"
 #include "util/units.h"
 
 #include "inkscape-version.h"
 
-#include "document.h"
-#include "extension/print.h"
 #include "extension/system.h"
+#include "extension/print.h"
+#include "document.h"
 #include "path-prefix.h"
 
-#include "display/cairo-utils.h"
-#include "object/sp-clippath.h"
-#include "object/sp-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-image.h"
+#include "object/sp-gradient.h"
 #include "object/sp-radial-gradient.h"
+#include "object/sp-linear-gradient.h"
+#include "object/sp-item.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/cairo-utils.h"  // for Inkscape::Pixbuf::PF_CAIRO
 #include "display/canvas-bpath.h"  // for SPWindRule
-#include "splivarot.h"             // pieces for union on shapes
+#include "display/cairo-utils.h"  // for Inkscape::Pixbuf::PF_CAIRO
 
 #include "emf-print.h"
 
diff --git a/src/extension/internal/filter/filter-file.cpp b/src/extension/internal/filter/filter-file.cpp
index 962381da6..c18879430 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/inkscapestream.h"
-#include "io/resource.h"
 #include "io/sys.h"
+#include "io/resource.h"
+#include "io/inkscapestream.h"
 
 /* Directory includes */
-#include "inkscape.h"
 #include "path-prefix.h"
+#include "inkscape.h"
 
 /* Extension */
 #include "extension/extension.h"
 #include "extension/system.h"
 
 /* System includes */
-#include <glibmm/fileutils.h>
 #include <glibmm/i18n.h>
+#include <glibmm/fileutils.h>
 
 using namespace Inkscape::IO::Resource;
 
diff --git a/src/extension/internal/filter/filter.cpp b/src/extension/internal/filter/filter.cpp
index 99dfffc6c..166e5406f 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/effect.h"
 #include "extension/extension.h"
+#include "extension/effect.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 7cfaded41..efac1a02e 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 "gdkpixbuf-input.h"
 #include "image-resolution.h"
-#include "object/sp-image.h"
-#include "object/sp-root.h"
+#include "gdkpixbuf-input.h"
 #include "preferences.h"
 #include "selection-chemistry.h"
+#include "object/sp-image.h"
+#include "object/sp-root.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 fbae04ca5..e6a429d34 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 e77525f1b..c7ebf2494 100644
--- a/src/extension/internal/grid.cpp
+++ b/src/extension/internal/grid.cpp
@@ -15,15 +15,15 @@
 # include <config.h>
 #endif
 
-#include <gtkmm/adjustment.h>
 #include <gtkmm/box.h>
+#include <gtkmm/adjustment.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 7608454e7..d4666fcee 100644
--- a/src/extension/internal/javafx-out.cpp
+++ b/src/extension/internal/javafx-out.cpp
@@ -21,31 +21,31 @@
 # include <config.h>
 #endif
 
-#include "helper/geom-curves.h"
-#include "helper/geom.h"
+#include <glibmm/miscutils.h>
 #include "javafx-out.h"
-#include <2geom/curves.h>
-#include <2geom/pathvector.h>
-#include <2geom/rect.h>
-#include <display/canvas-bpath.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 <glibmm/miscutils.h>
-#include <inkscape-version.h>
-#include <inkscape.h>
+#include <2geom/pathvector.h>
+#include <2geom/rect.h>
+#include <2geom/curves.h>
+#include "helper/geom.h"
+#include "helper/geom-curves.h"
 #include <io/sys.h>
-#include <svg/svg.h>
 
-#include "object/sp-linear-gradient.h"
+#include "object/sp-root.h"
 #include "object/sp-path.h"
+#include "object/sp-linear-gradient.h"
 #include "object/sp-radial-gradient.h"
-#include "object/sp-root.h"
 #include "style.h"
 
-#include "extension/extension.h"
-#include <stdarg.h>
-#include <stdio.h>
 #include <string>
+#include <stdio.h>
+#include <stdarg.h>
+#include "extension/extension.h"
 
 
 namespace Inkscape
diff --git a/src/extension/internal/latex-pstricks-out.cpp b/src/extension/internal/latex-pstricks-out.cpp
index 8d2e67c43..0581f8edd 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 "display/drawing.h"
-#include "extension/db.h"
-#include "extension/print.h"
+#include <print.h>
 #include "extension/system.h"
+#include "extension/print.h"
+#include "extension/db.h"
+#include "display/drawing.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 23dcd002f..83100d11e 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 b16c78826..85426e376 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 <errno.h>
 #include <signal.h>
+#include <errno.h>
 
 #include "libnrtype/Layout-TNG.h"
-#include <2geom/rect.h>
 #include <2geom/transforms.h>
+#include <2geom/rect.h>
 #include <glibmm/i18n.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-item-group.h"
 #include "object/sp-root.h"
-#include "object/sp-text.h"
 #include "object/sp-use.h"
+#include "object/sp-text.h"
+#include "object/sp-flowtext.h"
+#include "object/sp-rect.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 2d8d17cfe..ae79c8a8a 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 "inkscape.h"
 #include "path-prefix.h"
-#include "preferences.h"
-#include "ui/shape-editor.h"
+#include "document.h"
 #include "util/units.h"
+#include "ui/shape-editor.h"
+#include "document-undo.h"
+#include "inkscape.h"
+#include "preferences.h"
 
-#include "object/sp-namedview.h"
 #include "object/sp-root.h"
+#include "object/sp-namedview.h"
 #include "svg/stringstream.h"
 
 namespace Inkscape {
diff --git a/src/extension/internal/metafile-print.cpp b/src/extension/internal/metafile-print.cpp
index 43e605491..fb44f8499 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 689bd0101..42c2bbae3 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 "display/curve.h"
-#include "extension/system.h"
-#include "helper/geom-curves.h"
 #include "inkscape.h"
-#include <2geom/curves.h>
+#include "display/curve.h"
 #include <2geom/pathvector.h>
+#include <2geom/curves.h>
 #include <2geom/transforms.h>
 #include <helper/geom.h>
+#include "helper/geom-curves.h"
+#include "extension/system.h"
 
-#include "object/sp-flowtext.h"
-#include "object/sp-gradient.h"
+#include "xml/repr.h"
+#include "xml/attribute-record.h"
 #include "object/sp-image.h"
+#include "object/sp-gradient.h"
+#include "object/sp-stop.h"
 #include "object/sp-linear-gradient.h"
-#include "object/sp-path.h"
 #include "object/sp-radial-gradient.h"
-#include "object/sp-stop.h"
+#include "object/sp-path.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/bufferstream.h"
 #include "io/inkscapestream.h"
-#include <iomanip>
+#include "io/bufferstream.h"
 #include <util/ziptool.h>
+#include <iomanip>
 namespace Inkscape
 {
 namespace Extension
diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
index 1f37befaa..552051eed 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/Catalog.h>
+#include <poppler/goo/GooString.h>
 #include <poppler/ErrorCodes.h>
 #include <poppler/GlobalParams.h>
 #include <poppler/PDFDoc.h>
 #include <poppler/Page.h>
-#include <poppler/goo/GooString.h>
+#include <poppler/Catalog.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/frame.h"
 #include "ui/widget/spinbutton.h"
+#include "ui/widget/frame.h"
 
-#include "extension/input.h"
 #include "extension/system.h"
-#include "pdf-parser.h"
+#include "extension/input.h"
 #include "svg-builder.h"
+#include "pdf-parser.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 2bc7ada12..6c498f981 100644
--- a/src/extension/internal/pdfinput/pdf-parser.cpp
+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
@@ -23,36 +23,36 @@
 
 extern "C" {
         
-#include <math.h>
-#include <stddef.h>
-#include <stdio.h>
 #include <stdlib.h>
+#include <stdio.h>
+#include <stddef.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 "Annot.h"
-#include "Array.h"
+#include "goo/gmem.h"
+#include "goo/GooTimer.h"
+#include "goo/GooHash.h"
+#include "GlobalParams.h"
 #include "CharTypes.h"
+#include "Object.h"
+#include "Array.h"
 #include "Dict.h"
-#include "Error.h"
+#include "Stream.h"
+#include "Lexer.h"
+#include "Parser.h"
 #include "GfxFont.h"
 #include "GfxState.h"
-#include "GlobalParams.h"
-#include "Lexer.h"
-#include "Object.h"
 #include "OutputDev.h"
 #include "Page.h"
-#include "Parser.h"
-#include "Stream.h"
-#include "goo/GooHash.h"
-#include "goo/GooTimer.h"
-#include "goo/gmem.h"
+#include "Annot.h"
+#include "Error.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 1f3c76b3a..8e5a5f639 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 "pdf-parser.h"
 #include "svg-builder.h"
+#include "pdf-parser.h"
 
 #include <png.h>
 
-#include "color.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 "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 "libnrtype/font-instance.h"
+#include "object/sp-defs.h"
 
 #include "Function.h"
-#include "GfxFont.h"
 #include "GfxState.h"
-#include "GlobalParams.h"
-#include "Page.h"
+#include "GfxFont.h"
 #include "Stream.h"
+#include "Page.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 a53133e8d..15acb97ec 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 "helper/geom-curves.h"
-#include "helper/geom.h"
-#include <2geom/curves.h>
-#include <2geom/pathvector.h>
-#include <2geom/rect.h>
+#include <inkscape.h>
+#include <inkscape-version.h>
 #include <display/curve.h>
 #include <extension/system.h>
-#include <inkscape-version.h>
-#include <inkscape.h>
+#include <2geom/pathvector.h>
+#include <2geom/rect.h>
+#include <2geom/curves.h>
+#include "helper/geom.h"
+#include "helper/geom-curves.h"
 #include <io/sys.h>
 
-#include "object/sp-path.h"
 #include "object/sp-root.h"
+#include "object/sp-path.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 780f8d6bc..7bf4f34e6 100644
--- a/src/extension/internal/svg.cpp
+++ b/src/extension/internal/svg.cpp
@@ -18,17 +18,17 @@
 # include <config.h>
 #endif
 
-#include <giomm/file.h>
 #include <vector>
+#include <giomm/file.h>
 
 
-#include "document.h"
-#include "extension/output.h"
-#include "extension/system.h"
-#include "file.h"
 #include "svg.h"
+#include "file.h"
+#include "extension/system.h"
+#include "extension/output.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 6069fc2af..7c92a895d 100644
--- a/src/extension/internal/vsd-input.cpp
+++ b/src/extension/internal/vsd-input.cpp
@@ -13,15 +13,15 @@
  *
  */
 
-#include "config.h"
 #include <stdio.h>
+#include "config.h"
 
 #include "vsd-input.h"
 
 #ifdef WITH_LIBVISIO
 
-#include <cstring>
 #include <string>
+#include <cstring>
 
 #include <libvisio/libvisio.h>
 
@@ -42,11 +42,11 @@
 
 #include <gtkmm/spinbutton.h>
 
-#include "extension/input.h"
 #include "extension/system.h"
+#include "extension/input.h"
 
-#include "document-private.h"
 #include "document.h"
+#include "document-private.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 7d810b456..45f59ec03 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 "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 "display/drawing.h"
+#include "display/drawing-item.h"
+#include "clear-n_.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 feb6e78de..cdc59298b 100644
--- a/src/extension/internal/wmf-print.cpp
+++ b/src/extension/internal/wmf-print.cpp
@@ -29,42 +29,42 @@
 #endif
 
 
-#include <2geom/elliptical-arc.h>
 #include <2geom/sbasis-to-bezier.h>
+#include <2geom/elliptical-arc.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 "document.h"
-#include "extension/print.h"
 #include "extension/system.h"
+#include "extension/print.h"
+#include "document.h"
 #include "path-prefix.h"
 
-#include "object/sp-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-image.h"
+#include "object/sp-gradient.h"
 #include "object/sp-radial-gradient.h"
+#include "object/sp-linear-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 <3rdparty/libuemf/symbol_convert.h>
 #include <string.h>
+#include <3rdparty/libuemf/symbol_convert.h>
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/wpg-input.cpp b/src/extension/internal/wpg-input.cpp
index 8a4f0d24c..2f3bfe27b 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 "config.h"
 #include <stdio.h>
+#include "config.h"
 
 #ifdef WITH_LIBWPG
 
-#include "document.h"
-#include "extension/input.h"
+#include "wpg-input.h"
 #include "extension/system.h"
+#include "extension/input.h"
+#include "document.h"
 #include "object/sp-root.h"
 #include "util/units.h"
-#include "wpg-input.h"
 #include <cstring>
 
 // Take a guess and fallback to 0.2.x if no configure has run
diff --git a/src/extension/loader.cpp b/src/extension/loader.cpp
index 0343fe28b..164a5cecf 100644
--- a/src/extension/loader.cpp
+++ b/src/extension/loader.cpp
@@ -13,10 +13,10 @@
 
 #include <gmodule.h>
 
-#include "dependency.h"
-#include "inkscape-version.h"
 #include "system.h"
 #include <string.h>
+#include "dependency.h"
+#include "inkscape-version.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/param/bool.cpp b/src/extension/param/bool.cpp
index 1fe5d9eeb..80bc89138 100644
--- a/src/extension/param/bool.cpp
+++ b/src/extension/param/bool.cpp
@@ -12,13 +12,13 @@
 
 #include <gtkmm/adjustment.h>
 #include <gtkmm/box.h>
-#include <gtkmm/checkbutton.h>
 #include <gtkmm/spinbutton.h>
+#include <gtkmm/checkbutton.h>
 
+#include "xml/node.h"
 #include "../extension.h"
 #include "bool.h"
 #include "preferences.h"
-#include "xml/node.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/param/color.cpp b/src/extension/param/color.cpp
index 0db3955f3..035c43ba8 100644
--- a/src/extension/param/color.cpp
+++ b/src/extension/param/color.cpp
@@ -23,9 +23,9 @@
 #include "../extension.h"
 #include "color.h"
 
-#include "preferences.h"
-#include "ui/widget/color-notebook.h"
 #include <color.h>
+#include "ui/widget/color-notebook.h"
+#include "preferences.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/param/description.cpp b/src/extension/param/description.cpp
index ed89baae3..cf94918f7 100644
--- a/src/extension/param/description.cpp
+++ b/src/extension/param/description.cpp
@@ -13,15 +13,15 @@
 # include "config.h"
 #endif
 
+#include <gtkmm/box.h>
+#include <gtkmm/label.h>
 #include <glibmm/i18n.h>
 #include <glibmm/markup.h>
 #include <glibmm/regex.h>
-#include <gtkmm/box.h>
-#include <gtkmm/label.h>
 
-#include "description.h"
-#include "extension/extension.h"
 #include "xml/node.h"
+#include "extension/extension.h"
+#include "description.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/param/enum.cpp b/src/extension/param/enum.cpp
index 353960746..ddcbb358b 100644
--- a/src/extension/param/enum.cpp
+++ b/src/extension/param/enum.cpp
@@ -18,15 +18,15 @@
 # include "config.h"
 #endif
 
-#include <glibmm/i18n.h>
 #include <gtkmm/box.h>
 #include <gtkmm/comboboxtext.h>
+#include <glibmm/i18n.h>
 
+#include "xml/node.h"
+#include "extension/extension.h"
 #include "document-private.h"
 #include "enum.h"
-#include "extension/extension.h"
 #include "preferences.h"
-#include "xml/node.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/param/float.cpp b/src/extension/param/float.cpp
index 205c95097..1dd3f073b 100644
--- a/src/extension/param/float.cpp
+++ b/src/extension/param/float.cpp
@@ -10,16 +10,16 @@
 # include "config.h"
 #endif
 
-#include "ui/widget/spin-scale.h"
-#include "ui/widget/spinbutton.h"
 #include <gtkmm/adjustment.h>
 #include <gtkmm/box.h>
 #include <gtkmm/scale.h>
+#include "ui/widget/spinbutton.h"
+#include "ui/widget/spin-scale.h"
 
+#include "xml/node.h"
 #include "extension/extension.h"
-#include "float.h"
 #include "preferences.h"
-#include "xml/node.h"
+#include "float.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/param/int.cpp b/src/extension/param/int.cpp
index d762399d0..9ad9b591c 100644
--- a/src/extension/param/int.cpp
+++ b/src/extension/param/int.cpp
@@ -10,16 +10,16 @@
 # include "config.h"
 #endif
 
-#include "ui/widget/spin-scale.h"
-#include "ui/widget/spinbutton.h"
 #include <gtkmm/adjustment.h>
 #include <gtkmm/box.h>
 #include <gtkmm/scale.h>
+#include "ui/widget/spinbutton.h"
+#include "ui/widget/spin-scale.h"
 
+#include "xml/node.h"
 #include "extension/extension.h"
-#include "int.h"
 #include "preferences.h"
-#include "xml/node.h"
+#include "int.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/param/notebook.cpp b/src/extension/param/notebook.cpp
index 6b705877a..e47644f45 100644
--- a/src/extension/param/notebook.cpp
+++ b/src/extension/param/notebook.cpp
@@ -18,16 +18,16 @@
 
 #include <gtkmm/adjustment.h>
 #include <gtkmm/box.h>
-#include <gtkmm/notebook.h>
 #include <gtkmm/spinbutton.h>
+#include <gtkmm/notebook.h>
 
 #include <glibmm/i18n.h>
 
 #include <xml/node.h>
 
-#include "document-private.h"
-#include "preferences.h"
 #include <extension/extension.h>
+#include "preferences.h"
+#include "document-private.h"
 
 #include "notebook.h"
 
diff --git a/src/extension/param/parameter.cpp b/src/extension/param/parameter.cpp
index aba31d1a4..7220045c4 100644
--- a/src/extension/param/parameter.cpp
+++ b/src/extension/param/parameter.cpp
@@ -24,11 +24,12 @@
 #include "ui/widget/color-notebook.h"
 #include <xml/node.h>
 
+#include <extension/extension.h>
 #include "document-private.h"
 #include "object/sp-defs.h"
 #include <color.h>
-#include <extension/extension.h>
 
+#include "parameter.h"
 #include "bool.h"
 #include "color.h"
 #include "description.h"
@@ -36,7 +37,6 @@
 #include "float.h"
 #include "int.h"
 #include "notebook.h"
-#include "parameter.h"
 #include "radiobutton.h"
 #include "string.h"
 
diff --git a/src/extension/param/radiobutton.cpp b/src/extension/param/radiobutton.cpp
index 86fd528dd..890b92219 100644
--- a/src/extension/param/radiobutton.cpp
+++ b/src/extension/param/radiobutton.cpp
@@ -18,15 +18,15 @@
 # include "config.h"
 #endif
 
-#include <glibmm/i18n.h>
 #include <gtkmm/box.h>
 #include <gtkmm/comboboxtext.h>
 #include <gtkmm/radiobutton.h>
+#include <glibmm/i18n.h>
 
-#include "document-private.h"
+#include "xml/node.h"
 #include "extension/extension.h"
 #include "preferences.h"
-#include "xml/node.h"
+#include "document-private.h"
 
 #include "radiobutton.h"
 
diff --git a/src/extension/param/string.cpp b/src/extension/param/string.cpp
index f16d7ccaf..51b5dfdf3 100644
--- a/src/extension/param/string.cpp
+++ b/src/extension/param/string.cpp
@@ -16,10 +16,10 @@
 
 #include <glibmm/value.h>
 
+#include "xml/node.h"
 #include "extension/extension.h"
-#include "preferences.h"
 #include "string.h"
-#include "xml/node.h"
+#include "preferences.h"
 #include <glibmm/i18n.h>
 
 namespace Inkscape {
diff --git a/src/extension/patheffect.cpp b/src/extension/patheffect.cpp
index 634035043..1e9e093ef 100644
--- a/src/extension/patheffect.cpp
+++ b/src/extension/patheffect.cpp
@@ -9,8 +9,8 @@
 
 #include "document-private.h"
 
-#include "db.h"
 #include "patheffect.h"
+#include "db.h"
 
 #include "object/sp-defs.h"
 
diff --git a/src/extension/prefdialog.cpp b/src/extension/prefdialog.cpp
index 3ec08f7c5..0247e18e9 100644
--- a/src/extension/prefdialog.cpp
+++ b/src/extension/prefdialog.cpp
@@ -8,16 +8,16 @@
  */
 
 #include "prefdialog.h"
-#include <glibmm/i18n.h>
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/separator.h>
+#include <glibmm/i18n.h>
 
 #include "ui/dialog-events.h"
 #include "xml/repr.h"
 
 // Used to get SP_ACTIVE_DESKTOP
-#include "desktop.h"
 #include "inkscape.h"
+#include "desktop.h"
 
 #include "effect.h"
 #include "implementation/implementation.h"
diff --git a/src/extension/system.cpp b/src/extension/system.cpp
index f35cd559c..f438d84b9 100644
--- a/src/extension/system.cpp
+++ b/src/extension/system.cpp
@@ -22,22 +22,22 @@
 
 #include "ui/interface.h"
 
-#include "db.h"
-#include "document-undo.h"
-#include "effect.h"
+#include "system.h"
+#include "preferences.h"
 #include "extension.h"
-#include "implementation/script.h"
-#include "implementation/xslt.h"
-#include "inkscape.h"
+#include "db.h"
 #include "input.h"
-#include "io/sys.h"
-#include "loader.h"
 #include "output.h"
+#include "effect.h"
 #include "patheffect.h"
-#include "preferences.h"
 #include "print.h"
-#include "system.h"
+#include "implementation/script.h"
+#include "implementation/xslt.h"
 #include "xml/rebase-hrefs.h"
+#include "io/sys.h"
+#include "inkscape.h"
+#include "document-undo.h"
+#include "loader.h"
 
 #include <glibmm/miscutils.h>