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

This reverts commit bba4ff6672494fab59286b50f6c645ad62a47e60.

122 files changed, 332 insertions, 333 deletions

diff --git a/src/ui/cache/svg_preview_cache.cpp b/src/ui/cache/svg_preview_cache.cpp
index 35a7214a1..829c6b0ef 100644
--- a/src/ui/cache/svg_preview_cache.cpp
+++ b/src/ui/cache/svg_preview_cache.cpp
@@ -23,9 +23,9 @@
 
 #include <2geom/transforms.h>
 
-#include "document-private.h"
-#include "inkscape.h"
 #include "selection.h"
+#include "inkscape.h"
+#include "document-private.h"
 
 #include "display/cairo-utils.h"
 #include "display/drawing-context.h"
diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index a5bd0aee0..4f6adec4f 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -21,42 +21,42 @@
  * See the file COPYING for details.
  */
 
-#include "ui/clipboard.h"
 #include <gtkmm/clipboard.h>
+#include "ui/clipboard.h"
 
 // TODO: reduce header bloat if possible
 
-#include "desktop.h"
 #include "file.h" // for file_import, used in _pasteImage
+#include <glibmm/i18n.h>
+#include <glib/gstdio.h> // for g_file_set_contents etc., used in _onGet and paste
 #include "inkgc/gc-core.h"
+#include "xml/repr.h"
 #include "inkscape.h"
 #include "io/stringstream.h"
-#include "xml/repr.h"
-#include <glib/gstdio.h> // for g_file_set_contents etc., used in _onGet and paste
-#include <glibmm/i18n.h>
+#include "desktop.h"
 
-#include "context-fns.h"
 #include "desktop-style.h" // for sp_desktop_set_style, used in _pasteStyle
-#include "document-private.h"
 #include "document.h"
+#include "document-private.h"
+#include "message-stack.h"
+#include "context-fns.h"
+#include "ui/tools/dropper-tool.h" // used in copy()
 #include "extension/db.h" // extension database
-#include "extension/find_extension_by_mime.h"
 #include "extension/input.h"
 #include "extension/output.h"
+#include "selection-chemistry.h"
+#include <2geom/transforms.h>
 #include "gradient-drag.h"
-#include "helper/png-write.h"
-#include "live_effects/lpeobject-reference.h"
 #include "live_effects/lpeobject.h"
+#include "live_effects/lpeobject-reference.h"
 #include "live_effects/parameter/path.h"
-#include "message-stack.h"
-#include "path-chemistry.h"
-#include "selection-chemistry.h"
+#include "ui/tools/text-tool.h"
 #include "text-editing.h"
 #include "ui/tools-switch.h"
-#include "ui/tools/dropper-tool.h" // used in copy()
-#include "ui/tools/text-tool.h"
+#include "path-chemistry.h"
 #include "util/units.h"
-#include <2geom/transforms.h>
+#include "helper/png-write.h"
+#include "extension/find_extension_by_mime.h"
 
 #include "object/box3d.h"
 #include "object/persp3d.h"
@@ -72,13 +72,13 @@
 #include "object/sp-rect.h"
 #include "object/sp-root.h"
 #include "object/sp-shape.h"
-#include "object/sp-textpath.h"
 #include "object/sp-use.h"
+#include "object/sp-textpath.h"
 #include "style.h"
 
+#include "svg/svg.h" // for sp_svg_transform_write, used in _copySelection
 #include "svg/css-ostringstream.h" // used in copy
 #include "svg/svg-color.h"
-#include "svg/svg.h" // for sp_svg_transform_write, used in _copySelection
 
 /// Made up mimetype to represent Gdk::Pixbuf clipboard contents.
 #define CLIPBOARD_GDK_PIXBUF_TARGET "image/x-gdk-pixbuf"
diff --git a/src/ui/clipboard.h b/src/ui/clipboard.h
index 67cbe9e08..e32b5aed2 100644
--- a/src/ui/clipboard.h
+++ b/src/ui/clipboard.h
@@ -20,7 +20,6 @@
  */
 
 #include <glibmm/ustring.h>
-#include <vector>
 
 // forward declarations
 class SPDesktop;
diff --git a/src/ui/contextmenu.cpp b/src/ui/contextmenu.cpp
index 0f0b6fe1b..1a5691c3f 100644
--- a/src/ui/contextmenu.cpp
+++ b/src/ui/contextmenu.cpp
@@ -29,15 +29,15 @@
 #include <gtkmm/separatormenuitem.h>
 
 #include "desktop.h"
-#include "document-undo.h"
 #include "document.h"
-#include "helper/action-context.h"
+#include "document-undo.h"
 #include "helper/action.h"
+#include "helper/action-context.h"
 #include "inkscape.h"
 #include "message-context.h"
 #include "message-stack.h"
-#include "selection-chemistry.h"
 #include "selection.h"
+#include "selection-chemistry.h"
 #include "shortcuts.h"
 
 #include "object/sp-anchor.h"
diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp
index d1921d893..d0106bfcd 100644
--- a/src/ui/control-manager.cpp
+++ b/src/ui/control-manager.cpp
@@ -17,8 +17,8 @@
 #include <glib-object.h>
 
 #include "display/sodipodi-ctrl.h" // for SP_TYPE_CTRL
-#include "display/sp-ctrlcurve.h"
 #include "display/sp-ctrlline.h"
+#include "display/sp-ctrlcurve.h"
 #include "preferences.h"
 
 using Inkscape::ControlFlags;
diff --git a/src/ui/dialog-events.cpp b/src/ui/dialog-events.cpp
index e950288ea..cf11490f3 100644
--- a/src/ui/dialog-events.cpp
+++ b/src/ui/dialog-events.cpp
@@ -15,12 +15,12 @@
 #include <config.h>
 #endif
 
+#include <gtkmm/entry.h>
+#include <gtkmm/window.h>
+#include "macros.h"
 #include "desktop.h"
 #include "inkscape.h"
-#include "macros.h"
 #include "ui/tools/tool-base.h"
-#include <gtkmm/entry.h>
-#include <gtkmm/window.h>
 
 #include "ui/dialog-events.h"
 
diff --git a/src/ui/dialog/color-item.cpp b/src/ui/dialog/color-item.cpp
index a22316f1a..8eda9ae08 100644
--- a/src/ui/dialog/color-item.cpp
+++ b/src/ui/dialog/color-item.cpp
@@ -17,8 +17,8 @@
 
 #include <errno.h>
 
-#include <glibmm/i18n.h>
 #include <gtkmm/label.h>
+#include <glibmm/i18n.h>
 
 #include "color-item.h"
 
@@ -26,8 +26,8 @@
 
 #include "desktop-style.h"
 #include "display/cairo-utils.h"
-#include "document-undo.h"
 #include "document.h"
+#include "document-undo.h"
 #include "inkscape.h" // for SP_ACTIVE_DESKTOP
 #include "io/resource.h"
 #include "io/sys.h"
diff --git a/src/ui/dialog/cssdialog.cpp b/src/ui/dialog/cssdialog.cpp
index de9328f3c..efceeae11 100644
--- a/src/ui/dialog/cssdialog.cpp
+++ b/src/ui/dialog/cssdialog.cpp
@@ -13,8 +13,8 @@
 
 #include "cssdialog.h"
 
-#include "selection.h"
 #include "verbs.h"
+#include "selection.h"
 
 #include "ui/widget/addtoicon.h"
 
diff --git a/src/ui/dialog/debug.cpp b/src/ui/dialog/debug.cpp
index 03a8627ec..d062bf863 100644
--- a/src/ui/dialog/debug.cpp
+++ b/src/ui/dialog/debug.cpp
@@ -13,12 +13,12 @@
 #include "config.h"
 #endif
 
-#include <glibmm/i18n.h>
 #include <gtkmm/box.h>
 #include <gtkmm/dialog.h>
+#include <gtkmm/textview.h>
 #include <gtkmm/menubar.h>
 #include <gtkmm/scrolledwindow.h>
-#include <gtkmm/textview.h>
+#include <glibmm/i18n.h>
 
 #include "debug.h"
 
diff --git a/src/ui/dialog/desktop-tracker.cpp b/src/ui/dialog/desktop-tracker.cpp
index a86b425e2..c18711a55 100644
--- a/src/ui/dialog/desktop-tracker.cpp
+++ b/src/ui/dialog/desktop-tracker.cpp
@@ -9,8 +9,8 @@
 
 #include "desktop-tracker.h"
 
-#include "desktop.h"
 #include "inkscape.h"
+#include "desktop.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp
index 3d83cd956..0a4a774e6 100644
--- a/src/ui/dialog/dialog-manager.cpp
+++ b/src/ui/dialog/dialog-manager.cpp
@@ -19,13 +19,14 @@
 
 #include "ui/dialog/dialog-manager.h"
 
+#include "ui/dialog/prototype.h"
 #include "ui/dialog/align-and-distribute.h"
 #include "ui/dialog/document-metadata.h"
 #include "ui/dialog/document-properties.h"
 #include "ui/dialog/extension-editor.h"
 #include "ui/dialog/fill-and-stroke.h"
-#include "ui/dialog/filter-editor.h"
 #include "ui/dialog/filter-effects-dialog.h"
+#include "ui/dialog/filter-editor.h"
 #include "ui/dialog/find.h"
 #include "ui/dialog/glyphs.h"
 #include "ui/dialog/inkscape-preferences.h"
@@ -33,7 +34,6 @@
 #include "ui/dialog/livepatheffect-editor.h"
 #include "ui/dialog/memory.h"
 #include "ui/dialog/messages.h"
-#include "ui/dialog/prototype.h"
 #include "ui/dialog/symbols.h"
 #include "ui/dialog/tile.h"
 
@@ -41,26 +41,26 @@
 # include "ui/dialog/tracedialog.h"
 #endif
 
-#include "ui/dialog/icon-preview.h"
-#include "ui/dialog/layers.h"
-#include "ui/dialog/panel-dialog.h"
 #include "ui/dialog/pixelartdialog.h"
 #include "ui/dialog/transformation.h"
 #include "ui/dialog/undo-history.h"
+#include "ui/dialog/panel-dialog.h"
+#include "ui/dialog/layers.h"
+#include "ui/dialog/icon-preview.h"
 //#include "ui/dialog/print-colors-preview-dialog.h"
-#include "ui/dialog/clonetiler.h"
-#include "ui/dialog/cssdialog.h"
-#include "ui/dialog/export.h"
+#include "util/ege-appear-time-tracker.h"
 #include "ui/dialog/object-attributes.h"
 #include "ui/dialog/object-properties.h"
-#include "ui/dialog/objects.h"
+#include "ui/dialog/text-edit.h"
 #include "ui/dialog/spellcheck.h"
-#include "ui/dialog/styledialog.h"
+#include "ui/dialog/export.h"
+#include "ui/dialog/xml-tree.h"
+#include "ui/dialog/clonetiler.h"
 #include "ui/dialog/svg-fonts-dialog.h"
+#include "ui/dialog/objects.h"
 #include "ui/dialog/tags.h"
