Update to experimental r13565

(bzr r13341.5.16)

11 files changed, 106 insertions, 94 deletions

diff --git a/src/widgets/dash-selector.cpp b/src/widgets/dash-selector.cpp
index fce7a9d9f..479895022 100644
--- a/src/widgets/dash-selector.cpp
+++ b/src/widgets/dash-selector.cpp
@@ -25,7 +25,7 @@
 #include <2geom/coord.h>
 
 #include "style.h"
-#include "dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "preferences.h"
 #include "ui/widget/spinbutton.h"
 #include "display/cairo-utils.h"
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index d772253cb..9b7ac2f42 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -98,6 +98,7 @@ enum {
 //---------------------------------------------------------------------
 /* SPDesktopWidget */
 
+static void sp_desktop_widget_class_init (SPDesktopWidgetClass *klass);
 static void sp_desktop_widget_dispose(GObject *object);
 
 static void sp_desktop_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
@@ -127,6 +128,8 @@ static void sp_dtw_zoom_drawing (GtkMenuItem *item, gpointer data);
 static void sp_dtw_zoom_selection (GtkMenuItem *item, gpointer data);
 static void sp_dtw_sticky_zoom_toggled (GtkMenuItem *item, gpointer data);
 
+SPViewWidgetClass *dtw_parent_class;
+
 class CMSPrefWatcher {
 public:
     CMSPrefWatcher() :
@@ -265,19 +268,31 @@ SPDesktopWidget::window_get_pointer()
 
 static GTimer *overallTimer = 0;
 
-struct SPDesktopWidgetPrivate
-{
-    GtkWidget *tool_toolbox;
-    GtkWidget *aux_toolbox;
-    GtkWidget *commands_toolbox;
-    GtkWidget *snap_toolbox;
-};
-
-G_DEFINE_TYPE_WITH_CODE(SPDesktopWidget, sp_desktop_widget, SP_TYPE_VIEW_WIDGET,
-                        // Begin a timer to watch for the first desktop to appear on-screen
-                        overallTimer = g_timer_new();
-                        G_ADD_PRIVATE(SPDesktopWidget);
-                       );
+/**
+ * Registers SPDesktopWidget class and returns its type number.
+ */
+GType SPDesktopWidget::getType(void)
+{
+    static GType type = 0;
+    if (!type) {
+        GTypeInfo info = {
+            sizeof(SPDesktopWidgetClass),
+            0, // base_init
+            0, // base_finalize
+            (GClassInitFunc)sp_desktop_widget_class_init,
+            0, // class_finalize
+            0, // class_data
+            sizeof(SPDesktopWidget),
+            0, // n_preallocs
+            (GInstanceInitFunc)SPDesktopWidget::init,
+            0 // value_table
+        };
+        type = g_type_register_static(SP_TYPE_VIEW_WIDGET, "SPDesktopWidget", &info, static_cast<GTypeFlags>(0));
+        // Begin a timer to watch for the first desktop to appear on-screen
+        overallTimer = g_timer_new();
+    }
+    return type;
+}
 
 /**
  * SPDesktopWidget vtable initialization
@@ -285,6 +300,8 @@ G_DEFINE_TYPE_WITH_CODE(SPDesktopWidget, sp_desktop_widget, SP_TYPE_VIEW_WIDGET,
 static void
 sp_desktop_widget_class_init (SPDesktopWidgetClass *klass)
 {
+    dtw_parent_class = SP_VIEW_WIDGET_CLASS(g_type_class_peek_parent(klass));
+
     GObjectClass *object_class = G_OBJECT_CLASS(klass);
     GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
 
@@ -312,12 +329,10 @@ static void canvas_tbl_size_allocate(GtkWidget    * /*widget*/,
 /**
  * Callback for SPDesktopWidget object initialization.
  */
-void sp_desktop_widget_init( SPDesktopWidget *dtw )
+void SPDesktopWidget::init( SPDesktopWidget *dtw )
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
 
-    dtw->priv = reinterpret_cast<SPDesktopWidgetPrivate *>(sp_desktop_widget_get_instance_private(dtw));
-
     new (&dtw->modified_connection) sigc::connection();
 
     dtw->window = 0;
@@ -343,7 +358,7 @@ void sp_desktop_widget_init( SPDesktopWidget *dtw )
     {
         using Inkscape::UI::Dialogs::SwatchesPanel;
 
-        dtw->panels = new SwatchesPanel("/embedded/swatches");
+        dtw->panels = new SwatchesPanel("/embedded/swatches" /*false*/);
         dtw->panels->setOrientation(SP_ANCHOR_SOUTH);
 
 #if GTK_CHECK_VERSION(3,0,0)
@@ -362,19 +377,19 @@ void sp_desktop_widget_init( SPDesktopWidget *dtw )
     gtk_box_pack_end( GTK_BOX (dtw->vbox), dtw->hbox, TRUE, TRUE, 0 );
     gtk_widget_show(dtw->hbox);
 
-    dtw->priv->aux_toolbox = ToolboxFactory::createAuxToolbox();
-    gtk_box_pack_end (GTK_BOX (dtw->vbox), dtw->priv->aux_toolbox, FALSE, TRUE, 0);
+    dtw->aux_toolbox = ToolboxFactory::createAuxToolbox();
+    gtk_box_pack_end (GTK_BOX (dtw->vbox), dtw->aux_toolbox, FALSE, TRUE, 0);
 
-    dtw->priv->snap_toolbox = ToolboxFactory::createSnapToolbox();
-    ToolboxFactory::setOrientation( dtw->priv->snap_toolbox, GTK_ORIENTATION_VERTICAL );
-    gtk_box_pack_end( GTK_BOX(dtw->hbox), dtw->priv->snap_toolbox, FALSE, TRUE, 0 );
+    dtw->snap_toolbox = ToolboxFactory::createSnapToolbox();
+    ToolboxFactory::setOrientation( dtw->snap_toolbox, GTK_ORIENTATION_VERTICAL );
+    gtk_box_pack_end( GTK_BOX(dtw->hbox), dtw->snap_toolbox, FALSE, TRUE, 0 );
 
-    dtw->priv->commands_toolbox = ToolboxFactory::createCommandsToolbox();
-    gtk_box_pack_end (GTK_BOX (dtw->vbox), dtw->priv->commands_toolbox, FALSE, TRUE, 0);
+    dtw->commands_toolbox = ToolboxFactory::createCommandsToolbox();
+    gtk_box_pack_end (GTK_BOX (dtw->vbox), dtw->commands_toolbox, FALSE, TRUE, 0);
 
-    dtw->priv->tool_toolbox = ToolboxFactory::createToolToolbox();
-    ToolboxFactory::setOrientation( dtw->priv->tool_toolbox, GTK_ORIENTATION_VERTICAL );
-    gtk_box_pack_start( GTK_BOX(dtw->hbox), dtw->priv->tool_toolbox, FALSE, TRUE, 0 );
+    dtw->tool_toolbox = ToolboxFactory::createToolToolbox();
+    ToolboxFactory::setOrientation( dtw->tool_toolbox, GTK_ORIENTATION_VERTICAL );
+    gtk_box_pack_start( GTK_BOX(dtw->hbox), dtw->tool_toolbox, FALSE, TRUE, 0 );
 
     /* Horizontal ruler */
     GtkWidget *eventbox = gtk_event_box_new ();
@@ -789,8 +804,8 @@ static void sp_desktop_widget_dispose(GObject *object)
 
     dtw->modified_connection.~connection();
 
-    if (G_OBJECT_CLASS (sp_desktop_widget_parent_class)->dispose) {
-        G_OBJECT_CLASS (sp_desktop_widget_parent_class)->dispose(object);
+    if (G_OBJECT_CLASS (dtw_parent_class)->dispose) {
+        (* G_OBJECT_CLASS (dtw_parent_class)->dispose) (object);
     }
 }
 
@@ -893,8 +908,8 @@ sp_desktop_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
         (allocation->y == widg_allocation.y) &&
         (allocation->width == widg_allocation.width) &&
         (allocation->height == widg_allocation.height)) {
-        if (GTK_WIDGET_CLASS (sp_desktop_widget_parent_class)->size_allocate)
-            GTK_WIDGET_CLASS (sp_desktop_widget_parent_class)->size_allocate (widget, allocation);
+        if (GTK_WIDGET_CLASS (dtw_parent_class)->size_allocate)
+            GTK_WIDGET_CLASS (dtw_parent_class)->size_allocate (widget, allocation);
         return;
     }
 
@@ -902,8 +917,8 @@ sp_desktop_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
         Geom::Rect const area = dtw->desktop->get_display_area();
         double zoom = dtw->desktop->current_zoom();
 
-        if (GTK_WIDGET_CLASS(sp_desktop_widget_parent_class)->size_allocate) {
-            GTK_WIDGET_CLASS(sp_desktop_widget_parent_class)->size_allocate (widget, allocation);
+        if (GTK_WIDGET_CLASS(dtw_parent_class)->size_allocate) {
+            GTK_WIDGET_CLASS(dtw_parent_class)->size_allocate (widget, allocation);
         }
 
         if (SP_BUTTON_IS_DOWN(dtw->sticky_zoom)) {
@@ -921,8 +936,8 @@ sp_desktop_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
         dtw->desktop->show_dialogs();
 
     } else {
-        if (GTK_WIDGET_CLASS (sp_desktop_widget_parent_class)->size_allocate) {
-            GTK_WIDGET_CLASS (sp_desktop_widget_parent_class)->size_allocate (widget, allocation);
+        if (GTK_WIDGET_CLASS (dtw_parent_class)->size_allocate) {
+            GTK_WIDGET_CLASS (dtw_parent_class)->size_allocate (widget, allocation);
         }
 //            this->size_allocate (widget, allocation);
     }
@@ -937,8 +952,8 @@ sp_desktop_widget_realize (GtkWidget *widget)
 
     SPDesktopWidget *dtw = SP_DESKTOP_WIDGET (widget);
 
-    if (GTK_WIDGET_CLASS (sp_desktop_widget_parent_class)->realize)
-        GTK_WIDGET_CLASS (sp_desktop_widget_parent_class)->realize(widget);
+    if (GTK_WIDGET_CLASS (dtw_parent_class)->realize)
+        (* GTK_WIDGET_CLASS (dtw_parent_class)->realize) (widget);
 
     Geom::Rect d = Geom::Rect::from_xywh(Geom::Point(0,0), (dtw->desktop->doc())->getDimensions());
 
@@ -983,8 +998,8 @@ sp_desktop_widget_event (GtkWidget *widget, GdkEvent *event, SPDesktopWidget *dt
         }
     }
 
-    if (GTK_WIDGET_CLASS (sp_desktop_widget_parent_class)->event) {
-        return GTK_WIDGET_CLASS (sp_desktop_widget_parent_class)->event(widget, event);
+    if (GTK_WIDGET_CLASS (dtw_parent_class)->event) {
+        return (* GTK_WIDGET_CLASS (dtw_parent_class)->event) (widget, event);
     } else {
         // The key press/release events need to be passed to desktop handler explicitly,
         // because otherwise the event contexts only receive key events when the mouse cursor
@@ -1484,29 +1499,29 @@ void SPDesktopWidget::layoutWidgets()
     }
 
     if (!prefs->getBool(pref_root + "commands/state", true)) {
-        gtk_widget_hide (dtw->priv->commands_toolbox);
+        gtk_widget_hide (dtw->commands_toolbox);
     } else {
-        gtk_widget_show_all (dtw->priv->commands_toolbox);
+        gtk_widget_show_all (dtw->commands_toolbox);
     }
 
     if (!prefs->getBool(pref_root + "snaptoolbox/state", true)) {
-        gtk_widget_hide (dtw->priv->snap_toolbox);
+        gtk_widget_hide (dtw->snap_toolbox);
     } else {
-        gtk_widget_show_all (dtw->priv->snap_toolbox);
+        gtk_widget_show_all (dtw->snap_toolbox);
     }
 
     if (!prefs->getBool(pref_root + "toppanel/state", true)) {
-        gtk_widget_hide (dtw->priv->aux_toolbox);
+        gtk_widget_hide (dtw->aux_toolbox);
     } else {
         // we cannot just show_all because that will show all tools' panels;
         // this is a function from toolbox.cpp that shows only the current tool's panel
-        ToolboxFactory::showAuxToolbox(dtw->priv->aux_toolbox);
+        ToolboxFactory::showAuxToolbox(dtw->aux_toolbox);
     }
 
     if (!prefs->getBool(pref_root + "toolbox/state", true)) {
-        gtk_widget_hide (dtw->priv->tool_toolbox);
+        gtk_widget_hide (dtw->tool_toolbox);
     } else {
-        gtk_widget_show_all (dtw->priv->tool_toolbox);
+        gtk_widget_show_all (dtw->tool_toolbox);
     }
 
     if (!prefs->getBool(pref_root + "statusbar/state", true)) {
@@ -1543,7 +1558,7 @@ void SPDesktopWidget::layoutWidgets()
 void
 SPDesktopWidget::setToolboxFocusTo (const gchar* label)
 {
-    gpointer hb = sp_search_by_data_recursive(priv->aux_toolbox, (gpointer) label);
+    gpointer hb = sp_search_by_data_recursive(aux_toolbox, (gpointer) label);
     if (hb && GTK_IS_WIDGET(hb))
     {
         gtk_widget_grab_focus(GTK_WIDGET(hb));
@@ -1554,7 +1569,7 @@ void
 SPDesktopWidget::setToolboxAdjustmentValue (gchar const *id, double value)
 {
     GtkAdjustment *a = NULL;
-    gpointer hb = sp_search_by_data_recursive (priv->aux_toolbox, (gpointer) id);
+    gpointer hb = sp_search_by_data_recursive (aux_toolbox, (gpointer) id);
     if (hb && GTK_IS_WIDGET(hb)) {
         if (GTK_IS_SPIN_BUTTON(hb))
             a = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON(hb));
@@ -1571,7 +1586,7 @@ SPDesktopWidget::setToolboxAdjustmentValue (gchar const *id, double value)
 void
 SPDesktopWidget::setToolboxSelectOneValue (gchar const *id, int value)
 {
-    gpointer hb = sp_search_by_data_recursive(priv->aux_toolbox, (gpointer) id);
+    gpointer hb = sp_search_by_data_recursive(aux_toolbox, (gpointer) id);
     if (hb) {
         ege_select_one_action_set_active(EGE_SELECT_ONE_ACTION(hb), value);
     }
@@ -1582,7 +1597,7 @@ bool
 SPDesktopWidget::isToolboxButtonActive (const gchar* id)
 {
     bool isActive = false;
-    gpointer thing = sp_search_by_data_recursive(priv->aux_toolbox, (gpointer) id);
+    gpointer thing = sp_search_by_data_recursive(aux_toolbox, (gpointer) id);
     if ( !thing ) {
         //g_message( "Unable to locate item for {%s}", id );
     } else if ( GTK_IS_TOGGLE_BUTTON(thing) ) {
@@ -1603,13 +1618,13 @@ void SPDesktopWidget::setToolboxPosition(Glib::ustring const& id, GtkPositionTyp
     // Note - later on these won't be individual member variables.
     GtkWidget* toolbox = 0;
     if (id == "ToolToolbar") {
-        toolbox = priv->tool_toolbox;
+        toolbox = tool_toolbox;
     } else if (id == "AuxToolbar") {
-        toolbox = priv->aux_toolbox;
+        toolbox = aux_toolbox;
     } else if (id == "CommandsToolbar") {
-        toolbox = priv->commands_toolbox;
+        toolbox = commands_toolbox;
     } else if (id == "SnapToolbar") {
-        toolbox = priv->snap_toolbox;
+        toolbox = snap_toolbox;
     }
 
 
@@ -1682,10 +1697,10 @@ SPDesktopWidget* SPDesktopWidget::createInstance(SPNamedView *namedview)
     dtw->layoutWidgets();
 
     std::vector<GtkWidget *> toolboxes;
-    toolboxes.push_back(dtw->priv->tool_toolbox);
-    toolboxes.push_back(dtw->priv->aux_toolbox);
-    toolboxes.push_back(dtw->priv->commands_toolbox);
-    toolboxes.push_back(dtw->priv->snap_toolbox);
+    toolboxes.push_back(dtw->tool_toolbox);
+    toolboxes.push_back(dtw->aux_toolbox);
+    toolboxes.push_back(dtw->commands_toolbox);
+    toolboxes.push_back(dtw->snap_toolbox);
 
     dtw->panels->setDesktop( dtw->desktop );
 
@@ -1739,8 +1754,8 @@ void SPDesktopWidget::namedviewModified(SPObject *obj, guint flags)
          *
          * This should solve: https://bugs.launchpad.net/inkscape/+bug/362995
          */
-        if (GTK_IS_CONTAINER(priv->aux_toolbox)) {
-            GList *ch = gtk_container_get_children (GTK_CONTAINER(priv->aux_toolbox));
+        if (GTK_IS_CONTAINER(aux_toolbox)) {
+            GList *ch = gtk_container_get_children (GTK_CONTAINER(aux_toolbox));
             for (GList *i = ch; i != NULL; i = i->next) {
                 if (GTK_IS_CONTAINER(i->data)) {
                     GList *grch = gtk_container_get_children (GTK_CONTAINER(i->data));
@@ -1766,7 +1781,7 @@ void SPDesktopWidget::namedviewModified(SPObject *obj, guint flags)
         gtk_widget_set_tooltip_text(this->vruler_box, gettext(nv->doc_units->name_plural.c_str()));
 
         sp_desktop_widget_update_rulers(this);
-        ToolboxFactory::updateSnapToolbox(this->desktop, 0, priv->snap_toolbox);
+        ToolboxFactory::updateSnapToolbox(this->desktop, 0, this->snap_toolbox);
     }
 }
 
diff --git a/src/widgets/desktop-widget.h b/src/widgets/desktop-widget.h
index 9a4834d3d..a77d56fc3 100644
--- a/src/widgets/desktop-widget.h
+++ b/src/widgets/desktop-widget.h
@@ -34,33 +34,15 @@ typedef struct _EgeColorProfTracker EgeColorProfTracker;
 struct SPCanvas;
 class SPDesktop;
 struct SPDesktopWidget;
-struct SPDesktopWidgetPrivate;
 class SPObject;
 
-namespace Inkscape {
-    namespace Widgets {
-        class LayerSelector;
-    }
 
-    namespace UI {
-        namespace Widget {
-            class SelectedStyle;
-        }
-
-        namespace Dialogs {
-            class SwatchesPanel;
-        }
-    }
-}
-
-#define SP_TYPE_DESKTOP_WIDGET        (sp_desktop_widget_get_type ())
-#define SP_DESKTOP_WIDGET(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), SP_TYPE_DESKTOP_WIDGET, SPDesktopWidget))
-#define SP_DESKTOP_WIDGET_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST ((k), SP_TYPE_DESKTOP_WIDGET, SPDesktopWidgetClass))
-#define SP_IS_DESKTOP_WIDGET(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), SP_TYPE_DESKTOP_WIDGET))
+#define SP_TYPE_DESKTOP_WIDGET SPDesktopWidget::getType()
+#define SP_DESKTOP_WIDGET(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SP_TYPE_DESKTOP_WIDGET, SPDesktopWidget))
+#define SP_DESKTOP_WIDGET_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), SP_TYPE_DESKTOP_WIDGET, SPDesktopWidgetClass))
+#define SP_IS_DESKTOP_WIDGET(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SP_TYPE_DESKTOP_WIDGET))
 #define SP_IS_DESKTOP_WIDGET_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), SP_TYPE_DESKTOP_WIDGET))
 
-GType sp_desktop_widget_get_type();
-
 void sp_desktop_widget_show_decorations(SPDesktopWidget *dtw, gboolean show);
 void sp_desktop_widget_iconify(SPDesktopWidget *dtw);
 void sp_desktop_widget_maximize(SPDesktopWidget *dtw);
@@ -80,6 +62,12 @@ bool sp_desktop_widget_color_prof_adj_enabled( SPDesktopWidget *dtw );
 void sp_dtw_desktop_activate (SPDesktopWidget *dtw);
 void sp_dtw_desktop_deactivate (SPDesktopWidget *dtw);
 
+namespace Inkscape { namespace Widgets { class LayerSelector; } }
+
+namespace Inkscape { namespace UI { namespace Widget { class SelectedStyle; } } }
+
+namespace Inkscape { namespace UI { namespace Dialogs { class SwatchesPanel; } } }
+
 /// A GtkEventBox on an SPDesktop.
 struct SPDesktopWidget {
     SPViewWidget viewwidget;
@@ -260,15 +248,22 @@ struct SPDesktopWidget {
 
     Inkscape::UI::Widget::Dock* getDock();
 
+    static GType getType();
     static SPDesktopWidget* createInstance(SPNamedView *namedview);
 
     void updateNamedview();
 
-    SPDesktopWidgetPrivate *priv;
 private:
+    GtkWidget *tool_toolbox;
+    GtkWidget *aux_toolbox;
+    GtkWidget *commands_toolbox;
+    GtkWidget *snap_toolbox;
+
+    static void init(SPDesktopWidget *widget);
     void layoutWidgets();
 
     void namedviewModified(SPObject *obj, guint flags);
+
 };
 
 /// The SPDesktopWidget vtable
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index 7b1b4991c..039aba7ec 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -40,7 +40,7 @@
 
 #include "xml/repr.h"
 
-#include "dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "preferences.h"
 #include "svg/css-ostringstream.h"
 #include "sp-stop.h"
diff --git a/src/widgets/sp-color-icc-selector.cpp b/src/widgets/sp-color-icc-selector.cpp
index d0d302ff4..6e910c582 100644
--- a/src/widgets/sp-color-icc-selector.cpp
+++ b/src/widgets/sp-color-icc-selector.cpp
@@ -10,7 +10,7 @@
 #include <set>
 #include <vector>
 
-#include "../dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "sp-color-icc-selector.h"
 #include "sp-color-scales.h"
 #include "sp-color-slider.h"
diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp
index 9f927b51f..87cb7cae3 100644
--- a/src/widgets/sp-color-notebook.cpp
+++ b/src/widgets/sp-color-notebook.cpp
@@ -25,7 +25,7 @@
 #include <gtk/gtk.h>
 #include <glibmm/i18n.h>
 
-#include "../dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "../preferences.h"
 #include "sp-color-notebook.h"
 #include "spw-utilities.h"
diff --git a/src/widgets/sp-color-scales.cpp b/src/widgets/sp-color-scales.cpp
index 5fddacf59..60ba62ec5 100644
--- a/src/widgets/sp-color-scales.cpp
+++ b/src/widgets/sp-color-scales.cpp
@@ -8,7 +8,7 @@
 #include <math.h>
 #include <gtk/gtk.h>
 #include <glibmm/i18n.h>
-#include "../dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "sp-color-scales.h"
 #include "sp-color-slider.h"
 #include "svg/svg-icc-color.h"
diff --git a/src/widgets/sp-color-wheel-selector.cpp b/src/widgets/sp-color-wheel-selector.cpp
index 404874db7..6cfa7c14d 100644
--- a/src/widgets/sp-color-wheel-selector.cpp
+++ b/src/widgets/sp-color-wheel-selector.cpp
@@ -4,7 +4,7 @@
 #include <math.h>
 #include <gtk/gtk.h>
 #include <glibmm/i18n.h>
-#include "../dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "sp-color-wheel-selector.h"
 #include "sp-color-scales.h"
 #include "sp-color-slider.h"
diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp
index b5867abaa..9572f6426 100644
--- a/src/widgets/stroke-marker-selector.cpp
+++ b/src/widgets/stroke-marker-selector.cpp
@@ -25,7 +25,7 @@
 
 
 #include "style.h"
-#include "dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "desktop-handles.h"
 #include "desktop-style.h"
 #include "preferences.h"
diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
index 0e0a4fd72..3fa39da6f 100644
--- a/src/widgets/stroke-style.cpp
+++ b/src/widgets/stroke-style.cpp
@@ -18,7 +18,7 @@
 #define noSP_SS_VERBOSE
 
 #include "stroke-style.h"
-#include "../gradient-chemistry.h"
+#include "gradient-chemistry.h"
 #include "sp-gradient.h"
 #include "sp-stop.h"
 #include "svg/svg-color.h"
diff --git a/src/widgets/stroke-style.h b/src/widgets/stroke-style.h
index 6f0fe583b..464e7d2d1 100644
--- a/src/widgets/stroke-style.h
+++ b/src/widgets/stroke-style.h
@@ -12,6 +12,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+// WHOA! talk about header bloat!
+
 #ifndef SEEN_DIALOGS_STROKE_STYLE_H
 #define SEEN_DIALOGS_STROKE_STYLE_H
 
@@ -33,7 +35,7 @@
 #include "desktop.h"
 #include "desktop-handles.h"
 #include "desktop-style.h"
-#include "dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "display/canvas-bpath.h" // for SP_STROKE_LINEJOIN_*
 #include "display/drawing.h"
 #include "document-private.h"