merge from trunk (r12258)

(bzr r11668.1.65)

38 files changed, 71 insertions, 83 deletions

diff --git a/src/ui/cache/svg_preview_cache.cpp b/src/ui/cache/svg_preview_cache.cpp
index 7842bd5b3..74e94b827 100644
--- a/src/ui/cache/svg_preview_cache.cpp
+++ b/src/ui/cache/svg_preview_cache.cpp
@@ -19,7 +19,6 @@
 # include "config.h"
 #endif
 
-#include <glib.h>
 #include <gtk/gtk.h>
 #include <2geom/transforms.h>
 #include "sp-namedview.h"
diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index 8cdb37f4f..f2b9fb02a 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -21,6 +21,7 @@
  * See the file COPYING for details.
  */
 
+#include <gtkmm/clipboard.h>
 #include "ui/clipboard.h"
 
 // TODO: reduce header bloat if possible
@@ -28,7 +29,6 @@
 #include "file.h" // for file_import, used in _pasteImage
 #include <list>
 #include <algorithm>
-#include <gtkmm/clipboard.h>
 #include <glibmm/ustring.h>
 #include <glibmm/i18n.h>
 #include <glib/gstdio.h> // for g_file_set_contents etc., used in _onGet and paste
diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp
index 62e6ce3a3..5a3c5a496 100644
--- a/src/ui/control-manager.cpp
+++ b/src/ui/control-manager.cpp
@@ -14,7 +14,6 @@
 #include <algorithm>
 #include <set>
 
-#include <glib.h>
 #include <glib-object.h>
 
 #include "display/sodipodi-ctrl.h" // for SP_TYPE_CTRL
diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index e971cfb09..753320ab9 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -21,7 +21,6 @@
 
 #include <climits>
 
-#include <glib.h>
 #include <glibmm/i18n.h>
 #include <2geom/transforms.h>
 #include <gtkmm/adjustment.h>
diff --git a/src/ui/dialog/clonetiler.h b/src/ui/dialog/clonetiler.h
index 2cad30e9e..7ec30cfaa 100644
--- a/src/ui/dialog/clonetiler.h
+++ b/src/ui/dialog/clonetiler.h
@@ -11,7 +11,6 @@
 #define __SP_CLONE_TILER_H__
 
 #include "ui/widget/panel.h"
-#include <glib.h>
 #include <gtk/gtk.h>
 
 #include "ui/dialog/desktop-tracker.h"
diff --git a/src/ui/dialog/color-item.cpp b/src/ui/dialog/color-item.cpp
index 2ff4ed657..e09d9b1d1 100644
--- a/src/ui/dialog/color-item.cpp
+++ b/src/ui/dialog/color-item.cpp
@@ -12,8 +12,8 @@
  */
 
 #include <errno.h>
-#include <glibmm/i18n.h>
 #include <gtkmm/label.h>
+#include <glibmm/i18n.h>
 #include <cairo.h>
 #include <gtk/gtk.h>
 
diff --git a/src/ui/dialog/debug.cpp b/src/ui/dialog/debug.cpp
index e61f8e389..d127261c0 100644
--- a/src/ui/dialog/debug.cpp
+++ b/src/ui/dialog/debug.cpp
@@ -13,13 +13,13 @@
 # include <config.h>
 #endif
 
-#include <glibmm/i18n.h>
 #include <gtkmm/box.h>
 #include <gtkmm/dialog.h>
 #include <gtkmm/textview.h>
 #include <gtkmm/button.h>
 #include <gtkmm/menubar.h>
 #include <gtkmm/scrolledwindow.h>
+#include <glibmm/i18n.h>
 
 #include "debug.h"
 
diff --git a/src/ui/dialog/desktop-tracker.h b/src/ui/dialog/desktop-tracker.h
index c219e8d98..7da55cf2f 100644
--- a/src/ui/dialog/desktop-tracker.h
+++ b/src/ui/dialog/desktop-tracker.h
@@ -7,9 +7,8 @@
 #ifndef SEEN_DIALOG_DESKTOP_TRACKER
 #define SEEN_DIALOG_DESKTOP_TRACKER
 