-#include "ui/dialog/text-edit.h"
-#include "ui/dialog/xml-tree.h"
-#include "util/ege-appear-time-tracker.h"
+#include "ui/dialog/styledialog.h"
+#include "ui/dialog/cssdialog.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp
index f58630825..f7e9a1bed 100644
--- a/src/ui/dialog/dialog.cpp
+++ b/src/ui/dialog/dialog.cpp
@@ -22,15 +22,15 @@
 
 #include <gdk/gdkkeysyms.h>
 
-#include "desktop.h"
 #include "inkscape.h"
 #include "ui/monitor.h"
 #include "ui/tools/tool-base.h"
+#include "desktop.h"
 
 #include "shortcuts.h"
 #include "ui/interface.h"
-#include "ui/tool/event-utils.h"
 #include "verbs.h"
+#include "ui/tool/event-utils.h"
 
 #define MIN_ONSCREEN_DISTANCE 50
 
diff --git a/src/ui/dialog/dock-behavior.cpp b/src/ui/dialog/dock-behavior.cpp
index c96bff81f..bff2b2b64 100644
--- a/src/ui/dialog/dock-behavior.cpp
+++ b/src/ui/dialog/dock-behavior.cpp
@@ -15,14 +15,14 @@
 #include "config.h"
 #endif
 
-#include "desktop.h"
-#include "dialog.h"
 #include "dock-behavior.h"
 #include "inkscape.h"
-#include "ui/dialog-events.h"
+#include "desktop.h"
 #include "ui/interface.h"
 #include "ui/widget/dock.h"
 #include "verbs.h"
+#include "dialog.h"
+#include "ui/dialog-events.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/document-metadata.cpp b/src/ui/dialog/document-metadata.cpp
index b96b22c48..e46f5ec6c 100644
--- a/src/ui/dialog/document-metadata.cpp
+++ b/src/ui/dialog/document-metadata.cpp
@@ -18,8 +18,8 @@
 #include "config.h"
 #endif
 
-#include "desktop.h"
 #include "document-metadata.h"
+#include "desktop.h"
 #include "rdf.h"
 #include "verbs.h"
 
diff --git a/src/ui/dialog/extension-editor.cpp b/src/ui/dialog/extension-editor.cpp
index bf8b263b7..14248cc4b 100644
--- a/src/ui/dialog/extension-editor.cpp
+++ b/src/ui/dialog/extension-editor.cpp
@@ -21,9 +21,9 @@
 #include <gtkmm/frame.h>
 #include <gtkmm/notebook.h>
 
+#include "verbs.h"
 #include "preferences.h"
 #include "ui/interface.h"
-#include "verbs.h"
 
 #include "extension/db.h"
 
diff --git a/src/ui/dialog/filedialog.cpp b/src/ui/dialog/filedialog.cpp
index 0cbc3536f..df3c4a307 100644
--- a/src/ui/dialog/filedialog.cpp
+++ b/src/ui/dialog/filedialog.cpp
@@ -22,8 +22,8 @@
 
 #include "filedialogimpl-gtkmm.h"
 
-#include "extension/output.h"
 #include "ui/dialog-events.h"
+#include "extension/output.h"
 
 #include <glibmm/convert.h>
 
diff --git a/src/ui/dialog/filedialogimpl-gtkmm.cpp b/src/ui/dialog/filedialogimpl-gtkmm.cpp
index 4370de94a..c8c508ee3 100644
--- a/src/ui/dialog/filedialogimpl-gtkmm.cpp
+++ b/src/ui/dialog/filedialogimpl-gtkmm.cpp
@@ -24,12 +24,12 @@
 #include <iostream>
 
 #include "filedialogimpl-gtkmm.h"
-#include "io/resource.h"
+#include "ui/dialog-events.h"
+#include "ui/interface.h"
 #include "io/sys.h"
+#include "io/resource.h"
 #include "path-prefix.h"
 #include "preferences.h"
-#include "ui/dialog-events.h"
-#include "ui/interface.h"
 
 #include <gtkmm/expander.h>
 
@@ -41,11 +41,11 @@
 #include <glibmm/regex.h>
 
 #include "document.h"
-#include "extension/db.h"
 #include "extension/input.h"
 #include "extension/output.h"
-#include "inkscape.h"
+#include "extension/db.h"
 #include "svg-view-widget.h"
+#include "inkscape.h"
 
 // Routines from file.cpp
 #undef INK_DUMP_FILENAME_CONV
diff --git a/src/ui/dialog/filter-editor.cpp b/src/ui/dialog/filter-editor.cpp
index 202e724d8..ef702aba4 100644
--- a/src/ui/dialog/filter-editor.cpp
+++ b/src/ui/dialog/filter-editor.cpp
@@ -16,13 +16,13 @@
 
 #include <string>
 
+#include <gtkmm.h>
 #include <gdkmm/display.h>
 #include <glibmm/convert.h>
 #include <glibmm/error.h>
 #include <glibmm/i18n.h>
 #include <glibmm/main.h>
 #include <glibmm/stringutils.h>
-#include <gtkmm.h>
 
 #if GTK_CHECK_VERSION(3, 20, 0)
 # include <gdkmm/seat.h>
@@ -42,13 +42,13 @@
 #include "selection-chemistry.h"
 #include "verbs.h"
 
-#include "io/resource.h"
 #include "io/sys.h"
+#include "io/resource.h"
 
 #include "object/filters/blend.h"
 #include "object/filters/colormatrix.h"
-#include "object/filters/componenttransfer-funcnode.h"
 #include "object/filters/componenttransfer.h"
+#include "object/filters/componenttransfer-funcnode.h"
 #include "object/filters/convolvematrix.h"
 #include "object/filters/distantlight.h"
 #include "object/filters/merge.h"
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index 4b0584b94..e62d309c5 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -33,10 +33,10 @@
 #endif
 
 
-#include <glibmm/convert.h>
 #include <glibmm/i18n.h>
-#include <glibmm/main.h>
 #include <glibmm/stringutils.h>
+#include <glibmm/main.h>
+#include <glibmm/convert.h>
 
 #include "desktop.h"
 #include "dialog-manager.h"
@@ -51,8 +51,8 @@
 
 #include "object/filters/blend.h"
 #include "object/filters/colormatrix.h"
-#include "object/filters/componenttransfer-funcnode.h"
 #include "object/filters/componenttransfer.h"
+#include "object/filters/componenttransfer-funcnode.h"
 #include "object/filters/convolvematrix.h"
 #include "object/filters/distantlight.h"
 #include "object/filters/merge.h"
diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp
index 6c9193ff5..d172eca57 100644
--- a/src/ui/dialog/find.cpp
+++ b/src/ui/dialog/find.cpp
@@ -16,9 +16,9 @@
 
 #include "find.h"
 
+#include <gtkmm/entry.h>
 #include <glibmm/i18n.h>
 #include <glibmm/regex.h>
-#include <gtkmm/entry.h>
 
 #include "desktop.h"
 #include "document-undo.h"
diff --git a/src/ui/dialog/floating-behavior.cpp b/src/ui/dialog/floating-behavior.cpp
index 04a25a621..9abad3e7b 100644
--- a/src/ui/dialog/floating-behavior.cpp
+++ b/src/ui/dialog/floating-behavior.cpp
@@ -14,14 +14,14 @@
 #include "config.h"
 #endif
 
-#include <glibmm/main.h>
 #include <gtkmm/dialog.h>
+#include <glibmm/main.h>
 
-#include "dialog.h"
 #include "floating-behavior.h"
+#include "dialog.h"
 
-#include "desktop.h"
 #include "inkscape.h"
+#include "desktop.h"
 #include "ui/dialog-events.h"
 #include "ui/interface.h"
 #include "verbs.h"
diff --git a/src/ui/dialog/font-substitution.cpp b/src/ui/dialog/font-substitution.cpp
index b13ef8cf0..da7d14d9c 100644
--- a/src/ui/dialog/font-substitution.cpp
+++ b/src/ui/dialog/font-substitution.cpp
@@ -15,8 +15,8 @@
 #include <glibmm/i18n.h>
 #include <glibmm/regex.h>
 
-#include <gtkmm/checkbutton.h>
 #include <gtkmm/messagedialog.h>
+#include <gtkmm/checkbutton.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/textview.h>
 
@@ -28,11 +28,11 @@
 #include "selection-chemistry.h"
 #include "text-editing.h"
 
-#include "object/sp-flowdiv.h"
-#include "object/sp-flowtext.h"
 #include "object/sp-root.h"
 #include "object/sp-text.h"
 #include "object/sp-textpath.h"
+#include "object/sp-flowtext.h"
+#include "object/sp-flowdiv.h"
 #include "object/sp-tspan.h"
 
 #include "libnrtype/FontFactory.h"
diff --git a/src/ui/dialog/grid-arrange-tab.cpp b/src/ui/dialog/grid-arrange-tab.cpp
index 6df64565e..96e6acb3c 100644
--- a/src/ui/dialog/grid-arrange-tab.cpp
+++ b/src/ui/dialog/grid-arrange-tab.cpp
@@ -22,13 +22,13 @@
 
 #include <2geom/transforms.h>
 
-#include "inkscape.h"
-#include "preferences.h"
 #include "verbs.h"
+#include "preferences.h"
+#include "inkscape.h"
 
-#include "desktop.h"
-#include "document-undo.h"
 #include "document.h"
+#include "document-undo.h"
+#include "desktop.h"
     //#include "sp-item-transform.h" FIXME
 #include "ui/dialog/tile.h" // for Inkscape::UI::Dialog::ArrangeDialog
 
diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index 99ad84c9b..47f6f3121 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -18,8 +18,8 @@
 #endif
 
 #include <glibmm/i18n.h>
-#include <glibmm/main.h>
 #include <glibmm/timer.h>
+#include <glibmm/main.h>
 
 #include <gtkmm/buttonbox.h>
 #include <gtkmm/checkbutton.h>
@@ -31,8 +31,8 @@
 #include "verbs.h"
 
 #include "display/cairo-utils.h"
-#include "display/drawing-context.h"
 #include "display/drawing.h"
+#include "display/drawing-context.h"
 
 #include "object/sp-namedview.h"
 #include "object/sp-root.h"
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 2af77ed42..96c446d0c 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -20,11 +20,11 @@
 #include "inkscape-preferences.h"
 
 #include <glibmm/i18n.h>
-#include <glibmm/markup.h>
 #include <glibmm/miscutils.h>
+#include <glibmm/markup.h>
 #include <gtkmm/main.h>
-#include <gtkmm/recentinfo.h>
 #include <gtkmm/recentmanager.h>
+#include <gtkmm/recentinfo.h>
 
 #include "cms-system.h"
 #include "document.h"
diff --git a/src/ui/dialog/input.cpp b/src/ui/dialog/input.cpp
index addc01b0a..3fdd2a6cf 100644
--- a/src/ui/dialog/input.cpp
+++ b/src/ui/dialog/input.cpp
@@ -9,11 +9,11 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
 
-#include "ui/widget/frame.h"
-#include "ui/widget/panel.h"
-#include <list>
 #include <map>
 #include <set>
