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

This reverts commit bba4ff6672494fab59286b50f6c645ad62a47e60.

44 files changed, 149 insertions, 149 deletions

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"