-#include <stddef.h>
+#include <cstddef>
 #include <sigc++/connection.h>
-#include <glib.h>
 
 typedef struct _GtkWidget GtkWidget;
 class SPDesktop;
diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp
index 99a8c08d2..3017dc117 100644
--- a/src/ui/dialog/export.cpp
+++ b/src/ui/dialog/export.cpp
@@ -42,6 +42,8 @@
 #endif
 
 #include <glibmm/i18n.h>
+#include <glibmm/miscutils.h>
+
 #include "helper/unit-menu.h"
 #include "helper/units.h"
 #include "unit-constants.h"
diff --git a/src/ui/dialog/filedialog.cpp b/src/ui/dialog/filedialog.cpp
index b3af6fc00..3413b0b0d 100644
--- a/src/ui/dialog/filedialog.cpp
+++ b/src/ui/dialog/filedialog.cpp
@@ -24,6 +24,8 @@
 #include "extension/output.h"
 #include "preferences.h"
 
+#include <glibmm/convert.h>
+
 namespace Inkscape
 {
 namespace UI
diff --git a/src/ui/dialog/filedialog.h b/src/ui/dialog/filedialog.h
index 63cee6bdc..8dfcf5dce 100644
--- a/src/ui/dialog/filedialog.h
+++ b/src/ui/dialog/filedialog.h
@@ -16,12 +16,13 @@
 #ifndef __FILE_DIALOG_H__
 #define __FILE_DIALOG_H__
 
-#include <glibmm.h>
 #include <vector>
 #include <set>
 
 #include "extension/system.h"
 
+#include <glibmm/ustring.h>
+
 class SPDocument;
 
 namespace Inkscape {
diff --git a/src/ui/dialog/filedialogimpl-gtkmm.cpp b/src/ui/dialog/filedialogimpl-gtkmm.cpp
index cb6d92799..5808d7d21 100644
--- a/src/ui/dialog/filedialogimpl-gtkmm.cpp
+++ b/src/ui/dialog/filedialogimpl-gtkmm.cpp
@@ -34,7 +34,12 @@
 
 #include <gtkmm/expander.h>
 #include <gtkmm/stock.h>
+
+#include <glibmm/convert.h>
+#include <glibmm/fileutils.h>
 #include <glibmm/i18n.h>
+#include <glibmm/miscutils.h>
+
 #include "extension/input.h"
 #include "extension/output.h"
 #include "extension/db.h"
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index d65f5c48c..0d2d0757c 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -26,7 +26,11 @@
 #endif
 
 #include "ui/widget/spinbutton.h"
+
+#include <glibmm/convert.h>
 #include <glibmm/i18n.h>
+#include <glibmm/main.h>
+#include <glibmm/stringutils.h>
 
 #include "desktop.h"
 #include "desktop-handles.h"
diff --git a/src/ui/dialog/find.h b/src/ui/dialog/find.h
index 14d54b8d4..c0c635f94 100644
--- a/src/ui/dialog/find.h
+++ b/src/ui/dialog/find.h
@@ -20,14 +20,12 @@
 #include "ui/widget/button.h"
 #include "ui/widget/entry.h" 
 #include "ui/widget/frame.h"
-#include <glib.h>
 
 #include <gtkmm/box.h>
 #include <gtkmm/buttonbox.h>
 #include <gtkmm/expander.h>
 #include <gtkmm/label.h>
 
-#include "desktop.h"
 #include "ui/dialog/desktop-tracker.h"
 
 class SPItem;
diff --git a/src/ui/dialog/font-substitution.cpp b/src/ui/dialog/font-substitution.cpp
index f0112f1d8..8df3ee5c8 100644
--- a/src/ui/dialog/font-substitution.cpp
+++ b/src/ui/dialog/font-substitution.cpp
@@ -10,6 +10,10 @@
 # include <config.h>
 #endif
 
+#include <gtkmm/messagedialog.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/textview.h>
+
 #include <set>
 #include "font-substitution.h"
 
@@ -24,7 +28,9 @@
 #include "preferences.h"
 
 #include "xml/repr.h"
+
 #include "sp-defs.h"
+#include "sp-root.h"
 #include "sp-text.h"
 #include "sp-textpath.h"
 #include "sp-flowtext.h"
@@ -37,6 +43,7 @@
 #include "libnrtype/FontFactory.h"
 #include "libnrtype/font-instance.h"
 
+#include <glibmm/i18n.h>
 #include <glibmm/regex.h>
 
 namespace Inkscape {
@@ -228,7 +235,11 @@ GSList * FontSubstitution::getFontReplacedItems(SPDocument* doc, Glib::ustring *
             std::set<Glib::ustring>::const_iterator iter = setFontSpans.find(font);
             if (iter != setFontSpans.end() ||
                     font == Glib::ustring("sans-serif") ||
-                    font == Glib::ustring("Sans")) {
+                    font == Glib::ustring("Sans") ||
+                    font == Glib::ustring("serif") ||
+                    font == Glib::ustring("Serif") ||
+                    font == Glib::ustring("monospace") ||
+                    font == Glib::ustring("Monospace")) {
                 fontFound = true;
                 break;
             }
@@ -236,7 +247,7 @@ GSList * FontSubstitution::getFontReplacedItems(SPDocument* doc, Glib::ustring *
         if (fontFound == false) {
             Glib::ustring subName = getSubstituteFontName(fonts);
             Glib::ustring err = Glib::ustring::compose(
-                    "Font '%1' substituted with '%2'", fonts.c_str(), subName.c_str());
+                    _("Font '%1' substituted with '%2'"), fonts.c_str(), subName.c_str());
             setErrors.insert(err);
             outList = g_slist_prepend (outList, item);
         }
diff --git a/src/ui/dialog/font-substitution.h b/src/ui/dialog/font-substitution.h
index 6fa5aee91..1c445081b 100644
--- a/src/ui/dialog/font-substitution.h
+++ b/src/ui/dialog/font-substitution.h
@@ -12,19 +12,9 @@
 #ifndef INKSCAPE_UI_FONT_SUBSTITUTION_H
 #define INKSCAPE_UI_FONT_SUBSTITUTION_H
 
-#include <gtkmm/box.h>
-#include <gtkmm/widget.h>
-#include <gtkmm/messagedialog.h>
-#include <gtkmm/textview.h>
-#include <gtkmm/scrolledwindow.h>
-#if WITH_GTKMM_3_0
-#include <gtkmm/checkbutton.h>
-#endif
-#include <glibmm/i18n.h>
-#include <glib.h>
-#include <gtk/gtk.h>
-#include "sp-root.h"
+#include <glibmm/ustring.h>
 
+class SPDocument;
 
 namespace Inkscape {
 namespace UI {
@@ -46,7 +36,6 @@ protected:
 private:
     FontSubstitution(FontSubstitution const &d);
     FontSubstitution& operator=(FontSubstitution const &d);
-
 };
 
 } // namespace Dialog
diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index 801ab2922..1a52410b8 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -19,7 +19,6 @@
 
 #include <gtkmm/buttonbox.h>
 #include <boost/scoped_ptr.hpp>
-#include <glib.h>
 
 #include <glibmm/i18n.h>
 #include <glibmm/main.h>
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 34a908995..65c6a20fe 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -17,10 +17,9 @@
 # include <config.h>
 #endif
 
+#include "inkscape-preferences.h"
 #include <glibmm/i18n.h>
 #include <glibmm/miscutils.h>
-
-#include "inkscape-preferences.h"
 #include <gtkmm/main.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/scrolledwindow.h>
diff --git a/src/ui/dialog/object-attributes.cpp b/src/ui/dialog/object-attributes.cpp
index 3d780fa83..027c9ae56 100644
--- a/src/ui/dialog/object-attributes.cpp
+++ b/src/ui/dialog/object-attributes.cpp
@@ -20,19 +20,19 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <glibmm/i18n.h>
-
+#include "ui/dialog/dialog-manager.h"
+#include "desktop.h"
 #include "desktop-handles.h"
 #include "macros.h"
 #include "sp-anchor.h"
 #include "sp-image.h"
 #include "verbs.h"
 #include "xml/repr.h"
-#include "ui/dialog/dialog-manager.h"
 #include "ui/dialog/object-attributes.h"
 #include "widgets/sp-attribute-widget.h"
 #include "inkscape.h"
 #include "selection.h"
+#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/object-attributes.h b/src/ui/dialog/object-attributes.h
index b0d02a0af..956091989 100644
--- a/src/ui/dialog/object-attributes.h
+++ b/src/ui/dialog/object-attributes.h
@@ -23,9 +23,6 @@
 #ifndef SEEN_DIALOGS_OBJECT_ATTRIBUTES_H
 #define SEEN_DIALOGS_OBJECT_ATTRIBUTES_H
 
-#include <glib.h>
-
-#include "desktop.h"
 #include "ui/dialog/desktop-tracker.h"
 #include "ui/widget/panel.h"
 
diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp
index 09ce59e9c..c597bc849 100644
--- a/src/ui/dialog/ocaldialogs.cpp
+++ b/src/ui/dialog/ocaldialogs.cpp
@@ -33,10 +33,16 @@
 #include <gtkmm/notebook.h>
 #include <gtkmm/spinner.h>
 #include <gtkmm/stock.h>
-#include <glibmm/i18n.h>
 #include <gdkmm/general.h>
 #include <libxml/tree.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>
+
 namespace Inkscape
 {
 namespace UI
diff --git a/src/ui/dialog/ocaldialogs.h b/src/ui/dialog/ocaldialogs.h
index 326542579..8cb247766 100644
--- a/src/ui/dialog/ocaldialogs.h
+++ b/src/ui/dialog/ocaldialogs.h
@@ -13,8 +13,6 @@
 #ifndef __OCAL_DIALOG_H__
 #define __OCAL_DIALOG_H__
 
-#include <cairomm/refptr.h>
-
 //Gtk includes
 #include <gtkmm/box.h>
 #include <gtkmm/eventbox.h>
@@ -22,6 +20,8 @@
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/window.h>
 
+#include <cairomm/refptr.h>
+
 #if GTK_CHECK_VERSION(3,6,0)
 # include <gtkmm/searchentry.h>
 #endif
diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp
index bce63093d..ab5f4c0e9 100644
--- a/src/ui/dialog/svg-fonts-dialog.cpp
+++ b/src/ui/dialog/svg-fonts-dialog.cpp
@@ -22,7 +22,6 @@
 #include <gtkmm/imagemenuitem.h>
 #include <gtkmm/scale.h>
 #include <gtkmm/stock.h>
-#include <glibmm/i18n.h>
 #include <message-stack.h>
 #include "selection.h"
 #include <string.h>
@@ -38,6 +37,9 @@
 #include "sp-font.h"
 #include "sp-glyph-kerning.h"
 
+#include <glibmm/i18n.h>
+#include <glibmm/stringutils.h>
+
 SvgFontDrawingArea::SvgFontDrawingArea():
     _x(0),
     _y(0),
diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp
index cc6ddd7de..dfc92774c 100644
--- a/src/ui/dialog/symbols.cpp
+++ b/src/ui/dialog/symbols.cpp
@@ -18,8 +18,6 @@
 #include <functional>
 #include <sstream>
 
-#include <glibmm/i18n.h>
-
 #include <gtkmm/buttonbox.h>
 #include <gtkmm/label.h>
 
@@ -36,6 +34,7 @@
 #include <gtkmm/treemodelcolumn.h>
 #include <gtkmm/clipboard.h>
 
+#include <glibmm/i18n.h>
 #include "path-prefix.h"
 #include "io/sys.h"
 
diff --git a/src/ui/dialog/symbols.h b/src/ui/dialog/symbols.h
index 5486ff546..08221bf22 100644
--- a/src/ui/dialog/symbols.h
+++ b/src/ui/dialog/symbols.h
@@ -12,15 +12,11 @@
 #ifndef INKSCAPE_UI_DIALOG_SYMBOLS_H
 #define INKSCAPE_UI_DIALOG_SYMBOLS_H
 
-#include "ui/widget/panel.h"
-#include "ui/widget/button.h"
+#include "display/drawing.h"
 
 #include "ui/dialog/desktop-tracker.h"
 
-#include "display/drawing.h"
-
-#include <glib.h>
-#include <gtkmm/treemodel.h>
+#include "ui/widget/panel.h"
 
 #include <vector>
 
@@ -43,9 +39,6 @@ public:
 
     static SymbolsDialog& getInstance();
 
-protected:
-
-
 private:
     SymbolsDialog(SymbolsDialog const &); // no copy
     SymbolsDialog &operator=(SymbolsDialog const &); // no assign
diff --git a/src/ui/dialog/undo-history.cpp b/src/ui/dialog/undo-history.cpp
index b96c9158a..a487eb930 100644
--- a/src/ui/dialog/undo-history.cpp
+++ b/src/ui/dialog/undo-history.cpp
@@ -14,11 +14,11 @@
 # include <config.h>
 #endif
 
+#include "undo-history.h"
 #include <glibmm/i18n.h>
 #include <stddef.h>
 #include <sigc++/sigc++.h>
 
-#include "undo-history.h"
 #include "document.h"
 #include "document-undo.h"
 #include "inkscape.h"
diff --git a/src/ui/tool/multi-path-manipulator.cpp b/src/ui/tool/multi-path-manipulator.cpp
index 629608242..70bd0e859 100644
--- a/src/ui/tool/multi-path-manipulator.cpp
+++ b/src/ui/tool/multi-path-manipulator.cpp
@@ -11,9 +11,8 @@
  */
 
 #include <boost/shared_ptr.hpp>
-#include <glib.h>
-#include <glibmm/i18n.h>
 #include "node.h"
+#include <glibmm/i18n.h>
 #include "desktop.h"
 #include "desktop-handles.h"
 #include "document.h"
diff --git a/src/ui/tool/node-tool.h b/src/ui/tool/node-tool.h
index bc5267bb2..341faf329 100644
--- a/src/ui/tool/node-tool.h
+++ b/src/ui/tool/node-tool.h
@@ -14,12 +14,9 @@
 #include <memory>
 #include <boost/ptr_container/ptr_map.hpp>
 #include <glib.h>
-#include <stddef.h>
-#include <sigc++/sigc++.h>
 #include "event-context.h"
-#include "ui/tool/node-types.h"
 
-#define INK_TYPE_NODE_TOOL               (ink_node_tool_get_type ())
+#define INK_TYPE_NODE_TOOL            (ink_node_tool_get_type ())
 #define INK_NODE_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), INK_TYPE_NODE_TOOL, InkNodeTool))
 #define INK_NODE_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), INK_TYPE_NODE_TOOL, InkNodeToolClass))
 #define INK_IS_NODE_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INK_TYPE_NODE_TOOL))
@@ -74,7 +71,7 @@ struct InkNodeTool : public SPEventContext
 };
 
 struct InkNodeToolClass {
-	SPEventContextClass parent_class;
+    SPEventContextClass parent_class;
 };
 
 GType ink_node_tool_get_type (void);
diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp
index 35eb23f42..ac023beaa 100644
--- a/src/ui/tool/path-manipulator.cpp
+++ b/src/ui/tool/path-manipulator.cpp
@@ -19,7 +19,6 @@
 #include <2geom/bezier-curve.h>
 #include <2geom/bezier-utils.h>
 #include <2geom/svg-path.h>
-#include <glibmm.h>
 #include <glibmm/i18n.h>
 #include "ui/tool/path-manipulator.h"
 #include "desktop.h"
diff --git a/src/ui/uxmanager.h b/src/ui/uxmanager.h
index 5fef08f11..711703192 100644
--- a/src/ui/uxmanager.h
+++ b/src/ui/uxmanager.h
@@ -11,20 +11,13 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib.h>
 #include <vector>
+#include <glib.h>
 
-extern "C"
-{
-    typedef struct _GObject GObject;
-    typedef struct _GtkWidget GtkWidget;
-}
-
+extern "C" typedef struct _GtkWidget GtkWidget;
 class SPDesktop;
-
 struct SPDesktopWidget;
 
-
 namespace Inkscape {
 namespace UI {
 
diff --git a/src/ui/widget/imageicon.h b/src/ui/widget/imageicon.h
index 803b2f53f..2ea8b8533 100644
--- a/src/ui/widget/imageicon.h
+++ b/src/ui/widget/imageicon.h
@@ -12,9 +12,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glibmm/ustring.h>
 #include <gtkmm/box.h>
-
+#include <glibmm/ustring.h>
 
 class SPDocument;
 
diff --git a/src/ui/widget/imagetoggler.h b/src/ui/widget/imagetoggler.h
index ca1bfd69d..7b02fa4dc 100644
--- a/src/ui/widget/imagetoggler.h
+++ b/src/ui/widget/imagetoggler.h
@@ -14,9 +14,9 @@
 #include "config.h"
 #endif
 
-#include <glibmm/property.h>
 #include <gtkmm/cellrendererpixbuf.h>
 #include <gtkmm/widget.h>
+#include <glibmm/property.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index 48749fda2..7eb114d0a 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -15,8 +15,6 @@
 # include <config.h>
 #endif
 
-#include <glibmm/i18n.h>
-
 #include <gtkmm/dialog.h> // for Gtk::RESPONSE_*
 #include <gtkmm/menu.h>
 #include <gtkmm/stock.h>
@@ -24,6 +22,8 @@
 #include <gtkmm/radiomenuitem.h>
 #include <gtkmm/separatormenuitem.h>
 
+#include <glibmm/i18n.h>
+
 #include <gtk/gtk.h>
 
 #include "panel.h"
diff --git a/src/ui/widget/point.h b/src/ui/widget/point.h
index 15f1a80fb..17078df8f 100644
--- a/src/ui/widget/point.h
+++ b/src/ui/widget/point.h
@@ -13,8 +13,8 @@
 #ifndef INKSCAPE_UI_WIDGET_POINT_H
 #define INKSCAPE_UI_WIDGET_POINT_H
 
-#include <2geom/point.h>
 #include "ui/widget/labelled.h"
+#include <2geom/point.h>
 #include "ui/widget/scalar.h"
 
 namespace Gtk {
diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp
index 314bf75bf..d32de6871 100644
--- a/src/ui/widget/preferences-widget.cpp
+++ b/src/ui/widget/preferences-widget.cpp
@@ -41,6 +41,8 @@
 #include "selection-chemistry.h"
 #include "ui/dialog/filedialog.h"
 #include "xml/repr.h"
+
+#include <glibmm/convert.h>
 #include <glibmm/i18n.h>
 
 using namespace Inkscape::UI::Widget;
diff --git a/src/ui/widget/rendering-options.cpp b/src/ui/widget/rendering-options.cpp
index 7655f25e3..f26e71553 100644
--- a/src/ui/widget/rendering-options.cpp
+++ b/src/ui/widget/rendering-options.cpp
@@ -12,10 +12,9 @@
 # include <config.h>
 #endif
 
-#include <glibmm/i18n.h>
-
-#include "unit-constants.h"
 #include "rendering-options.h"
+#include "unit-constants.h"
+#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/spin-scale.cpp b/src/ui/widget/spin-scale.cpp
index 8aab57a34..548e9a6a6 100644
--- a/src/ui/widget/spin-scale.cpp
+++ b/src/ui/widget/spin-scale.cpp
@@ -6,10 +6,9 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
 
-#include <glib.h>
+#include <gtkmm/adjustment.h>
 #include <glibmm/i18n.h>
 #include <glibmm/stringutils.h>
-#include <gtkmm/adjustment.h>
 
 #include "spin-scale.h"
 #include "ui/widget/gimpspinscale.h"
diff --git a/src/ui/widget/spin-slider.cpp b/src/ui/widget/spin-slider.cpp
index facbf704c..1cb59a7b3 100644
--- a/src/ui/widget/spin-slider.cpp
+++ b/src/ui/widget/spin-slider.cpp
@@ -8,12 +8,11 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
 
-#include <glib.h>
+#include "spin-slider.h"
+
 #include <glibmm/i18n.h>
 #include <glibmm/stringutils.h>
 
-#include "spin-slider.h"
-
 namespace Inkscape {
 namespace UI {
 namespace Widget {