Update to trunk

(bzr r11950.1.75)

90 files changed, 178 insertions, 210 deletions

diff --git a/src/2geom/elliptical-arc.cpp b/src/2geom/elliptical-arc.cpp
index 75b6777a2..29e983ad4 100644
--- a/src/2geom/elliptical-arc.cpp
+++ b/src/2geom/elliptical-arc.cpp
@@ -202,7 +202,7 @@ std::vector<Coord> EllipticalArc::roots(Coord v, Dim2 d) const
             {
                 return sol;
             }
-            double ray_prj;
+            double ray_prj = 0.0;
             switch(d)
             {
                 case X:
diff --git a/src/color-profile.cpp b/src/color-profile.cpp
index fe663957c..e7f18af15 100644
--- a/src/color-profile.cpp
+++ b/src/color-profile.cpp
@@ -4,9 +4,9 @@
 
 #define noDEBUG_LCMS
 
+#include <gdkmm/color.h>
 #include <glib/gstdio.h>
 #include <fcntl.h>
-#include <gdkmm/color.h>
 #include <glib/gi18n.h>
 
 #ifdef DEBUG_LCMS
diff --git a/src/console-output-undo-observer.cpp b/src/console-output-undo-observer.cpp
index 92c937273..209997003 100644
--- a/src/console-output-undo-observer.cpp
+++ b/src/console-output-undo-observer.cpp
@@ -11,8 +11,6 @@
  * Released under GNU GPL, see the file 'COPYING' for more information
  */
 
-#include <glibmm.h>
-
 #include "console-output-undo-observer.h"
 
 namespace Inkscape {
diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp
index 9942e3a13..217187553 100644
--- a/src/desktop-events.cpp
+++ b/src/desktop-events.cpp
@@ -17,11 +17,11 @@
 #endif
 #include <map>
 #include <string>
+#include "ui/dialog/guides.h"
 #include <2geom/line.h>
 #include <2geom/angle.h>
 #include <glibmm/i18n.h>
 
-#include "ui/dialog/guides.h"
 #include "desktop.h"
 #include "desktop-events.h"
 #include "desktop-handles.h"
diff --git a/src/desktop.cpp b/src/desktop.cpp
index d74e8fdad..c04dba6cc 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -26,14 +26,13 @@
 # include "config.h"
 #endif
 
+#include "ui/dialog/dialog-manager.h"
 #include <glibmm/i18n.h>
 #include <sigc++/functors/mem_fun.h>
 
 #include <2geom/transforms.h>
 #include <2geom/rect.h>
 
-#include "ui/dialog/dialog-manager.h"
-
 #include "box3d-context.h"
 #include "color.h"
 #include "desktop-events.h"
diff --git a/src/device-manager.cpp b/src/device-manager.cpp
index a07231805..610173d3d 100644
--- a/src/device-manager.cpp
+++ b/src/device-manager.cpp
@@ -7,11 +7,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib.h>
+#include "device-manager.h"
 #include <map>
 #include <set>
 
-#include "device-manager.h"
 #include "preferences.h"
 #include <gtk/gtk.h>
 #include <glibmm/regex.h>
diff --git a/src/device-manager.h b/src/device-manager.h
index 5f83ab7b0..d608a5717 100644
--- a/src/device-manager.h
+++ b/src/device-manager.h
@@ -10,9 +10,9 @@
 #define SEEN_INKSCAPE_DEVICE_MANAGER_H
 
 
+#include <gdkmm/device.h>
 #include <list>
 #include <glibmm/ustring.h>
-#include <gdkmm/device.h>
 
 namespace Inkscape {
 
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp
index c53890f9f..88da22835 100644
--- a/src/display/canvas-grid.cpp
+++ b/src/display/canvas-grid.cpp
@@ -17,7 +17,6 @@
 # include "config.h"
 #endif
 
-#include <glibmm/i18n.h>
 #include <gtkmm/box.h>
 #include <gtkmm/label.h>
 
@@ -27,6 +26,8 @@
 # include <gtkmm/table.h>
 #endif
 
+#include <glibmm/i18n.h>
+
 #include "ui/widget/registered-widget.h"
 #include "desktop.h"
 #include "sp-canvas-util.h"
diff --git a/src/display/nr-filter-image.cpp b/src/display/nr-filter-image.cpp
index fca8fdba3..7a27d857e 100644
--- a/src/display/nr-filter-image.cpp
+++ b/src/display/nr-filter-image.cpp
@@ -10,6 +10,7 @@
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
+#include "display/nr-filter-image.h"
 #include "document.h"
 #include "sp-item.h"
 #include "display/cairo-utils.h"
@@ -17,7 +18,6 @@
 #include "display/drawing.h"
 #include "display/drawing-item.h"
 #include "display/nr-filter.h"
-#include "display/nr-filter-image.h"
 #include "display/nr-filter-slot.h"
 #include "display/nr-filter-units.h"
 #include "enums.h"
diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index 8b20ab2de..9d4049512 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -19,6 +19,7 @@
 # include <config.h>
 #endif
 
+#include <gdkmm/rectangle.h>
 #include <cairomm/region.h>
 
 #include "helper/sp-marshal.h"
@@ -35,7 +36,6 @@
 #include "debug/gdk-event-latency-tracker.h"
 #include "desktop.h"
 #include "sp-namedview.h"
-#include <gdkmm/rectangle.h>
 
 using Inkscape::Debug::GdkEventLatencyTracker;
 
diff --git a/src/event-context.cpp b/src/event-context.cpp
index 11b814aab..6e5f0caad 100644
--- a/src/event-context.cpp
+++ b/src/event-context.cpp
@@ -18,6 +18,7 @@
 # include "config.h"
 #endif
 
+#include "shortcuts.h"
 #include "file.h"
 #include "event-context.h"
 
@@ -31,7 +32,6 @@
 #include "display/sp-canvas.h"
 #include "xml/node-event-vector.h"
 #include "sp-cursor.h"
-#include "shortcuts.h"
 #include "desktop.h"
 #include "desktop-handles.h"
 #include "desktop-events.h"
diff --git a/src/event-log.cpp b/src/event-log.cpp
index 9304f68c5..d0342fbe9 100644
--- a/src/event-log.cpp
+++ b/src/event-log.cpp
@@ -7,9 +7,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "event-log.h"
 #include <glibmm/i18n.h>
 
-#include "event-log.h"
 #include "desktop.h"
 #include "inkscape.h"
 #include "util/ucompose.hpp"
diff --git a/src/event-log.h b/src/event-log.h
index 766979731..cabc3ae9a 100644
--- a/src/event-log.h
+++ b/src/event-log.h
@@ -10,8 +10,8 @@
 #ifndef INKSCAPE_EVENT_LOG_H
 #define INKSCAPE_EVENT_LOG_H
 
-#include <glibmm/refptr.h>
 #include <gtkmm/treestore.h>
+#include <glibmm/refptr.h>
 #include <gtkmm/treeselection.h>
 #include <gtkmm/treeview.h>
 
diff --git a/src/extension/error-file.cpp b/src/extension/error-file.cpp
index 778295f47..5a8bede70 100644
--- a/src/extension/error-file.cpp
+++ b/src/extension/error-file.cpp
@@ -12,12 +12,11 @@
 #include "config.h"
 #endif
 
-#include <glibmm/i18n.h>
-
+#include "ui/dialog/extensions.h"
 
+#include <glibmm/i18n.h>
 #include "inkscape.h"
 #include "preferences.h"
-#include "ui/dialog/extensions.h"
 #include "extension/extension.h"
 
 #include "error-file.h"
diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp
index 28f556e75..f9cf70960 100644
--- a/src/extension/extension.cpp
+++ b/src/extension/extension.cpp
@@ -19,7 +19,6 @@
 # include "config.h"
 #endif
 
-#include <glibmm/i18n.h>
 #include <gtkmm/box.h>
 #include <gtkmm/label.h>
 #include <gtkmm/frame.h>
@@ -30,6 +29,7 @@
 # include <gtkmm/table.h>
 #endif
 
+#include <glibmm/i18n.h>
 #include "inkscape.h"
 #include "extension/implementation/implementation.h"
 #include "extension.h"
diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp
index 8a39f4ea9..983c9dfb5 100644
--- a/src/extension/internal/cairo-ps-out.cpp
+++ b/src/extension/internal/cairo-ps-out.cpp
@@ -319,8 +319,8 @@ CairoPsOutput::init (void)
             "<param name=\"blurToBitmap\" gui-text=\"" N_("Rasterize filter effects") "\" type=\"boolean\">true</param>\n"
             "<param name=\"resolution\" gui-text=\"" N_("Resolution for rasterization (dpi):") "\" type=\"int\" min=\"1\" max=\"10000\">90</param>\n"
             "<param name=\"area\" gui-text=\"" N_("Output page size") "\" type=\"optiongroup\" >\n"
-                "<option value=\"page\">" N_("Use document's page size") "</option>"
-                "<option value=\"drawing\">" N_("Use exported object's size") "</option>"
+                "<_option value=\"page\">" N_("Use document's page size") "</_option>"
+                "<_option value=\"drawing\">" N_("Use exported object's size") "</_option>"
             "</param>"
             "<param name=\"exportId\" gui-text=\"" N_("Limit export to the object with ID:") "\" type=\"string\"></param>\n"
             "<output>\n"
@@ -359,8 +359,8 @@ CairoEpsOutput::init (void)
             "<param name=\"blurToBitmap\" gui-text=\"" N_("Rasterize filter effects") "\" type=\"boolean\">true</param>\n"
             "<param name=\"resolution\" gui-text=\"" N_("Resolution for rasterization (dpi):") "\" type=\"int\" min=\"1\" max=\"10000\">90</param>\n"
             "<param name=\"area\" gui-text=\"" N_("Output page size") "\" type=\"optiongroup\" >\n"
-                "<option value=\"page\">" N_("Use document's page size") "</option>"
-                "<option value=\"drawing\">" N_("Use exported object's size") "</option>"
+                "<_option value=\"page\">" N_("Use document's page size") "</_option>"
+                "<_option value=\"drawing\">" N_("Use exported object's size") "</_option>"
             "</param>"
             "<param name=\"exportId\" gui-text=\"" N_("Limit export to the object with ID:") "\" type=\"string\"></param>\n"
             "<output>\n"
diff --git a/src/extension/internal/cairo-renderer-pdf-out.cpp b/src/extension/internal/cairo-renderer-pdf-out.cpp
index 773109c77..63e46ad17 100644
--- a/src/extension/internal/cairo-renderer-pdf-out.cpp
+++ b/src/extension/internal/cairo-renderer-pdf-out.cpp
@@ -252,8 +252,8 @@ CairoRendererPdfOutput::init (void)
             "<param name=\"blurToBitmap\" gui-text=\"" N_("Rasterize filter effects") "\" type=\"boolean\">true</param>\n"
             "<param name=\"resolution\" gui-text=\"" N_("Resolution for rasterization (dpi):") "\" type=\"int\" min=\"1\" max=\"10000\">90</param>\n"
             "<param name=\"area\" gui-text=\"" N_("Output page size") "\" type=\"optiongroup\" >\n"
-                "<option value=\"page\">" N_("Use document's page size") "</option>"
-                "<option value=\"drawing\">" N_("Use exported object's size") "</option>"
+                "<_option value=\"page\">" N_("Use document's page size") "</_option>"
+                "<_option value=\"drawing\">" N_("Use exported object's size") "</_option>"
             "</param>"
             "<param name=\"bleed\" gui-text=\"" N_("Bleed/margin (mm)") "\" type=\"float\" min=\"-10000\" max=\"10000\">0</param>\n"
             "<param name=\"exportId\" gui-text=\"" N_("Limit export to the object with ID:") "\" type=\"string\"></param>\n"
diff --git a/src/extension/param/string.cpp b/src/extension/param/string.cpp
index 2020fb24d..4e525ff73 100644
--- a/src/extension/param/string.cpp
+++ b/src/extension/param/string.cpp
@@ -10,11 +10,12 @@
 # include "config.h"
 #endif
 
-#include <glibmm/value.h>
 #include <gtkmm/adjustment.h>
 #include <gtkmm/box.h>
 #include <gtkmm/spinbutton.h>
 
+#include <glibmm/value.h>
+
 #include "xml/node.h"
 #include "extension/extension.h"
 #include "string.h"
diff --git a/src/extension/prefdialog.h b/src/extension/prefdialog.h
index 943273623..e1999791f 100644
--- a/src/extension/prefdialog.h
+++ b/src/extension/prefdialog.h
@@ -10,8 +10,8 @@
 #ifndef INKSCAPE_EXTENSION_DIALOG_H__
 #define INKSCAPE_EXTENSION_DIALOG_H__
 
-#include <glibmm/value.h>
 #include <gtkmm/dialog.h>
+#include <glibmm/value.h>
 #include <glibmm/ustring.h>
 
 
diff --git a/src/file.h b/src/file.h
index b173ca58c..fe8ad9af3 100644
--- a/src/file.h
+++ b/src/file.h
@@ -16,7 +16,7 @@
  */
 
 #include <glibmm/ustring.h>
-#include "ui/dialog/ocaldialogs.h"
+#include "extension/system.h"
 
 class SPDesktop;
 class SPDocument;
@@ -28,6 +28,10 @@ namespace Inkscape {
     }
 }
 
+namespace Gtk {
+class Window;
+}
+
 // Get the name of the default template uri
 Glib::ustring sp_file_default_template_uri();
 
diff --git a/src/filters/image.cpp b/src/filters/image.cpp
index ec31e59a7..0f15e9d0f 100644
--- a/src/filters/image.cpp
+++ b/src/filters/image.cpp
@@ -17,6 +17,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include "display/nr-filter-image.h"
 #include "uri.h"
 #include "uri-references.h"
 #include "enums.h"
@@ -27,7 +28,6 @@
 #include <string.h>
 
 #include "display/nr-filter.h"
-#include "display/nr-filter-image.h"
 
 /* FeImage base class */
 static void sp_feImage_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
diff --git a/src/gradient-chemistry.cpp b/src/gradient-chemistry.cpp
index 6b019ad2a..a0c20c609 100644
--- a/src/gradient-chemistry.cpp
+++ b/src/gradient-chemistry.cpp
@@ -18,6 +18,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "widgets/gradient-vector.h"
+
 #include <2geom/transforms.h>
 #include <2geom/bezier-curve.h>
 #include <2geom/crossing.h>
@@ -41,7 +43,6 @@
 #include "sp-radial-gradient.h"
 #include "sp-mesh-gradient.h"
 #include "sp-stop.h"
-#include "widgets/gradient-vector.h"
 #include "gradient-drag.h"
 #include "gradient-chemistry.h"
 
diff --git a/src/helper/pixbuf-ops.cpp b/src/helper/pixbuf-ops.cpp
index cae297e89..9cd1967d8 100644
--- a/src/helper/pixbuf-ops.cpp
+++ b/src/helper/pixbuf-ops.cpp
@@ -15,7 +15,6 @@
 # include "config.h"
 #endif
 
-#include <glib.h>
 #include <png.h>
 #include <2geom/transforms.h>
 
diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index 491acd73e..ac419784f 100644
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
@@ -19,6 +19,7 @@
 #include <errno.h>
 
 #include <map>
+#include <gtkmm/messagedialog.h>
 #include "debug/simple-event.h"
 #include "debug/event-tracker.h"
 
@@ -35,11 +36,9 @@
 
 #include <cstring>
 #include <glib/gstdio.h>
-#include <glib.h>
 #include <glibmm/i18n.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/convert.h>
-#include <gtkmm/messagedialog.h>
 #include <gtk/gtk.h>
 #include <signal.h>
 #include <string>
diff --git a/src/inkview.cpp b/src/inkview.cpp
index ee93b4134..fd7f6b608 100644
--- a/src/inkview.cpp
+++ b/src/inkview.cpp
@@ -38,6 +38,7 @@
 #include <sys/stat.h>
 #include <locale.h>
 
+#include <gtkmm/main.h>
 #include <glib.h>
 
 // #include <stropts.h>
@@ -46,8 +47,6 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include <gtkmm/main.h>
-
 #include "gc-core.h"
 #include "preferences.h"
 
diff --git a/src/interface.cpp b/src/interface.cpp
index 69832a2eb..4421b4a1d 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -23,9 +23,9 @@
 # include "config.h"
 #endif
 
-#include "file.h"
-#include <glib.h>
+#include "ui/dialog/dialog-manager.h"
 #include <gtkmm/icontheme.h>
+#include "file.h"
 #include <gtkmm/imagemenuitem.h>
 #include <gtkmm/separatormenuitem.h>
 
@@ -75,11 +75,7 @@
 #include "sp-image.h"
 #include "sp-item.h"
 #include "sp-mask.h"
-// #include "verbs.h"
 #include "message-stack.h"
-// #include "inkscape.h"
-#include "ui/dialog/dialog-manager.h"
-// #include "../xml/repr.h"
 #include "ui/dialog/layer-properties.h"
 
 #include <gdk/gdkkeysyms.h>
diff --git a/src/io/stringstream.h b/src/io/stringstream.h
index 939a87455..248e42e50 100644
--- a/src/io/stringstream.h
+++ b/src/io/stringstream.h
@@ -1,7 +1,7 @@
 #ifndef __INKSCAPE_IO_STRINGSTREAM_H__
 #define __INKSCAPE_IO_STRINGSTREAM_H__
 
-#include <glibmm.h>
+#include <glibmm/ustring.h>
 
 #include "inkscapestream.h"
 
diff --git a/src/libnrtype/font-lister.cpp b/src/libnrtype/font-lister.cpp
index 5b495d14d..a0db12c2b 100644
--- a/src/libnrtype/font-lister.cpp
+++ b/src/libnrtype/font-lister.cpp
@@ -2,13 +2,14 @@
 # include <config.h>
 #endif
 
+#include <gtkmm/treemodel.h>
+#include <gtkmm/liststore.h>
+
 #include <libnrtype/font-instance.h>
 #include <libnrtype/TextWrapper.h>
 #include <libnrtype/one-glyph.h>
 
 #include <glibmm.h>
-#include <gtkmm/treemodel.h>
-#include <gtkmm/liststore.h>
 #include "font-lister.h"
 #include "FontFactory.h"
 
@@ -373,89 +374,87 @@ namespace Inkscape
     }
  
 
-    // Set fontspec. If check is false, best style match will not be done.
-    void
-    FontLister::set_fontspec (Glib::ustring new_fontspec, gboolean check) {
-
-      std::pair<Glib::ustring,Glib::ustring> ui = ui_from_fontspec( new_fontspec );
-      Glib::ustring new_family = ui.first;
-      Glib::ustring new_style = ui.second;
+// Set fontspec. If check is false, best style match will not be done.
+void FontLister::set_fontspec(Glib::ustring new_fontspec, gboolean /*check*/)
+{
+    std::pair<Glib::ustring,Glib::ustring> ui = ui_from_fontspec( new_fontspec );
+    Glib::ustring new_family = ui.first;
+    Glib::ustring new_style = ui.second;
 
 #ifdef DEBUG_FONT
-      std::cout << "FontLister::set_fontspec: family: " << new_family
-		<< "   style:" << new_style << std::endl;
+    std::cout << "FontLister::set_fontspec: family: " << new_family
+              << "   style:" << new_style << std::endl;
 #endif
 
-      set_font_family( new_family, false );
-      set_font_style( new_style );
-    }
-
+    set_font_family( new_family, false );
+    set_font_style( new_style );
+}
 
-    // TODO: use to determine font-selector best style
-    std::pair<Glib::ustring, Glib::ustring>
-    FontLister::new_font_family (Glib::ustring new_family, gboolean check_style ) {
 
+// TODO: use to determine font-selector best style
+std::pair<Glib::ustring, Glib::ustring> FontLister::new_font_family (Glib::ustring new_family, gboolean /*check_style*/ )
+{
 #ifdef DEBUG_FONT
-      std::cout << "\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl;
-      std::cout << "FontLister::new_font_family: " << new_family << std::endl;
+    std::cout << "\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl;
+    std::cout << "FontLister::new_font_family: " << new_family << std::endl;
 #endif
 
-      // No need to do anything if new family is same as old family.
-      if( new_family.compare( current_family ) == 0 ) {
+    // No need to do anything if new family is same as old family.
+    if ( new_family.compare( current_family ) == 0 ) {
 #ifdef DEBUG_FONT
 	std::cout << "FontLister::new_font_family: exit: no change in family." << std::endl;
 	std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" << std::endl;
 #endif
 	return std::make_pair( current_family, current_style );
-      }
+    }
 
-      // We need to do two things:
-      // 1. Update style list for new family.
-      // 2. Select best valid style match to old style.
+    // We need to do two things:
+    // 1. Update style list for new family.
+    // 2. Select best valid style match to old style.
 
-      // For finding style list, use list of first family in font-family list.
-      GList* styles = NULL;
-      Gtk::TreeModel::iterator iter = font_list_store->get_iter( "0" );
-      while( iter != font_list_store->children().end() ) {
+    // For finding style list, use list of first family in font-family list.
+    GList* styles = NULL;
+    Gtk::TreeModel::iterator iter = font_list_store->get_iter( "0" );
+    while( iter != font_list_store->children().end() ) {
 
 	Gtk::TreeModel::Row row = *iter;
 
 	if( new_family.compare( row[FontList.family] ) == 0 ) {
-	  styles = row[FontList.styles];
-	  break;
+            styles = row[FontList.styles];
+            break;
 	}
 	++iter;
-      }
+    }
 
-      // Newly typed in font-family may not yet be in list... use default list.
-      // TODO: if font-family is list, check if first family in list is on system
-      // and set style accordingly.
-      if( styles == NULL ) {
+    // Newly typed in font-family may not yet be in list... use default list.
+    // TODO: if font-family is list, check if first family in list is on system
+    // and set style accordingly.
+    if( styles == NULL ) {
 	styles = default_styles;
-      }
+    }
       
-      // Update style list.
-      style_list_store->freeze_notify();
-      style_list_store->clear();
+    // Update style list.
+    style_list_store->freeze_notify();
+    style_list_store->clear();
 
-      for (GList *l=styles; l; l = l->next) {
+    for (GList *l=styles; l; l = l->next) {
 	Gtk::TreeModel::iterator treeModelIter = style_list_store->append();
 	(*treeModelIter)[FontStyleList.styles] = (char*)l->data;
-      }
+    }
 
-      style_list_store->thaw_notify();
+    style_list_store->thaw_notify();
 	
-      // Find best match to the style from the old font-family to the
-      // styles available with the new font.
-      // TODO: Maybe check if an exact match exists before using Pango.
-      Glib::ustring best_style = get_best_style_match( new_family, current_style );
+    // Find best match to the style from the old font-family to the
+    // styles available with the new font.
+    // TODO: Maybe check if an exact match exists before using Pango.
+    Glib::ustring best_style = get_best_style_match( new_family, current_style );
 
 #ifdef DEBUG_FONT
-      std::cout << "FontLister::new_font_family: exit: " << new_family << " " << best_style << std::endl;
-      std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" << std::endl;
+    std::cout << "FontLister::new_font_family: exit: " << new_family << " " << best_style << std::endl;
+    std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" << std::endl;
 #endif
-      return std::make_pair( new_family, best_style );
-    }
+    return std::make_pair( new_family, best_style );
+}
  
     std::pair<Glib::ustring, Glib::ustring>
     FontLister::set_font_family (Glib::ustring new_family, gboolean check_style) {
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index 9274d2078..8bf8bab6c 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -7,14 +7,13 @@
 
 //#define LPE_ENABLE_TEST_EFFECTS
 
-#include "live_effects/effect.h"
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 // include effects:
 #include "live_effects/lpe-patternalongpath.h"
+#include "live_effects/effect.h"
 #include "live_effects/lpe-bendpath.h"
 #include "live_effects/lpe-sketch.h"
 #include "live_effects/lpe-vonkoch.h"
diff --git a/src/live_effects/lpe-bendpath.h b/src/live_effects/lpe-bendpath.h
index 3d336e2e7..16b8c6137 100644
--- a/src/live_effects/lpe-bendpath.h
+++ b/src/live_effects/lpe-bendpath.h
@@ -10,9 +10,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "live_effects/parameter/enum.h"
 #include "live_effects/effect.h"
 #include "live_effects/parameter/path.h"
-#include "live_effects/parameter/enum.h"
 #include "live_effects/parameter/bool.h"
 
 #include <2geom/sbasis.h>
diff --git a/src/live_effects/lpe-boolops.h b/src/live_effects/lpe-boolops.h
index 8040c1df6..3c8dc85c4 100644
--- a/src/live_effects/lpe-boolops.h
+++ b/src/live_effects/lpe-boolops.h
@@ -14,8 +14,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "live_effects/effect.h"
 #include "live_effects/parameter/enum.h"
+#include "live_effects/effect.h"
 #include "live_effects/parameter/path.h"
 
 namespace Inkscape {
diff --git a/src/live_effects/lpe-curvestitch.cpp b/src/live_effects/lpe-curvestitch.cpp
index af928fff8..854cc0734 100644
--- a/src/live_effects/lpe-curvestitch.cpp
+++ b/src/live_effects/lpe-curvestitch.cpp
@@ -12,6 +12,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "ui/widget/scalar.h"
 #include <glibmm/i18n.h>
 
 #include "live_effects/lpe-curvestitch.h"
@@ -30,8 +31,6 @@
 #include <2geom/d2.h>
 #include <2geom/affine.h>
 
-#include "ui/widget/scalar.h"
-
 namespace Inkscape {
 namespace LivePathEffect {
 
diff --git a/src/live_effects/lpe-dynastroke.h b/src/live_effects/lpe-dynastroke.h
index ced376515..816cb60a6 100644
--- a/src/live_effects/lpe-dynastroke.h
+++ b/src/live_effects/lpe-dynastroke.h
@@ -14,9 +14,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "live_effects/parameter/enum.h"
 #include "live_effects/effect.h"
 #include "live_effects/parameter/parameter.h"
-#include "live_effects/parameter/enum.h"
 #include "live_effects/parameter/path.h"
 #include "live_effects/parameter/bool.h"
 
diff --git a/src/live_effects/lpe-envelope.h b/src/live_effects/lpe-envelope.h
index b5d6ceb50..64f6a4c0c 100644
--- a/src/live_effects/lpe-envelope.h
+++ b/src/live_effects/lpe-envelope.h
@@ -9,9 +9,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "live_effects/parameter/enum.h"
 #include "live_effects/effect.h"
 #include "live_effects/parameter/path.h"
-#include "live_effects/parameter/enum.h"
 #include "live_effects/parameter/bool.h"
 
 #include <2geom/sbasis.h>
diff --git a/src/live_effects/lpe-rough-hatches.cpp b/src/live_effects/lpe-rough-hatches.cpp
index 96b0bb0ae..0579b1016 100644
--- a/src/live_effects/lpe-rough-hatches.cpp
+++ b/src/live_effects/lpe-rough-hatches.cpp
@@ -12,9 +12,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glibmm/i18n.h>
-
 #include "ui/widget/scalar.h"
+#include <glibmm/i18n.h>
 #include "live_effects/lpe-rough-hatches.h"
 
 #include "sp-item.h"
diff --git a/src/live_effects/lpe-ruler.h b/src/live_effects/lpe-ruler.h
index 497398e22..8c5c83ceb 100644
--- a/src/live_effects/lpe-ruler.h
+++ b/src/live_effects/lpe-ruler.h
@@ -15,8 +15,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "live_effects/effect.h"
 #include "live_effects/parameter/enum.h"
+#include "live_effects/effect.h"
 #include "live_effects/parameter/unit.h"
 
 namespace Inkscape {
diff --git a/src/live_effects/parameter/bool.cpp b/src/live_effects/parameter/bool.cpp
index 2beee7cec..c1e8f8a7b 100644
--- a/src/live_effects/parameter/bool.cpp
+++ b/src/live_effects/parameter/bool.cpp
@@ -4,8 +4,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glibmm/i18n.h>
-
 #include "ui/widget/registered-widget.h"
 #include "live_effects/parameter/bool.h"
 #include "live_effects/effect.h"
@@ -15,6 +13,7 @@
 #include "inkscape.h"
 #include "verbs.h"
 #include "helper-fns.h"
+#include <glibmm/i18n.h>
 
 namespace Inkscape {
 
diff --git a/src/live_effects/parameter/parameter.cpp b/src/live_effects/parameter/parameter.cpp
index 8615721b0..a5de2169e 100644
--- a/src/live_effects/parameter/parameter.cpp
+++ b/src/live_effects/parameter/parameter.cpp
@@ -4,13 +4,13 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "ui/widget/registered-widget.h"
 #include <glibmm/i18n.h>
 
 #include "live_effects/parameter/parameter.h"
 #include "live_effects/effect.h"
 #include "svg/svg.h"
 #include "xml/repr.h"
-#include "ui/widget/registered-widget.h"
 
 #include "svg/stringstream.h"
 
diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp
index eca0d7a22..e5648dc68 100644
--- a/src/live_effects/parameter/path.cpp
+++ b/src/live_effects/parameter/path.cpp
@@ -5,6 +5,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "ui/widget/point.h"
 #include <glibmm/i18n.h>
 
 #include "live_effects/parameter/path.h"
@@ -15,7 +16,6 @@
 #include <2geom/pathvector.h>
 #include <2geom/d2.h>
 
-#include "ui/widget/point.h"
 #include "widgets/icon.h"
 #include <gtk/gtk.h>
 #include "selection-chemistry.h"
diff --git a/src/live_effects/parameter/point.cpp b/src/live_effects/parameter/point.cpp
index 53866f278..302818e55 100644
--- a/src/live_effects/parameter/point.cpp
+++ b/src/live_effects/parameter/point.cpp
@@ -4,8 +4,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glibmm/i18n.h>
-
 #include "ui/widget/registered-widget.h"
 #include "live_effects/parameter/point.h"
 #include "live_effects/effect.h"
@@ -16,6 +14,7 @@
 #include "inkscape.h"
 #include "verbs.h"
 #include "knotholder.h"
+#include <glibmm/i18n.h>
 
 // needed for on-canvas editting:
 #include "desktop.h"
diff --git a/src/live_effects/parameter/random.cpp b/src/live_effects/parameter/random.cpp
index 7a3c6d8cb..075e85ee1 100644
--- a/src/live_effects/parameter/random.cpp
+++ b/src/live_effects/parameter/random.cpp
@@ -4,12 +4,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glibmm/i18n.h>
-
+#include "ui/widget/registered-widget.h"
 #include "live_effects/parameter/random.h"
 #include "live_effects/effect.h"
+#include <glibmm/i18n.h>
 #include "svg/svg.h"
-#include "ui/widget/registered-widget.h"
 #include "ui/widget/random.h"
 
 #include "svg/stringstream.h"
diff --git a/src/live_effects/parameter/text.cpp b/src/live_effects/parameter/text.cpp
index 090c28bd2..fcb2fc9fc 100644
--- a/src/live_effects/parameter/text.cpp
+++ b/src/live_effects/parameter/text.cpp
@@ -8,9 +8,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "ui/widget/registered-widget.h"
 #include <glibmm/i18n.h>
 
-#include "ui/widget/registered-widget.h"
 #include "live_effects/parameter/text.h"
 #include "live_effects/effect.h"
 #include "svg/svg.h"
diff --git a/src/live_effects/parameter/unit.cpp b/src/live_effects/parameter/unit.cpp
index 7a2ce6f65..602d806a0 100644
--- a/src/live_effects/parameter/unit.cpp
+++ b/src/live_effects/parameter/unit.cpp
@@ -4,11 +4,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "ui/widget/registered-widget.h"
 #include <glibmm/i18n.h>
 
 #include "live_effects/parameter/unit.h"
 #include "live_effects/effect.h"
-#include "ui/widget/registered-widget.h"
 #include "verbs.h"
 
 namespace Inkscape {
diff --git a/src/live_effects/parameter/vector.cpp b/src/live_effects/parameter/vector.cpp
index edd6b863f..cfaa9e7e7 100644
--- a/src/live_effects/parameter/vector.cpp
+++ b/src/live_effects/parameter/vector.cpp
@@ -4,9 +4,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "ui/widget/registered-widget.h"
 #include <glibmm/i18n.h>
 
-#include "ui/widget/registered-widget.h"
 #include "live_effects/parameter/vector.h"
 #include "sp-lpe-item.h"
 #include "knotholder.h"
diff --git a/src/resource-manager.cpp b/src/resource-manager.cpp
index 8e2e95988..fe53eca4f 100644
--- a/src/resource-manager.cpp
+++ b/src/resource-manager.cpp
@@ -9,12 +9,12 @@
 #include <string>
 #include <vector>
 #include <algorithm>
+#include <gtkmm/recentmanager.h>
 #include <glibmm/i18n.h>
 #include <glibmm/convert.h>
 #include <glibmm/fileutils.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/uriutils.h>
-#include <gtkmm/recentmanager.h>
 
 #include "resource-manager.h"
 
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index 946858ec4..41ebc9bfc 100644
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -23,15 +23,14 @@
 # include "config.h"
 #endif
 
+#include <gtkmm/clipboard.h>
+
 #include "file.h"
 #include "selection-chemistry.h"
 
 // TOOD fixme: This should be moved into preference repr
 SPCycleType SP_CYCLING = SP_CYCLE_FOCUS;
 
-
-#include <gtkmm/clipboard.h>
-
 #include "svg/svg.h"
 #include "desktop.h"
 #include "desktop-style.h"
diff --git a/src/shortcuts.cpp b/src/shortcuts.cpp
index 755269edb..a746b8633 100644
--- a/src/shortcuts.cpp
+++ b/src/shortcuts.cpp
@@ -25,6 +25,7 @@
 #include <string>
 #include <map>
 
+#include "shortcuts.h"
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
@@ -33,7 +34,6 @@
 #include "helper/action.h"
 #include "io/sys.h"
 #include "io/resource.h"
-#include "shortcuts.h"
 #include "verbs.h"
 #include "xml/node-iterators.h"
 #include "xml/repr.h"
diff --git a/src/shortcuts.h b/src/shortcuts.h
index c2a6f6cde..2d87b17ef 100644
--- a/src/shortcuts.h
+++ b/src/shortcuts.h
@@ -1,8 +1,6 @@
 #ifndef __SP_SHORTCUTS_H__
 #define __SP_SHORTCUTS_H__
 
-#include <gtkmm/cellrendereraccel.h>
-
 /*
  * Keyboard shortcut processing
  *
@@ -12,6 +10,14 @@
  * This code is in public domain
  */
 
+#include <gdkmm/types.h>
+
+typedef struct _GtkAccelGroup GtkAccelGroup;
+typedef struct _GtkWidget     GtkWidget;
+
+struct _GtkAccelGroup;
+struct _GtkWidget;
+
 namespace Inkscape {
     class Verb;
     namespace UI {
diff --git a/src/sp-mesh-array.cpp b/src/sp-mesh-array.cpp
index 249f9562e..2c3c7fa65 100644
--- a/src/sp-mesh-array.cpp
+++ b/src/sp-mesh-array.cpp
@@ -317,21 +317,26 @@ Geom::Point SPMeshPatchI::getTensorPoint( guint k ) {
 
     assert( k < 4 );
 
-    guint i, j;
+    guint i = 0;
+    guint j = 0;
     
 
     switch ( k ) {
         case 0:
-            i = 1; j = 1;
+            i = 1;
+            j = 1;
             break;
         case 1:
-            i = 1; j = 2;
+            i = 1;
+            j = 2;
             break;
         case 2:
-            i = 2; j = 2;
+            i = 2;
+            j = 2;
             break;
         case 3:
-            i = 2; j = 1;
+            i = 2;
+            j = 1;
             break;
     }
 
@@ -342,7 +347,6 @@ Geom::Point SPMeshPatchI::getTensorPoint( guint k ) {
         p = coonsTensorPoint( k );
     }
     return p;
-
 }
 
 /**
@@ -522,7 +526,7 @@ gdouble SPMeshPatchI::getOpacity( guint i ) {
 
     assert( i < 4 );
 
-    gdouble opacity;
+    gdouble opacity = 0.0;
     switch ( i ) {
         case 0:
             opacity = (*nodes)[ row   ][ col   ]->opacity;
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/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/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..f5addc401 100644
--- a/src/ui/dialog/object-attributes.cpp
+++ b/src/ui/dialog/object-attributes.cpp
@@ -20,19 +20,18 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <glibmm/i18n.h>
-
+#include "ui/dialog/dialog-manager.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/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/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/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 94860093d..87b8e2635 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/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/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 {
diff --git a/src/unicoderange.h b/src/unicoderange.h
index b0c7f34a9..2f73f7b47 100644
--- a/src/unicoderange.h
+++ b/src/unicoderange.h
@@ -1,6 +1,6 @@
+#include <glibmm/ustring.h>
 #include <glib-object.h>
-#include<vector>
-#include <glibmm.h>
+#include <vector>
 
 struct Urange{
 	gchar* start;
diff --git a/src/widgets/arc-toolbar.cpp b/src/widgets/arc-toolbar.cpp
index e96e4c097..809050ad9 100644
--- a/src/widgets/arc-toolbar.cpp
+++ b/src/widgets/arc-toolbar.cpp
@@ -28,9 +28,9 @@
 # include "config.h"
 #endif
 
+#include "ui/widget/spinbutton.h"
 #include <glibmm/i18n.h>
 
-#include "ui/widget/spinbutton.h"
 #include "toolbox.h"
 #include "arc-toolbar.h"
 
diff --git a/src/widgets/box3d-toolbar.cpp b/src/widgets/box3d-toolbar.cpp
index cb4951660..e8b330375 100644
--- a/src/widgets/box3d-toolbar.cpp
+++ b/src/widgets/box3d-toolbar.cpp
@@ -28,9 +28,9 @@
 # include "config.h"
 #endif
 
+#include "ui/widget/spinbutton.h"
 #include <glibmm/i18n.h>
 
-#include "ui/widget/spinbutton.h"
 #include "toolbox.h"
 #include "box3d-toolbar.h"
 
diff --git a/src/widgets/calligraphy-toolbar.cpp b/src/widgets/calligraphy-toolbar.cpp
index 287deb815..4cb4813b5 100644
--- a/src/widgets/calligraphy-toolbar.cpp
+++ b/src/widgets/calligraphy-toolbar.cpp
@@ -28,11 +28,9 @@
 # include "config.h"
 #endif
 
-
+#include "ui/dialog/calligraphic-profile-rename.h"
 #include <glibmm/i18n.h>
 
-#include "../ui/dialog/calligraphic-profile-rename.h"
-
 #include "toolbox.h"
 #include "calligraphy-toolbar.h"
 
diff --git a/src/widgets/dropper-toolbar.cpp b/src/widgets/dropper-toolbar.cpp
index 8eeebf5c1..cf58aa507 100644
--- a/src/widgets/dropper-toolbar.cpp
+++ b/src/widgets/dropper-toolbar.cpp
@@ -28,9 +28,8 @@
 # include "config.h"
 #endif
 
-#include <glibmm/i18n.h>
-
 #include "ui/widget/spinbutton.h"
+#include <glibmm/i18n.h>
 #include "toolbox.h"
 #include "dropper-toolbar.h"
 
diff --git a/src/widgets/erasor-toolbar.cpp b/src/widgets/erasor-toolbar.cpp
index 14f87c943..2e074490d 100644
--- a/src/widgets/erasor-toolbar.cpp
+++ b/src/widgets/erasor-toolbar.cpp
@@ -28,10 +28,8 @@
 # include "config.h"
 #endif
 
-
-#include <glibmm/i18n.h>
-
 #include "ui/widget/spinbutton.h"
+#include <glibmm/i18n.h>
 #include "toolbox.h"
 #include "erasor-toolbar.h"
 #include "calligraphy-toolbar.h"
diff --git a/src/widgets/fill-style.cpp b/src/widgets/fill-style.cpp
index d4186cd93..60e115f54 100644
--- a/src/widgets/fill-style.cpp
+++ b/src/widgets/fill-style.cpp
@@ -22,8 +22,8 @@
 # include "config.h"
 #endif
 
-#include <glibmm/i18n.h>
 #include <gtkmm/box.h>
+#include <glibmm/i18n.h>
 
 #include "verbs.h"
 
diff --git a/src/widgets/gradient-selector.cpp b/src/widgets/gradient-selector.cpp
index 972155ea9..7a7f0d8ff 100644
--- a/src/widgets/gradient-selector.cpp
+++ b/src/widgets/gradient-selector.cpp
@@ -16,6 +16,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include "gradient-vector.h"
 #include <gtk/gtk.h>
 
 #include "document.h"
@@ -30,7 +31,6 @@
 #include <glibmm/i18n.h>
 #include <xml/repr.h>
 
-#include "gradient-vector.h"
 #include "gradient-selector.h"
 #include "paint-selector.h"
 #include "style.h"
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index 3a95b552a..e15f81e0f 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -22,10 +22,9 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#ifdef HAVE_STRING_H
-#endif
-#include "ui/widget/color-preview.h"
+
 #include "gradient-vector.h"
+#include "ui/widget/color-preview.h"
 #include "verbs.h"
 #include <gtk/gtk.h>
 #include "macros.h"
diff --git a/src/widgets/gradient-vector.h b/src/widgets/gradient-vector.h
index 6719691d1..463d77912 100644
--- a/src/widgets/gradient-vector.h
+++ b/src/widgets/gradient-vector.h
@@ -15,7 +15,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib.h>
 #include <gtkmm/liststore.h>
 
 #include <stddef.h>
diff --git a/src/widgets/measure-toolbar.cpp b/src/widgets/measure-toolbar.cpp
index f556c0c7b..21df4c6d9 100644
--- a/src/widgets/measure-toolbar.cpp
+++ b/src/widgets/measure-toolbar.cpp
@@ -28,9 +28,8 @@
 # include "config.h"
 #endif
 
-#include <glibmm/i18n.h>
-
 #include "ui/widget/spinbutton.h"
+#include <glibmm/i18n.h>
 #include "toolbox.h"
 #include "measure-toolbar.h"
 
diff --git a/src/widgets/node-toolbar.cpp b/src/widgets/node-toolbar.cpp
index 79cdf8117..849de874d 100644
--- a/src/widgets/node-toolbar.cpp
+++ b/src/widgets/node-toolbar.cpp
@@ -28,9 +28,8 @@
 # include "config.h"
 #endif
 
-#include <glibmm/i18n.h>
-
 #include "ui/widget/spinbutton.h"
+#include <glibmm/i18n.h>
 #include "toolbox.h"
 #include "node-toolbar.h"
 
diff --git a/src/widgets/paintbucket-toolbar.cpp b/src/widgets/paintbucket-toolbar.cpp
index a99350a44..73815b86d 100644
--- a/src/widgets/paintbucket-toolbar.cpp
+++ b/src/widgets/paintbucket-toolbar.cpp
@@ -28,10 +28,8 @@
 # include "config.h"
 #endif
 
-
-#include <glibmm/i18n.h>
-
 #include "ui/widget/spinbutton.h"
+#include <glibmm/i18n.h>
 #include "toolbox.h"
 #include "paintbucket-toolbar.h"
 
diff --git a/src/widgets/pencil-toolbar.cpp b/src/widgets/pencil-toolbar.cpp
index 85dea51aa..35264662f 100644
--- a/src/widgets/pencil-toolbar.cpp
+++ b/src/widgets/pencil-toolbar.cpp
@@ -28,9 +28,8 @@
 # include "config.h"
 #endif
 
-#include <glibmm/i18n.h>
-
 #include "ui/widget/spinbutton.h"
+#include <glibmm/i18n.h>
 #include "toolbox.h"
 #include "pencil-toolbar.h"
 
diff --git a/src/widgets/rect-toolbar.cpp b/src/widgets/rect-toolbar.cpp
index 65eebf94b..8c1a735c5 100644
--- a/src/widgets/rect-toolbar.cpp
+++ b/src/widgets/rect-toolbar.cpp
@@ -28,9 +28,8 @@
 # include "config.h"
 #endif
 
-#include <glibmm/i18n.h>
-
 #include "ui/widget/spinbutton.h"
+#include <glibmm/i18n.h>
 #include "toolbox.h"
 #include "rect-toolbar.h"
 
diff --git a/src/widgets/sp-color-icc-selector.cpp b/src/widgets/sp-color-icc-selector.cpp
index d89d35e9c..ce9323311 100644
--- a/src/widgets/sp-color-icc-selector.cpp
+++ b/src/widgets/sp-color-icc-selector.cpp
@@ -1,6 +1,8 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+
+#include "gradient-vector.h"
 #include <math.h>
 #include <gtk/gtk.h>
 #include <glibmm/i18n.h>
@@ -11,7 +13,6 @@
 #include "document.h"
 #include "inkscape.h"
 #include "profile-manager.h"
-#include "gradient-vector.h"
 
 #define noDEBUG_LCMS
 
diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp
index 07cafc391..588221a7c 100644
--- a/src/widgets/sp-color-notebook.cpp
+++ b/src/widgets/sp-color-notebook.cpp
@@ -17,6 +17,7 @@
 # include "config.h"
 #endif
 
+#include "widgets/icon.h"
 #include <cstring>
 #include <string>
 #include <cstdlib>
@@ -37,7 +38,6 @@
 #include "../profile-manager.h"
 #include "color-profile.h"
 #include "cms-system.h"
-#include "widgets/icon.h"
 #include "tools-switch.h"
 #include "event-context.h"
 
diff --git a/src/widgets/spiral-toolbar.cpp b/src/widgets/spiral-toolbar.cpp
index b493ca5bf..08d26f3d1 100644
--- a/src/widgets/spiral-toolbar.cpp
+++ b/src/widgets/spiral-toolbar.cpp
@@ -28,9 +28,8 @@
 # include "config.h"
 #endif
 
-#include <glibmm/i18n.h>
-
 #include "ui/widget/spinbutton.h"
+#include <glibmm/i18n.h>
 #include "toolbox.h"
 #include "spiral-toolbar.h"
 
@@ -39,8 +38,6 @@
 #include "document-undo.h"
 #include "../verbs.h"
 #include "../inkscape.h"
-//#include "../interface.h"
-//#include "../connection-pool.h"
 #include "../selection-chemistry.h"
 #include "../selection.h"
 #include "../ege-adjustment-action.h"
diff --git a/src/widgets/spray-toolbar.cpp b/src/widgets/spray-toolbar.cpp
index e56a0c61a..06850d261 100644
--- a/src/widgets/spray-toolbar.cpp
+++ b/src/widgets/spray-toolbar.cpp
@@ -28,9 +28,8 @@
 # include "config.h"
 #endif
 
-#include <glibmm/i18n.h>
-
 #include "ui/widget/spinbutton.h"
+#include <glibmm/i18n.h>
 #include "toolbox.h"
 #include "spray-toolbar.h"
 
diff --git a/src/widgets/star-toolbar.cpp b/src/widgets/star-toolbar.cpp
index f8c5714cb..8c07c6473 100644
--- a/src/widgets/star-toolbar.cpp
+++ b/src/widgets/star-toolbar.cpp
@@ -28,9 +28,8 @@
 # include "config.h"
 #endif
 
-#include <glibmm/i18n.h>
-
 #include "ui/widget/spinbutton.h"
+#include <glibmm/i18n.h>
 #include "toolbox.h"
 #include "star-toolbar.h"
 
diff --git a/src/widgets/swatch-selector.cpp b/src/widgets/swatch-selector.cpp
index 524072cf0..ad59e0dc3 100644
--- a/src/widgets/swatch-selector.cpp
+++ b/src/widgets/swatch-selector.cpp
@@ -1,8 +1,5 @@
-
-
-#include <glibmm/i18n.h>
-
 #include "swatch-selector.h"
+#include <glibmm/i18n.h>
 
 #include "document.h"
 #include "document-undo.h"
diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp
index ef7d31d76..87cb54d10 100644
--- a/src/widgets/text-toolbar.cpp
+++ b/src/widgets/text-toolbar.cpp
@@ -28,10 +28,8 @@
 # include "config.h"
 #endif
 
-
-#include <glibmm/i18n.h>
-
 #include "ui/widget/spinbutton.h"
+#include <glibmm/i18n.h>
 #include "toolbox.h"
 #include "text-toolbar.h"
 
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index c9af08ed8..f9f13fa3a 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -936,7 +936,7 @@ static Glib::RefPtr<Gtk::ActionGroup> create_or_fetch_actions( SPDesktop* deskto
 }
 
 
-static GtkWidget* toolboxNewCommon( GtkWidget* tb, BarId id, GtkPositionType handlePos )
+static GtkWidget* toolboxNewCommon( GtkWidget* tb, BarId id, GtkPositionType /*handlePos*/ )
 {
     g_object_set_data(G_OBJECT(tb), "desktop", NULL);
 
diff --git a/src/widgets/tweak-toolbar.cpp b/src/widgets/tweak-toolbar.cpp
index 9b2c0bfe3..beb527a17 100644
--- a/src/widgets/tweak-toolbar.cpp
+++ b/src/widgets/tweak-toolbar.cpp
@@ -28,9 +28,8 @@
 # include "config.h"
 #endif
 
-#include <glibmm/i18n.h>
-
 #include "ui/widget/spinbutton.h"
+#include <glibmm/i18n.h>
 #include "toolbox.h"
 #include "tweak-toolbar.h"
 
diff --git a/src/xml/repr-io.cpp b/src/xml/repr-io.cpp
index 1258617c7..1b6116936 100644
--- a/src/xml/repr-io.cpp
+++ b/src/xml/repr-io.cpp
@@ -37,6 +37,8 @@
 
 #include "preferences.h"
 
+#include <glibmm/miscutils.h>
+
 using Inkscape::IO::Writer;
 using Inkscape::Util::List;
 using Inkscape::Util::cons;