+#include <list>
+#include "ui/widget/panel.h"
+#include "ui/widget/frame.h"
 
 #include <glibmm/i18n.h>
 
@@ -21,7 +21,6 @@
 #include <gtkmm/cellrenderercombo.h>
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/comboboxtext.h>
-#include <gtkmm/eventbox.h>
 #include <gtkmm/grid.h>
 #include <gtkmm/liststore.h>
 #include <gtkmm/menubar.h>
@@ -30,6 +29,7 @@
 #include <gtkmm/progressbar.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/treestore.h>
+#include <gtkmm/eventbox.h>
 
 #include "device-manager.h"
 #include "preferences.h"
diff --git a/src/ui/dialog/knot-properties.cpp b/src/ui/dialog/knot-properties.cpp
index 0faff17d4..29e1cb2bb 100644
--- a/src/ui/dialog/knot-properties.cpp
+++ b/src/ui/dialog/knot-properties.cpp
@@ -19,15 +19,15 @@
 
 #include "ui/dialog/knot-properties.h"
 
-#include "desktop.h"
-#include "document-undo.h"
-#include "document.h"
-#include "inkscape.h"
-#include "layer-manager.h"
-#include "util/units.h"
 #include <boost/lexical_cast.hpp>
 #include <glibmm/i18n.h>
 #include <glibmm/main.h>
+#include "inkscape.h"
+#include "util/units.h"
+#include "desktop.h"
+#include "document.h"
+#include "document-undo.h"
+#include "layer-manager.h"
 
 #include "selection-chemistry.h"
 
diff --git a/src/ui/dialog/layer-properties.cpp b/src/ui/dialog/layer-properties.cpp
index f8695c206..4ab6e130e 100644
--- a/src/ui/dialog/layer-properties.cpp
+++ b/src/ui/dialog/layer-properties.cpp
@@ -17,18 +17,18 @@
 #include <glibmm/i18n.h>
 #include <glibmm/main.h>
 
+#include "inkscape.h"
 #include "desktop.h"
-#include "document-undo.h"
 #include "document.h"
-#include "inkscape.h"
+#include "document-undo.h"
 #include "layer-manager.h"
 #include "message-stack.h"
 
+#include "verbs.h"
 #include "selection-chemistry.h"
 #include "ui/icon-names.h"
-#include "ui/tools/tool-base.h"
 #include "ui/widget/imagetoggler.h"
-#include "verbs.h"
+#include "ui/tools/tool-base.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index 4e41e889c..6f609736a 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -15,9 +15,9 @@
 
 #include "layers.h"
 
-#include <glibmm/main.h>
 #include <gtkmm/icontheme.h>
 #include <gtkmm/separatormenuitem.h>
+#include <glibmm/main.h>
 
 #include "desktop-style.h"
 #include "desktop.h"
diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp
index e833c5ed1..6cf7f807a 100644
--- a/src/ui/dialog/livepatheffect-editor.cpp
+++ b/src/ui/dialog/livepatheffect-editor.cpp
@@ -38,8 +38,8 @@
 #include "object/sp-item-group.h"
 #include "object/sp-path.h"
 #include "object/sp-rect.h"
-#include "object/sp-text.h"
 #include "object/sp-use.h"
+#include "object/sp-text.h"
 
 #include "ui/icon-names.h"
 #include "ui/tools/node-tool.h"
diff --git a/src/ui/dialog/lpe-fillet-chamfer-properties.cpp b/src/ui/dialog/lpe-fillet-chamfer-properties.cpp
index d2de61dc9..6d19f9090 100644
--- a/src/ui/dialog/lpe-fillet-chamfer-properties.cpp
+++ b/src/ui/dialog/lpe-fillet-chamfer-properties.cpp
@@ -8,15 +8,15 @@
 #include "config.h"
 #endif
 
+#include <gtkmm.h>
+#include "lpe-fillet-chamfer-properties.h"
+#include <boost/lexical_cast.hpp>
+#include <glibmm/i18n.h>
+#include "inkscape.h"
 #include "desktop.h"
 #include "document-undo.h"
-#include "inkscape.h"
 #include "layer-manager.h"
-#include "lpe-fillet-chamfer-properties.h"
 #include "message-stack.h"
-#include <boost/lexical_cast.hpp>
-#include <glibmm/i18n.h>
-#include <gtkmm.h>
 
 #include "selection-chemistry.h"
 
diff --git a/src/ui/dialog/lpe-powerstroke-properties.cpp b/src/ui/dialog/lpe-powerstroke-properties.cpp
index bfb20cc80..e66229dcd 100644
--- a/src/ui/dialog/lpe-powerstroke-properties.cpp
+++ b/src/ui/dialog/lpe-powerstroke-properties.cpp
@@ -17,13 +17,13 @@
 #include "config.h"
 #endif
 
-#include "desktop.h"
-#include "document-undo.h"
-#include "inkscape.h"
-#include "layer-manager.h"
 #include "lpe-powerstroke-properties.h"
 #include <boost/lexical_cast.hpp>
 #include <glibmm/i18n.h>
+#include "inkscape.h"
+#include "desktop.h"
+#include "document-undo.h"
+#include "layer-manager.h"
 
 #include "selection-chemistry.h"
 //#include "event-context.h"
diff --git a/src/ui/dialog/memory.cpp b/src/ui/dialog/memory.cpp
index cd6eaa5a1..c9a16225e 100644
--- a/src/ui/dialog/memory.cpp
+++ b/src/ui/dialog/memory.cpp
@@ -18,12 +18,12 @@
 #include <glibmm/i18n.h>
 #include <glibmm/main.h>
 
-#include <gtkmm/dialog.h>
 #include <gtkmm/liststore.h>
 #include <gtkmm/treeview.h>
+#include <gtkmm/dialog.h>
 
-#include "debug/heap.h"
 #include "inkgc/gc-core.h"
+#include "debug/heap.h"
 #include "verbs.h"
 
 namespace Inkscape {
diff --git a/src/ui/dialog/new-from-template.cpp b/src/ui/dialog/new-from-template.cpp
index ad78cae4b..7e0c5b526 100644
--- a/src/ui/dialog/new-from-template.cpp
+++ b/src/ui/dialog/new-from-template.cpp
@@ -12,8 +12,8 @@
 #include "config.h"
 #endif
 
-#include "file.h"
 #include "new-from-template.h"
+#include "file.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/object-attributes.cpp b/src/ui/dialog/object-attributes.cpp
index 915d413bf..f3e93ded8 100644
--- a/src/ui/dialog/object-attributes.cpp
+++ b/src/ui/dialog/object-attributes.cpp
@@ -29,8 +29,8 @@
 #include "object/sp-anchor.h"
 #include "object/sp-image.h"
 
-#include "ui/dialog/dialog-manager.h"
 #include "ui/dialog/object-attributes.h"
+#include "ui/dialog/dialog-manager.h"
 
 #include "widgets/sp-attribute-widget.h"
 
diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index 4bd016684..c2ee66cd7 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -17,10 +17,10 @@
 
 #include "objects.h"
 
-#include <glibmm/main.h>
 #include <gtkmm/icontheme.h>
 #include <gtkmm/imagemenuitem.h>
 #include <gtkmm/separatormenuitem.h>
+#include <glibmm/main.h>
 
 #include "desktop-style.h"
 #include "desktop.h"
diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp
index 2959b4037..4302161dc 100644
--- a/src/ui/dialog/ocaldialogs.cpp
+++ b/src/ui/dialog/ocaldialogs.cpp
@@ -18,24 +18,24 @@
 
 #include "ocaldialogs.h"
 
+#include "path-prefix.h"
 #include "filedialogimpl-gtkmm.h"
+#include "ui/interface.h"
 #include "inkgc/gc-core.h"
 #include "io/sys.h"
-#include "path-prefix.h"
 #include "preferences.h"
-#include "ui/interface.h"
 
-#include <gdkmm/general.h>
 #include <gtkmm/notebook.h>
 #include <gtkmm/spinner.h>
+#include <gdkmm/general.h>
 #include <libxml/tree.h>
 
+#include <glibmm/i18n.h>
+#include <glibmm/miscutils.h>
+#include <glibmm/markup.h>
 #include <glibmm/convert.h>
 #include <glibmm/fileutils.h>
-#include <glibmm/i18n.h>
 #include <glibmm/main.h>
-#include <glibmm/markup.h>
-#include <glibmm/miscutils.h>
 
 #include "ui/icon-names.h"
 
diff --git a/src/ui/dialog/pixelartdialog.cpp b/src/ui/dialog/pixelartdialog.cpp
index ebc8cea0d..5b96febb7 100644
--- a/src/ui/dialog/pixelartdialog.cpp
+++ b/src/ui/dialog/pixelartdialog.cpp
@@ -22,8 +22,8 @@
 #  include <glibmm/dispatcher.h>
 #  define GLIBMM_DISABLE_DEPRECATED 1
 #else // GLIBMM_DISABLE_DEPRECATED
-#  include <glibmm/dispatcher.h>
 #  include <glibmm/thread.h>
+#  include <glibmm/dispatcher.h>
 #endif // GLIBMM_DISABLE_DEPRECATED
 
 #include <glibmm/i18n.h>
diff --git a/src/ui/dialog/print.cpp b/src/ui/dialog/print.cpp
index 68a4991f1..ea99ffa19 100644
--- a/src/ui/dialog/print.cpp
+++ b/src/ui/dialog/print.cpp
@@ -19,13 +19,13 @@
 #include "preferences.h"
 #include "print.h"
 
-#include "document.h"
 #include "extension/internal/cairo-render-context.h"
 #include "extension/internal/cairo-renderer.h"
+#include "document.h"
 
+#include "util/units.h"
 #include "helper/png-write.h"
 #include "svg/svg-color.h"
-#include "util/units.h"
 
 #include <glibmm/i18n.h>
 
diff --git a/src/ui/dialog/save-template-dialog.cpp b/src/ui/dialog/save-template-dialog.cpp
index 0544a8544..5b7540039 100644
--- a/src/ui/dialog/save-template-dialog.cpp
+++ b/src/ui/dialog/save-template-dialog.cpp
@@ -2,8 +2,8 @@
 #include "config.h"
 #endif
 
-#include "file.h"
 #include "save-template-dialog.h"
+#include "file.h"
 
 #include <glibmm/i18n.h>
 
diff --git a/src/ui/dialog/spellcheck.cpp b/src/ui/dialog/spellcheck.cpp
index 627da6874..252782081 100644
--- a/src/ui/dialog/spellcheck.cpp
+++ b/src/ui/dialog/spellcheck.cpp
@@ -15,18 +15,18 @@
 #include "spellcheck.h"
 #include "message-stack.h"
 
-#include "desktop.h"
-#include "document.h"
 #include "helper/window.h"
 #include "inkscape.h"
+#include "document.h"
+#include "desktop.h"
 
-#include "display/curve.h"
-#include "document-undo.h"
-#include "selection-chemistry.h"
-#include "text-editing.h"
-#include "ui/interface.h"
 #include "ui/tools-switch.h"
 #include "ui/tools/text-tool.h"
+#include "ui/interface.h"
+#include "text-editing.h"
+#include "selection-chemistry.h"
+#include "display/curve.h"
+#include "document-undo.h"
 #include "verbs.h"
 
 #include "object/sp-defs.h"
diff --git a/src/ui/dialog/styledialog.cpp b/src/ui/dialog/styledialog.cpp
index 51cbf27d8..17850712f 100644
--- a/src/ui/dialog/styledialog.cpp
+++ b/src/ui/dialog/styledialog.cpp
@@ -12,11 +12,11 @@
  */
 
 #include "styledialog.h"
+#include "verbs.h"
+#include "selection.h"
 #include "attribute-rel-svg.h"
-#include "document-undo.h"
 #include "inkscape.h"
-#include "selection.h"
-#include "verbs.h"
+#include "document-undo.h"
 
 
 #include "ui/widget/addtoicon.h"
diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp
index b13c8b599..19d67916a 100644
--- a/src/ui/dialog/svg-fonts-dialog.cpp
+++ b/src/ui/dialog/svg-fonts-dialog.cpp
@@ -15,28 +15,28 @@
 #include "config.h"
 #endif
 
-#include "desktop.h"
+#include "svg-fonts-dialog.h"
 #include "document-private.h"
 #include "document-undo.h"
-#include "selection.h"
-#include "svg-fonts-dialog.h"
-#include "svg/svg.h"
-#include "xml/repr.h"
-#include <gtkmm/imagemenuitem.h>
 #include <gtkmm/notebook.h>
 #include <gtkmm/scale.h>
+#include <gtkmm/imagemenuitem.h>
 #include <message-stack.h>
+#include "selection.h"
+#include "svg/svg.h"
+#include "xml/repr.h"
+#include "desktop.h"
 
+#include <sstream>
 #include "display/nr-svgfonts.h"
 #include "verbs.h"
-#include <sstream>
 
-#include "object/sp-defs.h"
 #include "object/sp-font-face.h"
-#include "object/sp-font.h"
-#include "object/sp-glyph-kerning.h"
 #include "object/sp-glyph.h"
 #include "object/sp-missing-glyph.h"
+#include "object/sp-font.h"
+#include "object/sp-glyph-kerning.h"
+#include "object/sp-defs.h"
 
 #include <glibmm/i18n.h>
 #include <glibmm/stringutils.h>
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index 965ea9952..e57dde639 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -9,52 +9,52 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <map>
 #include <algorithm>
 #include <iomanip>
-#include <map>
 #include <set>
 
 #include "swatches.h"
 #include <gtkmm/radiomenuitem.h>
 
-#include <gtkmm/checkmenuitem.h>
 #include <gtkmm/menu.h>
-#include <gtkmm/menubutton.h>
+#include <gtkmm/checkmenuitem.h>
 #include <gtkmm/radiomenuitem.h>
 #include <gtkmm/separatormenuitem.h>
+#include <gtkmm/menubutton.h>
 
-#include <glibmm/fileutils.h>
 #include <glibmm/i18n.h>
 #include <glibmm/main.h>
-#include <glibmm/miscutils.h>
 #include <glibmm/timer.h>
+#include <glibmm/fileutils.h>
+#include <glibmm/miscutils.h>
 
 #include "color-item.h"
 #include "desktop.h"
 
 #include "desktop-style.h"
+#include "document.h"
 #include "document-private.h"
 #include "document-undo.h"
-#include "document.h"
 #include "extension/db.h"
 #include "inkscape.h"
-#include "io/resource.h"
 #include "io/sys.h"
+#include "io/resource.h"
 #include "message-context.h"
 #include "path-prefix.h"
 
-#include "display/cairo-utils.h"
 #include "ui/previewholder.h"
 #include "widgets/desktop-widget.h"
 #include "widgets/gradient-vector.h"
+#include "display/cairo-utils.h"
 
 #include "object/sp-defs.h"
 #include "object/sp-gradient-reference.h"
 
 #include "dialog-manager.h"
+#include "verbs.h"
 #include "gradient-chemistry.h"
 #include "helper/action.h"
-#include "verbs.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp
index 6edb47efd..0ef631a3a 100644
--- a/src/ui/dialog/symbols.cpp
+++ b/src/ui/dialog/symbols.cpp
@@ -12,20 +12,20 @@
 # include "config.h"
 #endif
 
-#include <algorithm>
-#include <fstream>
 #include <iostream>
+#include <algorithm>
 #include <locale>
-#include <regex>
 #include <sstream>
+#include <fstream>
+#include <regex>
 
-#include <glibmm/markup.h>
 #include <glibmm/regex.h>
 #include <glibmm/stringutils.h>
+#include <glibmm/markup.h>
 
-#include "io/resource.h"
-#include "io/sys.h"
 #include "path-prefix.h"
+#include "io/sys.h"
+#include "io/resource.h"
 
 #include "display/cairo-utils.h"
 #include "ui/cache/svg_preview_cache.h"
@@ -34,16 +34,16 @@
 
 #include "symbols.h"
 
-#include "desktop.h"
 #include "selection.h"
+#include "desktop.h"
 
 #include "document.h"
 #include "inkscape.h"
 
-#include "object/sp-defs.h"
 #include "object/sp-root.h"
-#include "object/sp-symbol.h"
 #include "object/sp-use.h"
+#include "object/sp-defs.h"
+#include "object/sp-symbol.h"
 
 #ifdef WITH_LIBVISIO
   #include <libvisio/libvisio.h>
@@ -65,8 +65,8 @@
   #endif
 #endif
 
-#include "helper/action.h"
 #include "verbs.h"
+#include "helper/action.h"
 #include <glibmm/i18n.h>
 
 namespace Inkscape {
diff --git a/src/ui/dialog/tags.cpp b/src/ui/dialog/tags.cpp
index cabb0d679..24f167500 100644
--- a/src/ui/dialog/tags.cpp
+++ b/src/ui/dialog/tags.cpp
@@ -14,31 +14,31 @@
 #endif
 
 #include "tags.h"
-#include <glibmm/main.h>
 #include <gtkmm/icontheme.h>
 #include <gtkmm/imagemenuitem.h>
+#include <glibmm/main.h>
 
-#include "desktop-style.h"
 #include "desktop.h"
-#include "document-undo.h"
+#include "desktop-style.h"
 #include "document.h"
+#include "document-undo.h"
 #include "helper/action.h"
 #include "inkscape.h"
 #include "layer-fns.h"
 #include "layer-manager.h"
 
 #include "svg/css-ostringstream.h"
-#include "ui/tools/tool-base.h" //"event-context.h"
-#include "ui/widget/addtoicon.h"
 #include "ui/widget/layertypeicon.h"
+#include "ui/widget/addtoicon.h"
 #include "verbs.h"
 #include "xml/node-observer.h"
+#include "ui/tools/tool-base.h" //"event-context.h"
 //#include "dialogs/dialog-events.h"
-#include "filter-chemistry.h"
 #include "ui/widget/color-notebook.h"
+#include "filter-chemistry.h"
 
-#include "object/sp-defs.h"
 #include "object/sp-item.h"
+#include "object/sp-defs.h"
 #include "object/sp-object-group.h"
 
 //#define DUMP_LAYERS 1
diff --git a/src/ui/dialog/template-load-tab.cpp b/src/ui/dialog/template-load-tab.cpp
index e528e2da8..d39c03709 100644
--- a/src/ui/dialog/template-load-tab.cpp
+++ b/src/ui/dialog/template-load-tab.cpp
@@ -11,18 +11,18 @@
 #include "template-widget.h"
 #include "new-from-template.h"
 
-#include <glibmm/fileutils.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/stringutils.h>
+#include <glibmm/fileutils.h>
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/scrolledwindow.h>
 #include <iostream>
 
 #include "extension/db.h"
-#include "file.h"
 #include "inkscape.h"
-#include "path-prefix.h"
 #include "ui/interface.h"
+#include "file.h"
+#include "path-prefix.h"
 
 using namespace Inkscape::IO::Resource;
 
diff --git a/src/ui/dialog/template-widget.cpp b/src/ui/dialog/template-widget.cpp
index 746cc473c..12c6b0298 100644
--- a/src/ui/dialog/template-widget.cpp
+++ b/src/ui/dialog/template-widget.cpp
@@ -14,8 +14,8 @@
 #include <gtkmm/messagedialog.h>
 
 #include "desktop.h"
-#include "document-undo.h"
 #include "document.h"
+#include "document-undo.h"
 #include "file.h"
 #include "inkscape.h"
 
diff --git a/src/ui/dialog/tracedialog.cpp b/src/ui/dialog/tracedialog.cpp
index f142cbcc3..a1d4d88b8 100644
--- a/src/ui/dialog/tracedialog.cpp
+++ b/src/ui/dialog/tracedialog.cpp
@@ -16,20 +16,20 @@
 #endif
 
 #include "tracedialog.h"
-#include "ui/widget/frame.h"
-#include "ui/widget/spinbutton.h"
-#include <gtkmm/frame.h>
 #include <gtkmm/notebook.h>
+#include <gtkmm/frame.h>
 #include <gtkmm/radiobutton.h>
+#include "ui/widget/spinbutton.h"
+#include "ui/widget/frame.h"
 
 #include <glibmm/i18n.h>
 
-#include "desktop-tracker.h"
 #include "desktop.h"
+#include "desktop-tracker.h"
 #include "selection.h"
 
-#include "inkscape.h"
 #include "trace/potrace/inkscape-potrace.h"
+#include "inkscape.h"
 
 
 namespace Inkscape {
diff --git a/src/ui/dialog/undo-history.cpp b/src/ui/dialog/undo-history.cpp
index 35522552b..2486e8897 100644
--- a/src/ui/dialog/undo-history.cpp
+++ b/src/ui/dialog/undo-history.cpp
@@ -17,8 +17,8 @@
 
 #include "undo-history.h"
 
-#include "document-undo.h"
 #include "document.h"
+#include "document-undo.h"
 #include "inkscape.h"
 
 #include "util/signal-blocker.h"
diff --git a/src/ui/draw-anchor.cpp b/src/ui/draw-anchor.cpp
index a0710040d..c3bc5676d 100644
--- a/src/ui/draw-anchor.cpp
+++ b/src/ui/draw-anchor.cpp
@@ -15,11 +15,11 @@
 
 #include "ui/draw-anchor.h"
 #include "desktop.h"
-#include "display/curve.h"
+#include "ui/tools/tool-base.h"
+#include "ui/tools/lpe-tool.h"
 #include "display/sodipodi-ctrl.h"
+#include "display/curve.h"
 #include "ui/control-manager.h"
-#include "ui/tools/lpe-tool.h"
-#include "ui/tools/tool-base.h"
 
 using Inkscape::ControlManager;
 
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index 6d0700fed..4ae0f4a6d 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -23,10 +23,10 @@
 #include <config.h>
 #endif
 
-#include <glibmm/miscutils.h>
 #include <gtkmm/icontheme.h>
 #include <gtkmm/radiomenuitem.h>
 #include <gtkmm/separatormenuitem.h>
+#include <glibmm/miscutils.h>
 
 #include "desktop-style.h"
 #include "desktop.h"
diff --git a/src/ui/previewholder.cpp b/src/ui/previewholder.cpp
index 0537586ff..dfe75c0b7 100644
--- a/src/ui/previewholder.cpp
+++ b/src/ui/previewholder.cpp
@@ -13,11 +13,11 @@
 #include "previewable.h"
 #include "previewholder.h"
 
-#include <gtkmm/adjustment.h>
-#include <gtkmm/grid.h>
-#include <gtkmm/scrollbar.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/sizegroup.h>
+#include <gtkmm/scrollbar.h>
+#include <gtkmm/adjustment.h>
+#include <gtkmm/grid.h>
 
 #define COLUMNS_FOR_SMALL 16
 #define COLUMNS_FOR_LARGE 8
diff --git a/src/ui/selected-color.cpp b/src/ui/selected-color.cpp
index ba5fd565c..08f4bd979 100644
--- a/src/ui/selected-color.cpp
+++ b/src/ui/selected-color.cpp
@@ -14,8 +14,8 @@
 #include <config.h>
 #endif
 
-#include <cmath>
 #include <glibmm/ustring.h>
+#include <cmath>
 
 #include "svg/svg-icc-color.h"
 #include "ui/selected-color.h"
diff --git a/src/ui/shape-editor-knotholders.cpp b/src/ui/shape-editor-knotholders.cpp
index c648109ee..1027dea7f 100644
--- a/src/ui/shape-editor-knotholders.cpp
+++ b/src/ui/shape-editor-knotholders.cpp
@@ -17,10 +17,10 @@
 
 #include <glibmm/i18n.h>
 
+#include "preferences.h"
 #include "desktop.h"
-#include "knot-holder-entity.h"
 #include "knotholder.h"
-#include "preferences.h"
+#include "knot-holder-entity.h"
 
 #include "live_effects/effect.h"
 
diff --git a/src/ui/shape-editor.cpp b/src/ui/shape-editor.cpp
index d0823a69f..b40bec86f 100644
--- a/src/ui/shape-editor.cpp
+++ b/src/ui/shape-editor.cpp
@@ -11,13 +11,13 @@
 #include <config.h>
 #endif
 
-#include <glibmm/i18n.h>
 #include <string.h>
+#include <glibmm/i18n.h>
 
 #include "desktop.h"
 #include "document.h"
-#include "inkscape.h"
 #include "knotholder.h"
+#include "inkscape.h"
 
 #include "object/sp-path.h"
 
diff --git a/src/ui/tool/control-point-selection.cpp b/src/ui/tool/control-point-selection.cpp
index fade7cf55..a5611addc 100644
--- a/src/ui/tool/control-point-selection.cpp
+++ b/src/ui/tool/control-point-selection.cpp
@@ -9,14 +9,14 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <boost/none.hpp>
+#include "ui/tool/selectable-control-point.h"
+#include <2geom/transforms.h>
 #include "desktop.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/event-utils.h"
-#include "ui/tool/node.h"
-#include "ui/tool/selectable-control-point.h"
 #include "ui/tool/transform-handle-set.h"
-#include <2geom/transforms.h>
-#include <boost/none.hpp>
+#include "ui/tool/node.h"
 
 
 
diff --git a/src/ui/tool/control-point.cpp b/src/ui/tool/control-point.cpp
index aa897f1be..005e60c62 100644
--- a/src/ui/tool/control-point.cpp
+++ b/src/ui/tool/control-point.cpp
@@ -16,16 +16,16 @@
 #include "desktop.h"
 #include "message-context.h"
 
-#include "display/snap-indicator.h"
 #include "display/sp-canvas.h"
+#include "display/snap-indicator.h"
 
 #include "object/sp-namedview.h"
 
+#include "ui/tools/tool-base.h"
 #include "ui/control-manager.h"
 #include "ui/tool/control-point.h"
 #include "ui/tool/event-utils.h"
 #include "ui/tool/transform-handle-set.h"
-#include "ui/tools/tool-base.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tool/curve-drag-point.cpp b/src/ui/tool/curve-drag-point.cpp
index 78fdc8aba..685823aaa 100644
--- a/src/ui/tool/curve-drag-point.cpp
+++ b/src/ui/tool/curve-drag-point.cpp
@@ -7,12 +7,12 @@
  */
 
 #include "ui/tool/curve-drag-point.h"
+#include <glib/gi18n.h>
 #include "desktop.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/event-utils.h"
 #include "ui/tool/multi-path-manipulator.h"
 #include "ui/tool/path-manipulator.h"
-#include <glib/gi18n.h>
 
 #include "object/sp-namedview.h"
 #include "object/sp-path.h"
diff --git a/src/ui/tool/event-utils.cpp b/src/ui/tool/event-utils.cpp
index de2feb9e5..6b8d5f0dc 100644
--- a/src/ui/tool/event-utils.cpp
+++ b/src/ui/tool/event-utils.cpp
@@ -8,11 +8,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "display/sp-canvas.h"
-#include "ui/tool/event-utils.h"
 #include <cstring>
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
+#include "display/sp-canvas.h"
+#include "ui/tool/event-utils.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tool/modifier-tracker.cpp b/src/ui/tool/modifier-tracker.cpp
index 196626006..f502acab2 100644
--- a/src/ui/tool/modifier-tracker.cpp
+++ b/src/ui/tool/modifier-tracker.cpp
@@ -8,10 +8,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "ui/tool/event-utils.h"
-#include "ui/tool/modifier-tracker.h"
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
+#include "ui/tool/event-utils.h"
+#include "ui/tool/modifier-tracker.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tool/multi-path-manipulator.cpp b/src/ui/tool/multi-path-manipulator.cpp
index 7bb0d58da..b982a622f 100644
--- a/src/ui/tool/multi-path-manipulator.cpp
+++ b/src/ui/tool/multi-path-manipulator.cpp
@@ -14,8 +14,8 @@
 #include <glibmm/i18n.h>
 
 #include "desktop.h"
-#include "document-undo.h"
 #include "document.h"
+#include "document-undo.h"
 #include "message-stack.h"
 #include "node.h"
 #include "verbs.h"
diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
index ad7c07921..94a80a882 100644
--- a/src/ui/tool/node.cpp
+++ b/src/ui/tool/node.cpp
@@ -6,12 +6,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <boost/utility.hpp>
 #include <iostream>
 #include <stdexcept>
+#include <boost/utility.hpp>
 
-#include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
+#include <gdk/gdkkeysyms.h>
 
 #include <2geom/bezier-utils.h>
 
@@ -19,16 +19,16 @@
 #include "multi-path-manipulator.h"
 #include "snap.h"
 
-#include "display/sp-canvas-util.h"
-#include "display/sp-canvas.h"
 #include "display/sp-ctrlline.h"
+#include "display/sp-canvas.h"
+#include "display/sp-canvas-util.h"
 
 #include "ui/control-manager.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/event-utils.h"
 #include "ui/tool/path-manipulator.h"
-#include "ui/tools-switch.h"
 #include "ui/tools/node-tool.h"
+#include "ui/tools-switch.h"
 
 namespace {
 
diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp
index 4b253d327..192a02fe2 100644
--- a/src/ui/tool/path-manipulator.cpp
+++ b/src/ui/tool/path-manipulator.cpp
@@ -13,17 +13,17 @@
 #include <2geom/bezier-utils.h>
 #include <2geom/path-sink.h>
 
-#include "display/canvas-bpath.h"
-#include "display/curve.h"
-#include "display/sp-canvas-util.h"
 #include "display/sp-canvas.h"
+#include "display/sp-canvas-util.h"
+#include "display/curve.h"
+#include "display/canvas-bpath.h"
 
 #include "helper/geom.h"
 
-#include "live_effects/lpe-bspline.h"
-#include "live_effects/lpe-powerstroke.h"
-#include "live_effects/lpeobject-reference.h"
 #include "live_effects/lpeobject.h"
+#include "live_effects/lpeobject-reference.h"
+#include "live_effects/lpe-powerstroke.h"
+#include "live_effects/lpe-bspline.h"
 #include "live_effects/parameter/path.h"
 
 #include "object/sp-path.h"
diff --git a/src/ui/tool/selector.cpp b/src/ui/tool/selector.cpp
index cf14d8c6c..84e96173d 100644
--- a/src/ui/tool/selector.cpp
+++ b/src/ui/tool/selector.cpp
@@ -13,9 +13,9 @@
 #include "desktop.h"
 
 #include "display/sodipodi-ctrlrect.h"
+#include "ui/tools/tool-base.h"
 #include "ui/tool/event-utils.h"
 #include "ui/tool/selector.h"
-#include "ui/tools/tool-base.h"
 
 #include <gdk/gdkkeysyms.h>
 
diff --git a/src/ui/tool/transform-handle-set.cpp b/src/ui/tool/transform-handle-set.cpp
index 16258a16a..23cd6b79d 100644
--- a/src/ui/tool/transform-handle-set.cpp
+++ b/src/ui/tool/transform-handle-set.cpp
@@ -9,8 +9,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <algorithm>
 #include <math.h>
+#include <algorithm>
 
 #include <glib/gi18n.h>
 
diff --git a/src/ui/tools-switch.cpp b/src/ui/tools-switch.cpp
index 0194134ba..5953887ce 100644
--- a/src/ui/tools-switch.cpp
+++ b/src/ui/tools-switch.cpp
@@ -13,20 +13,20 @@
 
 #include <gtkmm.h> // prevents deprecation warnings
 
-#include "desktop.h"
 #include "inkscape.h"
+#include "desktop.h"
 
 #include <glibmm/i18n.h>
 
 #include "ui/tools-switch.h"
 
+#include "object/sp-rect.h"
 #include "object/sp-ellipse.h"
 #include "object/sp-flowtext.h"
 #include "object/sp-offset.h"
 #include "object/sp-path.h"
-#include "object/sp-rect.h"
-#include "object/sp-spiral.h"
 #include "object/sp-star.h"
+#include "object/sp-spiral.h"
 #include "object/sp-text.h"
 
 // TODO: How many of these are actually needed?
diff --git a/src/ui/tools/arc-tool.cpp b/src/ui/tools/arc-tool.cpp
index d88e2982f..34b29f3bb 100644
--- a/src/ui/tools/arc-tool.cpp
+++ b/src/ui/tools/arc-tool.cpp
@@ -19,8 +19,8 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
+#include <gdk/gdkkeysyms.h>
 
 #include "context-fns.h"
 #include "desktop-style.h"
@@ -34,20 +34,20 @@
 #include "snap.h"
 #include "verbs.h"
 
-#include "display/sp-canvas-item.h"
 #include "display/sp-canvas.h"
+#include "display/sp-canvas-item.h"
 
 #include "object/sp-ellipse.h"
 #include "object/sp-namedview.h"
 
 #include "pixmaps/cursor-ellipse.xpm"
 
-#include "ui/shape-editor.h"
 #include "ui/tools/arc-tool.h"
+#include "ui/shape-editor.h"
 #include "ui/tools/tool-base.h"
 
-#include "xml/node-event-vector.h"
 #include "xml/repr.h"
+#include "xml/node-event-vector.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/ui/tools/calligraphic-tool.cpp b/src/ui/tools/calligraphic-tool.cpp
index 3d8784c01..c080571d0 100644
--- a/src/ui/tools/calligraphic-tool.cpp
+++ b/src/ui/tools/calligraphic-tool.cpp
@@ -23,16 +23,16 @@
 
 #define noDYNA_DRAW_VERBOSE
 
-#include <cstring>
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
-#include <gtk/gtk.h>
-#include <numeric>
 #include <string>
+#include <cstring>
+#include <numeric>
 
+#include <2geom/pathvector.h>
 #include <2geom/bezier-utils.h>
 #include <2geom/circle.h>
-#include <2geom/pathvector.h>
 
 #include "context-fns.h"
 #include "desktop-events.h"
diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp
index 6ae39431d..c1175f592 100644
--- a/src/ui/tools/connector-tool.cpp
+++ b/src/ui/tools/connector-tool.cpp
@@ -66,12 +66,12 @@
  *
  */
 
-#include <cstring>
 #include <string>
+#include <cstring>
 
-#include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
 #include <glibmm/stringutils.h>
+#include <gdk/gdkkeysyms.h>
 
 #include "context-fns.h"
 #include "desktop-style.h"
diff --git a/src/ui/tools/dropper-tool.cpp b/src/ui/tools/dropper-tool.cpp
index d66af2c65..07fc4b719 100644
--- a/src/ui/tools/dropper-tool.cpp
+++ b/src/ui/tools/dropper-tool.cpp
@@ -15,12 +15,12 @@
 #include <config.h>
 #endif
 
+#include <glibmm/i18n.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
-#include <glibmm/i18n.h>
 
-#include <2geom/circle.h>
 #include <2geom/transforms.h>
+#include <2geom/circle.h>
 
 #include "color-rgba.h"
 #include "desktop-style.h"
@@ -33,10 +33,10 @@
 #include "sp-cursor.h"
 #include "verbs.h"
 
-#include "display/cairo-utils.h"
-#include "display/canvas-arena.h"
 #include "display/canvas-bpath.h"
+#include "display/canvas-arena.h"
 #include "display/curve.h"
+#include "display/cairo-utils.h"
 
 #include "object/sp-namedview.h"
 
diff --git a/src/ui/tools/dynamic-base.cpp b/src/ui/tools/dynamic-base.cpp
index fa913e37b..1026c26c6 100644
--- a/src/ui/tools/dynamic-base.cpp
+++ b/src/ui/tools/dynamic-base.cpp
@@ -1,10 +1,10 @@
 
 #include "ui/tools/dynamic-base.h"
 
+#include "message-context.h"
+#include "display/sp-canvas-item.h"
 #include "desktop.h"
 #include "display/curve.h"
-#include "display/sp-canvas-item.h"
-#include "message-context.h"
 
 #define MIN_PRESSURE      0.0
 #define MAX_PRESSURE      1.0
diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp
index 4920de584..6d1c24f07 100644
--- a/src/ui/tools/eraser-tool.cpp
+++ b/src/ui/tools/eraser-tool.cpp
@@ -24,13 +24,13 @@
 
 #define noERASER_VERBOSE
 
+#include <string>
 #include <cstring>
 #include <numeric>
-#include <string>
 
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
-#include <gtk/gtk.h>
 
 #include <2geom/bezier-utils.h>
 #include <2geom/pathvector.h>
@@ -52,10 +52,10 @@
 #include "splivarot.h"
 #include "verbs.h"
 
+#include "display/sp-canvas.h"
 #include "display/canvas-arena.h"
 #include "display/canvas-bpath.h"
 #include "display/curve.h"
-#include "display/sp-canvas.h"
 
 #include "object/sp-clippath.h"
 #include "object/sp-item-group.h"
diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index 8a22dfe94..a9b3ff8f5 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -30,8 +30,8 @@
 
 #include "live_effects/lpe-bendpath.h"
 #include "live_effects/lpe-patternalongpath.h"
-#include "live_effects/lpe-powerstroke.h"
 #include "live_effects/lpe-simplify.h"
+#include "live_effects/lpe-powerstroke.h"
 
 #include "svg/svg.h"
 
diff --git a/src/ui/tools/gradient-tool.cpp b/src/ui/tools/gradient-tool.cpp
index 1e2347769..b0c2a0185 100644
--- a/src/ui/tools/gradient-tool.cpp
+++ b/src/ui/tools/gradient-tool.cpp
@@ -16,8 +16,8 @@
 #include <config.h>
 #endif
 
-#include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
+#include <gdk/gdkkeysyms.h>
 
 #include "desktop.h"
 #include "document-undo.h"
diff --git a/src/ui/tools/lpe-tool.cpp b/src/ui/tools/lpe-tool.cpp
index d52a19121..f62a70c34 100644
--- a/src/ui/tools/lpe-tool.cpp
+++ b/src/ui/tools/lpe-tool.cpp
@@ -29,9 +29,9 @@
 #include "message-stack.h"
 #include "selection.h"
 
+#include "display/curve.h"
 #include "display/canvas-bpath.h"
 #include "display/canvas-text.h"
-#include "display/curve.h"
 
 #include "object/sp-path.h"
 
@@ -39,8 +39,8 @@
 
 #include "util/units.h"
 
-#include "ui/shape-editor.h"
 #include "ui/tools/lpe-tool.h"
+#include "ui/shape-editor.h"
 
 using Inkscape::Util::unit_table;
 using Inkscape::UI::Tools::PenTool;
diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index e2e55a580..c2bc23d8b 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -14,8 +14,8 @@
 #include <config.h>
 #endif
 
-#include <glibmm/i18n.h>
 #include <gtkmm.h>
+#include <glibmm/i18n.h>
 
 #include <boost/none_t.hpp>
 
diff --git a/src/ui/tools/mesh-tool.cpp b/src/ui/tools/mesh-tool.cpp
index 5cf7316a7..e94da4813 100644
--- a/src/ui/tools/mesh-tool.cpp
+++ b/src/ui/tools/mesh-tool.cpp
@@ -29,8 +29,8 @@
 #include "desktop.h"
 #include "document-undo.h"
 #include "document.h"
-#include "gradient-chemistry.h"
 #include "gradient-drag.h"
+#include "gradient-chemistry.h"
 #include "macros.h"
 #include "message-context.h"
 #include "message-stack.h"
@@ -39,8 +39,8 @@
 #include "snap.h"
 #include "verbs.h"
 
-#include "display/curve.h"
 #include "display/sp-ctrlcurve.h"
+#include "display/curve.h"
 
 #include "object/sp-defs.h"
 #include "object/sp-mesh-gradient.h"
@@ -48,8 +48,8 @@
 #include "object/sp-text.h"
 #include "style.h"
 
-#include "pixmaps/cursor-gradient-add.xpm"
 #include "pixmaps/cursor-gradient.xpm"
+#include "pixmaps/cursor-gradient-add.xpm"
 
 #include "ui/control-manager.h"
 #include "ui/tools/mesh-tool.h"
diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp
index 301566f6e..d54adba89 100644
--- a/src/ui/tools/node-tool.cpp
+++ b/src/ui/tools/node-tool.cpp
@@ -10,8 +10,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
+#include <gdk/gdkkeysyms.h>
 
 
 
diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 6f98919ef..7dd120077 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -50,8 +50,8 @@
 #include "ui/tools/pen-tool.h"
 
 // we include the necessary files for BSpline & Spiro
-#include "live_effects/lpeobject-reference.h"
 #include "live_effects/lpeobject.h"
+#include "live_effects/lpeobject-reference.h"
 #include "live_effects/parameter/path.h"
 
 #define INKSCAPE_LPE_SPIRO_C
diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp
index ff84ee138..590ef3634 100644
--- a/src/ui/tools/pencil-tool.cpp
+++ b/src/ui/tools/pencil-tool.cpp
@@ -19,8 +19,8 @@
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
 
-#include <2geom/bezier-utils.h>
 #include <2geom/sbasis-to-bezier.h>
+#include <2geom/bezier-utils.h>
 
 #include "ui/tools/pencil-tool.h"
 
@@ -40,8 +40,8 @@
 #include "display/curve.h"
 #include "display/sp-canvas.h"
 
-#include "live_effects/lpe-powerstroke-interpolators.h"
 #include "live_effects/lpe-powerstroke.h"
+#include "live_effects/lpe-powerstroke-interpolators.h"
 
 #include "object/sp-path.h"
 #include "style.h"
diff --git a/src/ui/tools/rect-tool.cpp b/src/ui/tools/rect-tool.cpp
index c4d942435..7442c6eca 100644
--- a/src/ui/tools/rect-tool.cpp
+++ b/src/ui/tools/rect-tool.cpp
@@ -34,8 +34,8 @@
 #include "display/sp-canvas-item.h"
 #include "display/sp-canvas.h"
 
-#include "object/sp-namedview.h"
 #include "object/sp-rect.h"
+#include "object/sp-namedview.h"
 
 #include "pixmaps/cursor-rect.xpm"
 
diff --git a/src/ui/tools/select-tool.cpp b/src/ui/tools/select-tool.cpp
index a70620be8..ddc6e2881 100644
--- a/src/ui/tools/select-tool.cpp
+++ b/src/ui/tools/select-tool.cpp
@@ -37,8 +37,8 @@
 #include "sp-cursor.h"
 
 #include "display/drawing-item.h"
-#include "display/sp-canvas-item.h"
 #include "display/sp-canvas.h"
+#include "display/sp-canvas-item.h"
 
 #include "object/box3d.h"
 #include "style.h"
diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 8f5800f72..603d5e80a 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -57,11 +57,11 @@
 
 #include "pixmaps/cursor-spray.xpm"
 
-#include "svg/svg-color.h"
 #include "svg/svg.h"
+#include "svg/svg-color.h"
 
-#include "ui/dialog/dialog-manager.h"
 #include "ui/tools/spray-tool.h"
+#include "ui/dialog/dialog-manager.h"
 
 
 using Inkscape::DocumentUndo;
diff --git a/src/ui/tools/star-tool.cpp b/src/ui/tools/star-tool.cpp
index 46412a6ab..3a5615c3b 100644
--- a/src/ui/tools/star-tool.cpp
+++ b/src/ui/tools/star-tool.cpp
@@ -34,8 +34,8 @@
 #include "selection.h"
 #include "verbs.h"
 
-#include "display/sp-canvas-item.h"
 #include "display/sp-canvas.h"
+#include "display/sp-canvas-item.h"
 
 #include "object/sp-namedview.h"
 #include "object/sp-star.h"
diff --git a/src/ui/tools/text-tool.cpp b/src/ui/tools/text-tool.cpp
index 41c2f4061..8db6c323c 100644
--- a/src/ui/tools/text-tool.cpp
+++ b/src/ui/tools/text-tool.cpp
@@ -18,11 +18,11 @@
 #endif
 
 #include <gdk/gdkkeysyms.h>
-#include <glibmm/i18n.h>
 #include <gtkmm/clipboard.h>
+#include <glibmm/i18n.h>
 
-#include <display/sodipodi-ctrlrect.h>
 #include <display/sp-ctrlline.h>
+#include <display/sodipodi-ctrlrect.h>
 #include <display/sp-ctrlquadr.h>
 
 #include "context-fns.h"
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index c643f16e1..9f9a155c2 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -21,8 +21,8 @@
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
 
-#include "file.h"
 #include "shortcuts.h"
+#include "file.h"
 
 
 
@@ -38,24 +38,24 @@
 #include "selection.h"
 #include "sp-cursor.h"
 
-#include "display/canvas-rotate.h"
-#include "display/sp-canvas-group.h"
 #include "display/sp-canvas.h"
+#include "display/sp-canvas-group.h"
+#include "display/canvas-rotate.h"
 
 #include "object/sp-guide.h"
 
 #include "ui/contextmenu.h"
-#include "ui/event-debug.h"
 #include "ui/interface.h"
-#include "ui/shape-editor.h"
-#include "ui/tool/commit-events.h"
+#include "ui/event-debug.h"
 #include "ui/tool/control-point.h"
-#include "ui/tool/event-utils.h"
-#include "ui/tool/shape-record.h"
+#include "ui/shape-editor.h"
+#include "ui/tools/tool-base.h"
 #include "ui/tools-switch.h"
 #include "ui/tools/lpe-tool.h"
+#include "ui/tool/commit-events.h"
+#include "ui/tool/event-utils.h"
 #include "ui/tools/node-tool.h"
-#include "ui/tools/tool-base.h"
+#include "ui/tool/shape-record.h"
 
 #include "widgets/desktop-widget.h"
 
diff --git a/src/ui/tools/tweak-tool.cpp b/src/ui/tools/tweak-tool.cpp
index e8bc87ecc..6698316c7 100644
--- a/src/ui/tools/tweak-tool.cpp
+++ b/src/ui/tools/tweak-tool.cpp
@@ -13,9 +13,9 @@
 
 #include <numeric>
 
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
-#include <gtk/gtk.h>
 
 #include <2geom/circle.h>
 
diff --git a/src/ui/tools/zoom-tool.cpp b/src/ui/tools/zoom-tool.cpp
index 3ebb987c4..6f7fca242 100644
--- a/src/ui/tools/zoom-tool.cpp
+++ b/src/ui/tools/zoom-tool.cpp
@@ -15,12 +15,12 @@
 #include <gdk/gdkkeysyms.h>
 
 #include "macros.h"
-#include "desktop.h"
+#include "rubberband.h"
 #include "display/sp-canvas-item.h"
 #include "display/sp-canvas-util.h"
-#include "pixmaps/cursor-zoom-out.xpm"
+#include "desktop.h"
 #include "pixmaps/cursor-zoom.xpm"
-#include "rubberband.h"
+#include "pixmaps/cursor-zoom-out.xpm"
 #include "selection-chemistry.h"
 
 #include "ui/tools/zoom-tool.h"
diff --git a/src/ui/uxmanager.cpp b/src/ui/uxmanager.cpp
index d81e1afc4..3ec38edf9 100644
--- a/src/ui/uxmanager.cpp
+++ b/src/ui/uxmanager.cpp
@@ -15,10 +15,10 @@
 
 #include "widgets/desktop-widget.h"
 
+#include "uxmanager.h"
 #include "desktop.h"
 #include "ui/monitor.h"
 #include "util/ege-tags.h"
-#include "uxmanager.h"
 #include "widgets/toolbox.h"
 
 
diff --git a/src/ui/view/view.cpp b/src/ui/view/view.cpp
index 5322c93d7..47e2a1e0d 100644
--- a/src/ui/view/view.cpp
+++ b/src/ui/view/view.cpp
@@ -14,13 +14,13 @@
 # include "config.h"
 #endif
 
+#include <2geom/point.h>
 #include "document.h"
-#include "inkscape.h"
-#include "message-context.h"
+#include "view.h"
 #include "message-stack.h"
+#include "message-context.h"
 #include "verbs.h"
-#include "view.h"
-#include <2geom/point.h>
+#include "inkscape.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/addtoicon.cpp b/src/ui/widget/addtoicon.cpp
index a8a5b0d9e..e5119fc60 100644
--- a/src/ui/widget/addtoicon.cpp
+++ b/src/ui/widget/addtoicon.cpp
@@ -16,9 +16,9 @@
 
 #include <gtkmm/icontheme.h>
 
-#include "layertypeicon.h"
-#include "ui/icon-names.h"
 #include "widgets/toolbox.h"
+#include "ui/icon-names.h"
+#include "layertypeicon.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/clipmaskicon.cpp b/src/ui/widget/clipmaskicon.cpp
index bd6375f80..eceff13ca 100644
--- a/src/ui/widget/clipmaskicon.cpp
+++ b/src/ui/widget/clipmaskicon.cpp
@@ -15,9 +15,9 @@
 
 #include <gtkmm/icontheme.h>
 
-#include "layertypeicon.h"
-#include "ui/icon-names.h"
 #include "widgets/toolbox.h"
+#include "ui/icon-names.h"
+#include "layertypeicon.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp
index a37559323..32f99747a 100644
--- a/src/ui/widget/color-icc-selector.cpp
+++ b/src/ui/widget/color-icc-selector.cpp
@@ -4,8 +4,8 @@
 
 #include <set>
 
-#include <glibmm/i18n.h>
 #include <gtkmm/adjustment.h>
+#include <glibmm/i18n.h>
 
 #include "colorspace.h"
 #include "document.h"
@@ -23,9 +23,9 @@
 #define noDEBUG_LCMS
 
 #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
+#include "object/color-profile.h"
 #include "cms-system.h"
 #include "color-profile-cms-fns.h"
-#include "object/color-profile.h"
 
 #ifdef DEBUG_LCMS
 #include "preferences.h"
diff --git a/src/ui/widget/color-picker.cpp b/src/ui/widget/color-picker.cpp
index 4b74759f9..5c6820e83 100644
--- a/src/ui/widget/color-picker.cpp
+++ b/src/ui/widget/color-picker.cpp
@@ -11,10 +11,10 @@
  */
 
 #include "color-picker.h"
+#include "inkscape.h"
 #include "desktop.h"
-#include "document-undo.h"
 #include "document.h"
-#include "inkscape.h"
+#include "document-undo.h"
 #include "ui/dialog-events.h"
 
 #include "ui/widget/color-notebook.h"
diff --git a/src/ui/widget/color-scales.cpp b/src/ui/widget/color-scales.cpp
index 6d8621027..cb6349c4b 100644
--- a/src/ui/widget/color-scales.cpp
+++ b/src/ui/widget/color-scales.cpp
@@ -6,8 +6,8 @@
 #include <config.h>
 #endif
 
-#include <glibmm/i18n.h>
 #include <gtkmm/adjustment.h>
+#include <glibmm/i18n.h>
 
 #include "ui/dialog-events.h"
 #include "ui/widget/color-scales.h"
diff --git a/src/ui/widget/color-slider.cpp b/src/ui/widget/color-slider.cpp
index 3af52e469..ed034598e 100644
--- a/src/ui/widget/color-slider.cpp
+++ b/src/ui/widget/color-slider.cpp
@@ -20,9 +20,9 @@
 #include <gtkmm/adjustment.h>
 #include <gtkmm/stylecontext.h>
 
-#include "preferences.h"
 #include "ui/widget/color-scales.h"
 #include "ui/widget/color-slider.h"
+#include "preferences.h"
 
 static const gint SLIDER_WIDTH = 96;
 static const gint SLIDER_HEIGHT = 8;
diff --git a/src/ui/widget/color-wheel-selector.cpp b/src/ui/widget/color-wheel-selector.cpp
index c8f1f8e30..ffdf173ba 100644
--- a/src/ui/widget/color-wheel-selector.cpp
+++ b/src/ui/widget/color-wheel-selector.cpp
@@ -4,14 +4,14 @@
 
 #include "color-wheel-selector.h"
 
-#include "ui/dialog-events.h"
-#include "ui/widget/color-scales.h"
-#include "ui/widget/color-slider.h"
-#include "widgets/gimp/gimpcolorwheel.h"
 #include <glibmm/i18n.h>
 #include <gtkmm/adjustment.h>
 #include <gtkmm/label.h>
 #include <gtkmm/spinbutton.h>
+#include "ui/dialog-events.h"
+#include "ui/widget/color-scales.h"
+#include "ui/widget/color-slider.h"
+#include "widgets/gimp/gimpcolorwheel.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/dock-item.cpp b/src/ui/widget/dock-item.cpp
index 85671e3d9..29f22977a 100644
--- a/src/ui/widget/dock-item.cpp
+++ b/src/ui/widget/dock-item.cpp
@@ -13,8 +13,8 @@
 #include "inkscape.h"
 #include "ui/icon-names.h"
 
-#include <glibmm/exceptionhandler.h>
 #include <gtkmm/icontheme.h>
+#include <glibmm/exceptionhandler.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/dock.cpp b/src/ui/widget/dock.cpp
index f72c05836..9c1f0f783 100644
--- a/src/ui/widget/dock.cpp
+++ b/src/ui/widget/dock.cpp
@@ -11,9 +11,9 @@
  */
 
 #include "dock.h"
-#include "desktop.h"
 #include "inkscape.h"
 #include "preferences.h"
+#include "desktop.h"
 
 #include <gtkmm/adjustment.h>
 #include <gtkmm/paned.h>
diff --git a/src/ui/widget/entity-entry.cpp b/src/ui/widget/entity-entry.cpp
index f15f55911..67412b1e0 100644
--- a/src/ui/widget/entity-entry.cpp
+++ b/src/ui/widget/entity-entry.cpp
@@ -19,8 +19,8 @@
 
 #include "entity-entry.h"
 
-#include <gtkmm/entry.h>
 #include <gtkmm/scrolledwindow.h>
+#include <gtkmm/entry.h>
 
 #include "document-private.h"
 #include "document-undo.h"
diff --git a/src/ui/widget/font-selector-toolbar.cpp b/src/ui/widget/font-selector-toolbar.cpp
index fa6cf4c28..c997e0920 100644
--- a/src/ui/widget/font-selector-toolbar.cpp
+++ b/src/ui/widget/font-selector-toolbar.cpp
@@ -16,14 +16,14 @@
 
 #include "font-selector-toolbar.h"
 
-#include "libnrtype/font-instance.h"
 #include "libnrtype/font-lister.h"
+#include "libnrtype/font-instance.h"
 
 #include "ui/icon-names.h"
 
 // For updating from selection
-#include "desktop.h"
 #include "inkscape.h"
+#include "desktop.h"
 #include "object/sp-text.h"
 
 // TEMP TEMP TEMP
diff --git a/src/ui/widget/font-selector.cpp b/src/ui/widget/font-selector.cpp
index c83e80350..70f7d55db 100644
--- a/src/ui/widget/font-selector.cpp
+++ b/src/ui/widget/font-selector.cpp
@@ -15,12 +15,12 @@
 
 #include "font-selector.h"
 
-#include "libnrtype/font-instance.h"
 #include "libnrtype/font-lister.h"
+#include "libnrtype/font-instance.h"
 
 // For updating from selection
-#include "desktop.h"
 #include "inkscape.h"
+#include "desktop.h"
 #include "object/sp-text.h"
 
 namespace Inkscape {
diff --git a/src/ui/widget/font-variants.cpp b/src/ui/widget/font-variants.cpp
index bef691260..be5ae255c 100644
--- a/src/ui/widget/font-variants.cpp
+++ b/src/ui/widget/font-variants.cpp
@@ -11,8 +11,8 @@
 #include <config.h>
 #endif
 
-#include <glibmm/i18n.h>
 #include <gtkmm.h>
+#include <glibmm/i18n.h>
 
 #include <libnrtype/font-instance.h>
 
diff --git a/src/ui/widget/font-variations.cpp b/src/ui/widget/font-variations.cpp
index 7c7aff018..9a8317a79 100644
--- a/src/ui/widget/font-variations.cpp
+++ b/src/ui/widget/font-variations.cpp
@@ -12,11 +12,11 @@
 #include <config.h>
 #endif
 
-#include <iomanip>
 #include <iostream>
+#include <iomanip>
 
-#include <glibmm/i18n.h>
 #include <gtkmm.h>
+#include <glibmm/i18n.h>
 
 #include <libnrtype/font-instance.h>
 
diff --git a/src/ui/widget/imageicon.cpp b/src/ui/widget/imageicon.cpp
index 37223a868..8e7df7a68 100644
--- a/src/ui/widget/imageicon.cpp
+++ b/src/ui/widget/imageicon.cpp
@@ -12,11 +12,11 @@
  */
 
 #include "imageicon.h"
+#include "svg-view-widget.h"
 #include "document.h"
 #include "inkscape.h"
-#include "svg-view-widget.h"
-#include <glibmm/convert.h>
 #include <glibmm/fileutils.h>
+#include <glibmm/convert.h>
 
 namespace Inkscape
 {
diff --git a/src/ui/widget/imagetoggler.cpp b/src/ui/widget/imagetoggler.cpp
index b6844ffb3..38c84ca51 100644
--- a/src/ui/widget/imagetoggler.cpp
+++ b/src/ui/widget/imagetoggler.cpp
@@ -13,8 +13,8 @@
 
 #include <gtkmm/icontheme.h>
 
-#include "ui/icon-names.h"
 #include "widgets/toolbox.h"
+#include "ui/icon-names.h"
 
 #include <iostream>
 
diff --git a/src/ui/widget/ink-select-one-action.cpp b/src/ui/widget/ink-select-one-action.cpp
index 9a2c302fb..9ab4a7f45 100644
--- a/src/ui/widget/ink-select-one-action.cpp
+++ b/src/ui/widget/ink-select-one-action.cpp
@@ -19,16 +19,16 @@
 
 #include "ink-select-one-action.h"
 
-#include <gtkmm/box.h>
-#include <gtkmm/combobox.h>
-#include <gtkmm/image.h>
-#include <gtkmm/label.h>
-#include <gtkmm/menu.h>
+#include <iostream>
+#include <gtkmm/toolitem.h>
 #include <gtkmm/menuitem.h>
 #include <gtkmm/radioaction.h>
 #include <gtkmm/radiomenuitem.h>
-#include <gtkmm/toolitem.h>
-#include <iostream>
+#include <gtkmm/combobox.h>
+#include <gtkmm/menu.h>
+#include <gtkmm/box.h>
+#include <gtkmm/label.h>
+#include <gtkmm/image.h>
 
 InkSelectOneAction* InkSelectOneAction::create(const Glib::ustring &name,
                                                const Glib::ustring &group_label,
diff --git a/src/ui/widget/ink-spinscale.cpp b/src/ui/widget/ink-spinscale.cpp
index d05c10a41..87a2bd11c 100644
--- a/src/ui/widget/ink-spinscale.cpp
+++ b/src/ui/widget/ink-spinscale.cpp
@@ -16,9 +16,9 @@
 */
 
 #include "ink-spinscale.h"
+#include <gdkmm/general.h>
 #include <gdkmm/cursor.h>
 #include <gdkmm/event.h>
-#include <gdkmm/general.h>
 
 #include <gtkmm/spinbutton.h>
 
diff --git a/src/ui/widget/insertordericon.cpp b/src/ui/widget/insertordericon.cpp
index 18dd13988..5d1f64a54 100644
--- a/src/ui/widget/insertordericon.cpp
+++ b/src/ui/widget/insertordericon.cpp
@@ -11,9 +11,9 @@
  
 #include <gtkmm/icontheme.h>
 
-#include "layertypeicon.h"
-#include "ui/icon-names.h"
 #include "widgets/toolbox.h"
+#include "ui/icon-names.h"
+#include "layertypeicon.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/layer-selector.cpp b/src/ui/widget/layer-selector.cpp
index 466d5e75e..e0a52a868 100644
--- a/src/ui/widget/layer-selector.cpp
+++ b/src/ui/widget/layer-selector.cpp
@@ -18,14 +18,14 @@
 #include <string>
 
 #include "ui/dialog/layer-properties.h"
+#include <glibmm/i18n.h>
 #include <boost/range/adaptor/filtered.hpp>
 #include <boost/range/adaptor/reversed.hpp>
-#include <glibmm/i18n.h>
 
 #include "desktop.h"
 
-#include "document-undo.h"
 #include "document.h"
+#include "document-undo.h"
 #include "layer-manager.h"
 #include "ui/icon-names.h"
 #include "ui/util.h"
diff --git a/src/ui/widget/layertypeicon.cpp b/src/ui/widget/layertypeicon.cpp
index 2e33f2453..3a8ffab44 100644
--- a/src/ui/widget/layertypeicon.cpp
+++ b/src/ui/widget/layertypeicon.cpp
@@ -15,8 +15,8 @@
 
 #include <gtkmm/icontheme.h>
 
-#include "ui/icon-names.h"
 #include "widgets/toolbox.h"
+#include "ui/icon-names.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/licensor.cpp b/src/ui/widget/licensor.cpp
index 58fe644b0..1e9ee361d 100644
--- a/src/ui/widget/licensor.cpp
+++ b/src/ui/widget/licensor.cpp
@@ -21,12 +21,12 @@
 #include <gtkmm/entry.h>
 #include <gtkmm/radiobutton.h>
 
-#include "document-private.h"
-#include "document-undo.h"
-#include "inkscape.h"
-#include "rdf.h"
 #include "ui/widget/entity-entry.h"
 #include "ui/widget/registry.h"
+#include "rdf.h"
+#include "inkscape.h"
+#include "document-undo.h"
+#include "document-private.h"
 #include "verbs.h"
 
 
diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp
index 70086a5f0..3677233bc 100644
--- a/src/ui/widget/object-composite-settings.cpp
+++ b/src/ui/widget/object-composite-settings.cpp
@@ -17,15 +17,15 @@
 #include "desktop.h"
 
 #include "desktop-style.h"
-#include "display/sp-canvas.h"
-#include "document-undo.h"
 #include "document.h"
+#include "document-undo.h"
 #include "filter-chemistry.h"
 #include "inkscape.h"
 #include "style.h"
 #include "svg/css-ostringstream.h"
-#include "ui/widget/style-subject.h"
 #include "verbs.h"
+#include "display/sp-canvas.h"
+#include "ui/widget/style-subject.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index fa83f7e65..805333f8e 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -22,11 +22,11 @@
 #endif
 
 #include "page-sizer.h"
+#include <glibmm/i18n.h>
+#include "verbs.h"
 #include "helper/action.h"
 #include "object/sp-root.h"
 #include "ui/widget/button.h"
-#include "verbs.h"
-#include <glibmm/i18n.h>
 
 using std::pair;
 using Inkscape::Util::unit_table;
diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index 0c4aafd63..281e6e21a 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -19,8 +19,8 @@
 
 #include <glibmm/i18n.h>
 
-#include "desktop.h"
 #include "panel.h"
+#include "desktop.h"
 
 #include "inkscape.h"
 #include "widgets/eek-preview.h"
diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp
index d72f5b9d1..078aba9cf 100644
--- a/src/ui/widget/preferences-widget.cpp
+++ b/src/ui/widget/preferences-widget.cpp
@@ -14,8 +14,8 @@
 #include <config.h>
 #endif
 
-#include <glibmm/convert.h>
 #include <glibmm/i18n.h>
+#include <glibmm/convert.h>
 #include <glibmm/regex.h>
 
 #include <gtkmm/box.h>
diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp
index 02bb3cf6d..753b72c2e 100644
--- a/src/ui/widget/registered-widget.cpp
+++ b/src/ui/widget/registered-widget.cpp
@@ -25,8 +25,8 @@
 
 #include "object/sp-root.h"
 
-#include "svg/stringstream.h"
 #include "svg/svg-color.h"
+#include "svg/stringstream.h"
 
 #include "widgets/spinbutton-events.h"
 
diff --git a/src/ui/widget/rotateable.cpp b/src/ui/widget/rotateable.cpp
index fef507b88..0e290730d 100644
--- a/src/ui/widget/rotateable.cpp
+++ b/src/ui/widget/rotateable.cpp
@@ -11,11 +11,11 @@
 #include <config.h>
 #endif
 
-#include "rotateable.h"
-#include "ui/tools/tool-base.h"
-#include <2geom/point.h>
 #include <gtkmm/box.h>
 #include <gtkmm/eventbox.h>
+#include <2geom/point.h>
+#include "ui/tools/tool-base.h"
+#include "rotateable.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/spinbutton.cpp b/src/ui/widget/spinbutton.cpp
index 53b329293..0c082d3ce 100644
--- a/src/ui/widget/spinbutton.cpp
+++ b/src/ui/widget/spinbutton.cpp
@@ -13,10 +13,10 @@
 
 #include "spinbutton.h"
 
-#include "ui/tools/tool-base.h"
 #include "unit-menu.h"
 #include "unit-tracker.h"
 #include "util/expression-evaluator.h"
+#include "ui/tools/tool-base.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/style-subject.cpp b/src/ui/widget/style-subject.cpp
index 5680f7ee5..e23627080 100644
--- a/src/ui/widget/style-subject.cpp
+++ b/src/ui/widget/style-subject.cpp
@@ -7,8 +7,8 @@
 
 #include "style-subject.h"
 
-#include "desktop-style.h"
 #include "desktop.h"
+#include "desktop-style.h"
 #include "selection.h"
 
 #include "xml/sp-css-attr.h"
diff --git a/src/ui/widget/tolerance-slider.cpp b/src/ui/widget/tolerance-slider.cpp
index 4e326af19..d2c338571 100644
--- a/src/ui/widget/tolerance-slider.cpp
+++ b/src/ui/widget/tolerance-slider.cpp
@@ -22,10 +22,10 @@
 #include <gtkmm/radiobutton.h>
 #include <gtkmm/scale.h>
 
-#include "desktop.h"
-#include "document-undo.h"
-#include "document.h"
 #include "inkscape.h"
+#include "document.h"
+#include "document-undo.h"
+#include "desktop.h"
 
 #include "object/sp-namedview.h"