Get rid of gtkmm top-level header usage - not required by API

(bzr r10940)

72 files changed, 109 insertions, 64 deletions

diff --git a/src/connection-pool.h b/src/connection-pool.h
index 4aa44e30a..e4e8f5c5e 100644
--- a/src/connection-pool.h
+++ b/src/connection-pool.h
@@ -2,7 +2,6 @@
 #define CONNECTION_POOL_H
 
 #include <glib-object.h>
-#include <gtkmm.h>
 #include <stddef.h>
 #include <sigc++/sigc++.h>
 
diff --git a/src/desktop.cpp b/src/desktop.cpp
index e03347e48..b42f0db04 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -28,7 +28,6 @@
 
 #include <glibmm/i18n.h>
 #include <sigc++/functors/mem_fun.h>
-#include <gtkmm.h>
 
 #include <2geom/transforms.h>
 #include <2geom/rect.h>
diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp
index 6d453367f..59bb1e765 100644
--- a/src/display/canvas-axonomgrid.cpp
+++ b/src/display/canvas-axonomgrid.cpp
@@ -38,6 +38,8 @@
 #include "xml/node-event-vector.h"
 #include "round.h"
 
+#include <gtkmm/table.h>
+
 enum Dim3 { X=0, Y, Z };
 
 #ifndef M_PI
diff --git a/src/display/canvas-axonomgrid.h b/src/display/canvas-axonomgrid.h
index 1f8bad51d..b5757f4be 100644
--- a/src/display/canvas-axonomgrid.h
+++ b/src/display/canvas-axonomgrid.h
@@ -10,7 +10,6 @@
 #include "xml/repr.h"
 #include <gtkmm/box.h>
 
-#include <gtkmm.h>
 #include "ui/widget/color-picker.h"
 #include "ui/widget/scalar-unit.h"
 
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp
index bc3b01692..3a0b18f00 100644
--- a/src/display/canvas-grid.cpp
+++ b/src/display/canvas-grid.cpp
@@ -33,6 +33,8 @@
 #include "util/mathfns.h"
 #include "xml/node-event-vector.h"
 
+#include <gtkmm/table.h>
+
 using Inkscape::DocumentUndo;
 
 namespace Inkscape {
diff --git a/src/display/canvas-grid.h b/src/display/canvas-grid.h
index 2788316fd..55d53f045 100644
--- a/src/display/canvas-grid.h
+++ b/src/display/canvas-grid.h
@@ -12,7 +12,6 @@
 #include <string>
 
 #include <gtkmm/box.h>
-#include <gtkmm.h>
 
 #include "sp-canvas-item.h"
 #include "xml/repr.h"
diff --git a/src/display/nr-filter-image.h b/src/display/nr-filter-image.h
index 5af0b3338..0e0c9a823 100644
--- a/src/display/nr-filter-image.h
+++ b/src/display/nr-filter-image.h
@@ -15,8 +15,9 @@
 #include "display/nr-filter-primitive.h"
 #include "display/nr-filter-slot.h"
 #include "display/nr-filter-units.h"
-#include <gtkmm.h>
 #include "sp-item.h"
+#include <glibmm/refptr.h>
+#include <gdkmm/pixbuf.h>
 
 namespace Inkscape {
 namespace Filters {
diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index 359ddd10c..4a3022d84 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -20,7 +20,6 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtkmm.h>
 
 #include "helper/sp-marshal.h"
 #include <helper/recthull.h>
diff --git a/src/dropper-context.cpp b/src/dropper-context.cpp
index d91642bd2..512d21705 100644
--- a/src/dropper-context.cpp
+++ b/src/dropper-context.cpp
@@ -16,7 +16,6 @@
 #endif
 
 #include <glibmm.h>
-#include <gtkmm.h>
 #include <gdk/gdk.h>
 #include <2geom/transforms.h>
 
diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp
index af401ecde..08df60d45 100644
--- a/src/extension/implementation/script.cpp
+++ b/src/extension/implementation/script.cpp
@@ -24,7 +24,9 @@
 #include <errno.h>
 #include <glib.h>
 #include <glib/gstdio.h>
-#include <gtkmm.h>
+#include <gtkmm/main.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/textview.h>
 
 #include "ui/view/view.h"
 #include "desktop-handles.h"
diff --git a/src/extension/internal/bitmap/imagemagick.cpp b/src/extension/internal/bitmap/imagemagick.cpp
index a5d27726f..cc69b3c0e 100644
--- a/src/extension/internal/bitmap/imagemagick.cpp
+++ b/src/extension/internal/bitmap/imagemagick.cpp
@@ -13,7 +13,6 @@
 #include <gtkmm/box.h>
 #include <gtkmm/adjustment.h>
 #include <gtkmm/spinbutton.h>
-#include <gtkmm.h>
 
 #include <glib/gstdio.h>
 
diff --git a/src/extension/param/enum.cpp b/src/extension/param/enum.cpp
index 373d1bd97..7cda98117 100644
--- a/src/extension/param/enum.cpp
+++ b/src/extension/param/enum.cpp
@@ -18,9 +18,8 @@
 # include "config.h"
 #endif
 
-
-#include <gtkmm.h>
 #include <glibmm/i18n.h>
+#include <gtkmm/comboboxtext.h>
 
 #include "xml/node.h"
 #include "extension/extension.h"
diff --git a/src/extension/param/radiobutton.cpp b/src/extension/param/radiobutton.cpp
index c05fa17cc..1c43b5729 100644
--- a/src/extension/param/radiobutton.cpp
+++ b/src/extension/param/radiobutton.cpp
@@ -18,9 +18,8 @@
 # include "config.h"
 #endif
 
-
-#include <gtkmm.h>
 #include <glibmm/i18n.h>
+#include <gtkmm/comboboxtext.h>
 
 #include "xml/node.h"
 #include "extension/extension.h"
diff --git a/src/file.h b/src/file.h
index 7e44d7da1..f85b1c34a 100644
--- a/src/file.h
+++ b/src/file.h
@@ -15,7 +15,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm.h>
 #include <glib.h>
 #include <gtk/gtk.h>
 
diff --git a/src/interface.cpp b/src/interface.cpp
index df5457bc8..b10ca6156 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -23,6 +23,7 @@
 
 #include <gtk/gtk.h>
 #include <glib.h>
+#include <gtkmm/icontheme.h>
 
 #include "inkscape-private.h"
 #include "extension/db.h"
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index 35e87f76c..e851571ef 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -33,7 +33,6 @@
 #include "live_effects/parameter/parameter.h"
 #include <glibmm/ustring.h>
 #include "display/curve.h"
-#include <gtkmm.h>
 
 #include <exception>
 
diff --git a/src/live_effects/parameter/bool.cpp b/src/live_effects/parameter/bool.cpp
index c38a5864f..93a836b90 100644
--- a/src/live_effects/parameter/bool.cpp
+++ b/src/live_effects/parameter/bool.cpp
@@ -10,7 +10,6 @@
 #include "live_effects/effect.h"
 #include "svg/svg.h"
 #include "svg/stringstream.h"
-#include <gtkmm.h>
 #include "widgets/icon.h"
 #include "ui/widget/registered-widget.h"
 #include "inkscape.h"
diff --git a/src/live_effects/parameter/originalpath.cpp b/src/live_effects/parameter/originalpath.cpp
index 4cb7fc4e4..4a8bfb78a 100644
--- a/src/live_effects/parameter/originalpath.cpp
+++ b/src/live_effects/parameter/originalpath.cpp
@@ -6,9 +6,11 @@
 
 #include "live_effects/parameter/originalpath.h"
 
-#include <gtkmm.h>
 #include "widgets/icon.h"
 #include <glibmm/i18n.h>
+#include <gtkmm/box.h>
+#include <gtkmm/button.h>
+#include <gtkmm/label.h>
 
 #include "uri.h"
 #include "sp-shape.h"
diff --git a/src/live_effects/parameter/parameter.cpp b/src/live_effects/parameter/parameter.cpp
index 8c08ca684..f0a090b24 100644
--- a/src/live_effects/parameter/parameter.cpp
+++ b/src/live_effects/parameter/parameter.cpp
@@ -10,7 +10,6 @@
 #include "live_effects/effect.h"
 #include "svg/svg.h"
 #include "xml/repr.h"
-#include <gtkmm.h>
 #include "ui/widget/registered-widget.h"
 
 #include "svg/stringstream.h"
diff --git a/src/live_effects/parameter/point.cpp b/src/live_effects/parameter/point.cpp
index c7dc4b5cd..7f387fe24 100644
--- a/src/live_effects/parameter/point.cpp
+++ b/src/live_effects/parameter/point.cpp
@@ -10,7 +10,6 @@
 #include "live_effects/effect.h"
 #include "svg/svg.h"
 #include "svg/stringstream.h"
-#include <gtkmm.h>
 #include "ui/widget/point.h"
 #include "widgets/icon.h"
 #include "ui/widget/registered-widget.h"
diff --git a/src/live_effects/parameter/random.cpp b/src/live_effects/parameter/random.cpp
index 847a946a0..10f76b6ba 100644
--- a/src/live_effects/parameter/random.cpp
+++ b/src/live_effects/parameter/random.cpp
@@ -10,7 +10,6 @@
 #include "live_effects/effect.h"
 #include "svg/svg.h"
 #include "ui/widget/registered-widget.h"
-#include <gtkmm.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 be36627a1..4e70a1ad0 100644
--- a/src/live_effects/parameter/text.cpp
+++ b/src/live_effects/parameter/text.cpp
@@ -14,7 +14,6 @@
 #include "live_effects/effect.h"
 #include "svg/svg.h"
 #include "svg/stringstream.h"
-#include <gtkmm.h>
 #include "widgets/icon.h"
 #include "ui/widget/registered-widget.h"
 #include "inkscape.h"
diff --git a/src/live_effects/parameter/vector.cpp b/src/live_effects/parameter/vector.cpp
index c5232c360..c81a5b032 100644
--- a/src/live_effects/parameter/vector.cpp
+++ b/src/live_effects/parameter/vector.cpp
@@ -11,7 +11,6 @@
 #include "knotholder.h"
 #include "svg/svg.h"
 #include "svg/stringstream.h"
-#include <gtkmm.h>
 
 #include "ui/widget/registered-widget.h"
 #include "live_effects/effect.h"
diff --git a/src/print.h b/src/print.h
index 2f587b95b..6ea4ede26 100644
--- a/src/print.h
+++ b/src/print.h
@@ -11,10 +11,10 @@
  * This code is in public domain
  */
 
-#include <gtkmm.h>
 //#include <libnr/nr-path.h>
 #include <2geom/forward.h>
 
+#include <gtkmm/window.h>
 
 class SPDocument;
 class SPStyle;
diff --git a/src/sp-filter.cpp b/src/sp-filter.cpp
index bafd356d6..5b2c94b7f 100644
--- a/src/sp-filter.cpp
+++ b/src/sp-filter.cpp
@@ -22,8 +22,6 @@
 using std::map;
 using std::pair;
 
-#include <gtkmm.h>
-
 #include "attributes.h"
 #include "document.h"
 #include "sp-filter.h"
diff --git a/src/sp-filter.h b/src/sp-filter.h
index 044854bc3..229e56ae0 100644
--- a/src/sp-filter.h
+++ b/src/sp-filter.h
@@ -14,8 +14,6 @@
 
 #include <map>
 
-#include <gtkmm.h>
-
 #include "number-opt-number.h"
 #include "sp-object.h"
 #include "sp-filter-units.h"
diff --git a/src/trace/potrace/inkscape-potrace.cpp b/src/trace/potrace/inkscape-potrace.cpp
index 2ef21b045..59dd6f254 100644
--- a/src/trace/potrace/inkscape-potrace.cpp
+++ b/src/trace/potrace/inkscape-potrace.cpp
@@ -17,7 +17,7 @@
 #include "inkscape-potrace.h"
 
 #include <glibmm/i18n.h>
-#include <gtkmm.h>
+#include <gtkmm/main.h>
 #include <iomanip>
 
 #include "trace/filterset.h"
diff --git a/src/trace/potrace/inkscape-potrace.h b/src/trace/potrace/inkscape-potrace.h
index f2fc9a71f..c1ffc6e9a 100644
--- a/src/trace/potrace/inkscape-potrace.h
+++ b/src/trace/potrace/inkscape-potrace.h
@@ -17,7 +17,6 @@
 #ifndef __INKSCAPE_POTRACE_H__
 #define __INKSCAPE_POTRACE_H__
 
-#include <gtkmm.h>
 #include <trace/trace.h>
 #include <trace/imagemap.h>
 
diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp
index 48e3edaa0..636b2c1e3 100644
--- a/src/trace/trace.cpp
+++ b/src/trace/trace.cpp
@@ -19,8 +19,8 @@
 #include "desktop-handles.h"
 #include "document.h"
 #include "message-stack.h"
-#include <gtkmm.h>
 #include <glibmm/i18n.h>
+#include <gtkmm/main.h>
 #include "selection.h"
 #include "xml/repr.h"
 #include "xml/attribute-record.h"
diff --git a/src/trace/trace.h b/src/trace/trace.h
index a7fbe0cc8..f811f4891 100644
--- a/src/trace/trace.h
+++ b/src/trace/trace.h
@@ -21,8 +21,8 @@
 # include <string.h>
 #endif
 
-#include <gtkmm.h>
-
+#include <glibmm/refptr.h>
+#include <gdkmm/pixbuf.h>
 #include <vector>
 #include <sp-shape.h>
 
diff --git a/src/ui/dialog/dialog.h b/src/ui/dialog/dialog.h
index 5d2652a41..3bd4f9d65 100644
--- a/src/ui/dialog/dialog.h
+++ b/src/ui/dialog/dialog.h
@@ -14,8 +14,6 @@
 #ifndef INKSCAPE_DIALOG_H
 #define INKSCAPE_DIALOG_H
 
-#include <gtkmm.h>
-
 #include "dock-behavior.h"
 #include "floating-behavior.h"
 
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index 4f7388a97..21229de81 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -27,7 +27,6 @@
 #include "document.h"
 #include "desktop-handles.h"
 #include "desktop.h"
-#include <gtkmm.h>
 #include "helper/units.h"
 #include "inkscape.h"
 #include "io/sys.h"
@@ -47,6 +46,8 @@
 #include "color-profile.h"
 #endif // ENABLE_LCMS
 
+#include <gtkmm/stock.h>
+
 using std::pair;
 
 namespace Inkscape {
diff --git a/src/ui/dialog/document-properties.h b/src/ui/dialog/document-properties.h
index 0cba6e802..227c95bf8 100644
--- a/src/ui/dialog/document-properties.h
+++ b/src/ui/dialog/document-properties.h
@@ -17,7 +17,10 @@
 #include <list>
 #include <stddef.h>
 #include <sigc++/sigc++.h>//
+#include <gtkmm/comboboxtext.h>
 #include <gtkmm/notebook.h>
+#include <gtkmm/optionmenu.h>
+#include <gtkmm/textview.h>
 #include <glibmm/i18n.h>
 
 #include "ui/widget/notebook-page.h"
diff --git a/src/ui/dialog/filedialog.h b/src/ui/dialog/filedialog.h
index a7441e9bb..9b0e6a291 100644
--- a/src/ui/dialog/filedialog.h
+++ b/src/ui/dialog/filedialog.h
@@ -19,7 +19,6 @@
 #include <glibmm.h>
 #include <vector>
 #include <set>
-#include <gtkmm.h>
 
 #include "extension/system.h"
 
diff --git a/src/ui/dialog/filedialogimpl-gtkmm.cpp b/src/ui/dialog/filedialogimpl-gtkmm.cpp
index 61013295a..62dc75537 100644
--- a/src/ui/dialog/filedialogimpl-gtkmm.cpp
+++ b/src/ui/dialog/filedialogimpl-gtkmm.cpp
@@ -32,6 +32,8 @@
 # include <libgnomevfs/gnome-vfs.h>
 #endif
 
+#include <gtkmm/stock.h>
+
 //Routines from file.cpp
 #undef INK_DUMP_FILENAME_CONV
 
diff --git a/src/ui/dialog/filedialogimpl-gtkmm.h b/src/ui/dialog/filedialogimpl-gtkmm.h
index ba61d618f..5b6a12ca0 100644
--- a/src/ui/dialog/filedialogimpl-gtkmm.h
+++ b/src/ui/dialog/filedialogimpl-gtkmm.h
@@ -31,6 +31,9 @@
 //Gtk includes
 #include <glibmm/i18n.h>
 #include <glib/gstdio.h>
+#include <gtkmm/comboboxtext.h>
+#include <gtkmm/expander.h>
+#include <gtkmm/filechooserdialog.h>
 
 //Temporary ugly hack
 //Remove this after the get_filter() calls in
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index 321cc0789..4e2290f18 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -19,7 +19,6 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtkmm.h>
 #include "ui/widget/spinbutton.h"
 #include <glibmm/i18n.h>
 
@@ -63,6 +62,10 @@
 #include "io/sys.h"
 #include <iostream>
 
+#include <gtkmm/colorbutton.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/stock.h>
+
 using namespace Inkscape::Filters;
 
 namespace Inkscape {
diff --git a/src/ui/dialog/filter-effects-dialog.h b/src/ui/dialog/filter-effects-dialog.h
index 22c765631..5968bab80 100644
--- a/src/ui/dialog/filter-effects-dialog.h
+++ b/src/ui/dialog/filter-effects-dialog.h
@@ -15,8 +15,6 @@
 
 #include <memory>
 
-#include <gtkmm.h>
-
 #include "attributes.h"
 #include "ui/widget/panel.h"
 #include "sp-filter.h"
@@ -24,6 +22,9 @@
 #include "ui/widget/spin-slider.h"
 #include "xml/helper-observer.h"
 
+#include <gtkmm/notebook.h>
+#include <gtkmm/sizegroup.h>
+
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
diff --git a/src/ui/dialog/glyphs.cpp b/src/ui/dialog/glyphs.cpp
index 84b4a34bd..e110c483c 100644
--- a/src/ui/dialog/glyphs.cpp
+++ b/src/ui/dialog/glyphs.cpp
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include <glibmm/i18n.h>
+#include <gtkmm/alignment.h>
 #include <gtkmm/entry.h>
 #include <gtkmm/iconview.h>
 #include <gtkmm/label.h>
diff --git a/src/ui/dialog/glyphs.h b/src/ui/dialog/glyphs.h
index 5dbfb9af5..e0021ce28 100644
--- a/src/ui/dialog/glyphs.h
+++ b/src/ui/dialog/glyphs.h
@@ -7,6 +7,7 @@
 #ifndef SEEN_DIALOGS_GLYPHS_H
 #define SEEN_DIALOGS_GLYPHS_H
 
+#include <gtkmm/comboboxtext.h>
 #include <gtkmm/treemodel.h>
 #include "ui/widget/panel.h"
 #include "ui/dialog/desktop-tracker.h"
diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index fd2eb3aaf..3a49a267c 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -23,6 +23,8 @@
 #include <glibmm/i18n.h>
 #include <gtkmm/alignment.h>
 #include <gtkmm/buttonbox.h>
+#include <gtkmm/checkbutton.h>
+#include <gtkmm/frame.h>
 #include <gtkmm/stock.h>
 
 #include "desktop.h"
diff --git a/src/ui/dialog/object-properties.h b/src/ui/dialog/object-properties.h
index cdfc76dd4..7d96a4df9 100644
--- a/src/ui/dialog/object-properties.h
+++ b/src/ui/dialog/object-properties.h
@@ -14,8 +14,10 @@
 #define SEEN_DIALOGS_ITEM_PROPERTIES_H
 
 #include <gtk/gtk.h>
-#include <gtkmm.h>
 #include <glibmm/i18n.h>
+#include <gtkmm/expander.h>
+#include <gtkmm/frame.h>
+#include <gtkmm/textview.h>
 
 #include "desktop.h"
 #include "ui/dialog/desktop-tracker.h"
diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp
index 3f9414866..6a3632add 100644
--- a/src/ui/dialog/ocaldialogs.cpp
+++ b/src/ui/dialog/ocaldialogs.cpp
@@ -28,6 +28,8 @@
 #include "io/sys.h"
 #include "preferences.h"
 
+#include <gtkmm/stock.h>
+
 namespace Inkscape
 {
 namespace UI
diff --git a/src/ui/dialog/ocaldialogs.h b/src/ui/dialog/ocaldialogs.h
index a7dfaa5cd..1da3a3447 100644
--- a/src/ui/dialog/ocaldialogs.h
+++ b/src/ui/dialog/ocaldialogs.h
@@ -14,7 +14,6 @@
 
 #include <glibmm.h>
 #include <vector>
-#include <gtkmm.h>
 #include "filedialogimpl-gtkmm.h"
 
 //General includes
@@ -29,6 +28,9 @@
 //Gtk includes
 #include <glibmm/i18n.h>
 #include <glib/gstdio.h>
+#include <gtkmm/frame.h>
+#include <gtkmm/listviewtext.h>
+#include <gtkmm/scrolledwindow.h>
 
 //Temporary ugly hack
 //Remove this after the get_filter() calls in
diff --git a/src/ui/dialog/print-colors-preview-dialog.h b/src/ui/dialog/print-colors-preview-dialog.h
index 246908556..11798d00a 100644
--- a/src/ui/dialog/print-colors-preview-dialog.h
+++ b/src/ui/dialog/print-colors-preview-dialog.h
@@ -14,7 +14,6 @@
 #include "ui/widget/panel.h"
 #include "verbs.h"
 
-#include <gtkmm.h>
 #include <gtkmm/box.h>
 
 namespace Inkscape {
diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp
index 658ef6613..64bc47495 100644
--- a/src/ui/dialog/svg-fonts-dialog.cpp
+++ b/src/ui/dialog/svg-fonts-dialog.cpp
@@ -19,6 +19,7 @@
 
 #include "document-private.h"
 #include <gtkmm/notebook.h>
+#include <gtkmm/stock.h>
 #include <glibmm/i18n.h>
 #include <message-stack.h>
 #include "selection.h"
diff --git a/src/ui/dialog/svg-fonts-dialog.h b/src/ui/dialog/svg-fonts-dialog.h
index 41bd6ecc8..0b6f94e3c 100644
--- a/src/ui/dialog/svg-fonts-dialog.h
+++ b/src/ui/dialog/svg-fonts-dialog.h
@@ -21,11 +21,14 @@
 #include "desktop.h"
 #include "desktop-handles.h"
 
-#include <gtkmm.h>
+#include <gtkmm/box.h>
+#include <gtkmm/comboboxtext.h>
+#include <gtkmm/drawingarea.h>
+#include <gtkmm/entry.h>
 #include <gtkmm/liststore.h>
+#include <gtkmm/scale.h>
+#include <gtkmm/scrolledwindow.h>
 #include <gtkmm/treeview.h>
-#include <gtkmm/entry.h>
-#include <gtkmm/box.h>
 
 #include "display/nr-svgfonts.h"
 #include "attributes.h"
diff --git a/src/ui/tool/control-point-selection.cpp b/src/ui/tool/control-point-selection.cpp
index 3e20fb3c7..6233a1f70 100644
--- a/src/ui/tool/control-point-selection.cpp
+++ b/src/ui/tool/control-point-selection.cpp
@@ -19,6 +19,8 @@
 #include "ui/tool/transform-handle-set.h"
 #include "ui/tool/node.h"
 
+#include <gdk/gdkkeysyms.h>
+
 namespace Inkscape {
 namespace UI {
 
diff --git a/src/ui/tool/control-point.h b/src/ui/tool/control-point.h
index 991d9123d..4e1a1db3a 100644
--- a/src/ui/tool/control-point.h
+++ b/src/ui/tool/control-point.h
@@ -14,13 +14,14 @@
 #include <boost/utility.hpp>
 #include <stddef.h>
 #include <sigc++/sigc++.h>
-#include <gdkmm.h>
-#include <gtkmm.h>
 #include <2geom/point.h>
 #include "util/accumulators.h"
 #include "display/sodipodi-ctrl.h"
 #include "event-context.h"
 
+#include <gtkmm/enums.h>
+#include <gdkmm/pixbuf.h>
+
 class SPDesktop;
 
 namespace Inkscape {
diff --git a/src/ui/tool/multi-path-manipulator.cpp b/src/ui/tool/multi-path-manipulator.cpp
index 92d4d002c..d5e2bf4ec 100644
--- a/src/ui/tool/multi-path-manipulator.cpp
+++ b/src/ui/tool/multi-path-manipulator.cpp
@@ -27,6 +27,8 @@
 #include "ui/tool/path-manipulator.h"
 #include "util/unordered-containers.h"
 
+#include <gdk/gdkkeysyms.h>
+
 #ifdef USE_GNU_HASHES
 namespace __gnu_cxx {
 template<>
diff --git a/src/ui/tool/node-tool.cpp b/src/ui/tool/node-tool.cpp
index 40e299ee6..167b1c2ff 100644
--- a/src/ui/tool/node-tool.cpp
+++ b/src/ui/tool/node-tool.cpp
@@ -42,6 +42,8 @@
 #include "pixmaps/cursor-node.xpm"
 #include "pixmaps/cursor-node-d.xpm"
 
+#include <gdk/gdkkeysyms.h>
+
 /** @struct InkNodeTool
  *
  * Node tool event context.
diff --git a/src/ui/tool/selector.cpp b/src/ui/tool/selector.cpp
index f5448b48a..a0051cdcc 100644
--- a/src/ui/tool/selector.cpp
+++ b/src/ui/tool/selector.cpp
@@ -17,6 +17,8 @@
 #include "ui/tool/event-utils.h"
 #include "ui/tool/selector.h"
 
+#include <gdk/gdkkeysyms.h>
+
 namespace Inkscape {
 namespace UI {
 
diff --git a/src/ui/widget/button.h b/src/ui/widget/button.h
index a7d7dfb95..362cdf8ff 100644
--- a/src/ui/widget/button.h
+++ b/src/ui/widget/button.h
@@ -10,7 +10,7 @@
 #ifndef INKSCAPE_UI_WIDGET_BUTTON_H
 #define INKSCAPE_UI_WIDGET_BUTTON_H
 
-#include <gtkmm.h>
+#include <gtkmm/checkbutton.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/color-picker.h b/src/ui/widget/color-picker.h
index f2d67c341..9dad40031 100644
--- a/src/ui/widget/color-picker.h
+++ b/src/ui/widget/color-picker.h
@@ -14,8 +14,9 @@
 #define __COLOR_PICKER_H__
 
 #include <stddef.h>
+#include <gtkmm/button.h>
+#include <gtkmm/dialog.h>
 #include <sigc++/sigc++.h>
-#include <gtkmm.h>
 #include "widgets/sp-color-selector.h"
 #include "ui/widget/color-preview.h"
 //#include "ui/dialog/dialog.h"
diff --git a/src/ui/widget/dock-item.cpp b/src/ui/widget/dock-item.cpp
index 093a456d7..b9467475a 100644
--- a/src/ui/widget/dock-item.cpp
+++ b/src/ui/widget/dock-item.cpp
@@ -8,7 +8,6 @@
  */
 
 #include <gtk/gtk.h>
-#include <gtkmm.h>
 
 #include "dock-item.h"
 #include "desktop.h"
@@ -17,6 +16,9 @@
 #include "ui/widget/dock.h"
 #include "widgets/icon.h"
 
+#include <gtkmm/icontheme.h>
+#include <gtkmm/stockitem.h>
+
 namespace Inkscape {
 namespace UI {
 namespace Widget {
diff --git a/src/ui/widget/entry.h b/src/ui/widget/entry.h
index 98c861272..d332dde1b 100644
--- a/src/ui/widget/entry.h
+++ b/src/ui/widget/entry.h
@@ -10,9 +10,10 @@
 #ifndef INKSCAPE_UI_WIDGET_ENTRY__H
 #define INKSCAPE_UI_WIDGET_ENTRY__H
 
-#include <gtkmm.h>
 #include "labelled.h"
 
+#include <gtkmm/entry.h>
+
 namespace Inkscape {
 namespace UI {
 namespace Widget {
diff --git a/src/ui/widget/labelled.h b/src/ui/widget/labelled.h
index b0e6b6d4d..9f6f855cb 100644
--- a/src/ui/widget/labelled.h
+++ b/src/ui/widget/labelled.h
@@ -11,7 +11,8 @@
 #ifndef INKSCAPE_UI_WIDGET_LABELLED_H
 #define INKSCAPE_UI_WIDGET_LABELLED_H
 
-#include <gtkmm.h>
+#include <gtkmm/box.h>
+#include <gtkmm/label.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index e3dbddd43..a14a23253 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -22,7 +22,6 @@
 #endif
 
 #include <cmath>
-#include <gtkmm.h>
 #include <string>
 #include <string.h>
 #include <vector>
diff --git a/src/ui/widget/page-sizer.h b/src/ui/widget/page-sizer.h
index 61fb425bc..0c814590d 100644
--- a/src/ui/widget/page-sizer.h
+++ b/src/ui/widget/page-sizer.h
@@ -10,7 +10,6 @@
 #ifndef INKSCAPE_UI_WIDGET_PAGE_SIZER_H
 #define INKSCAPE_UI_WIDGET_PAGE_SIZER_H
 
-#include <gtkmm.h>
 #include <stddef.h>
 #include <sigc++/sigc++.h>
 
@@ -19,6 +18,12 @@
 #include "ui/widget/registered-widget.h"
 #include "xml/node.h"
 
+#include <gtkmm/alignment.h>
+#include <gtkmm/expander.h>
+#include <gtkmm/frame.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/table.h>
+
 namespace Inkscape {    
 namespace UI {
 namespace Widget {
diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index 4942d4bde..0871fbffd 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -18,6 +18,7 @@
 #include <glibmm/i18n.h>
 
 #include <gtkmm/dialog.h> // for Gtk::RESPONSE_*
+#include <gtkmm/menu.h>
 #include <gtkmm/stock.h>
 
 #include <gtk/gtk.h>
diff --git a/src/ui/widget/panel.h b/src/ui/widget/panel.h
index c8006dc1d..64efa8837 100644
--- a/src/ui/widget/panel.h
+++ b/src/ui/widget/panel.h
@@ -14,12 +14,19 @@
 #define SEEN_INKSCAPE_UI_WIDGET_PANEL_H
 
 #include <vector>
-#include <gtkmm.h>
 
 #include "inkscape.h"
 #include "selection.h"
 #include "ui/previewfillable.h"
 
+#include <gtkmm/arrow.h>
+#include <gtkmm/box.h>
+#include <gtkmm/button.h>
+#include <gtkmm/buttonbox.h>
+#include <gtkmm/checkmenuitem.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/menuitem.h>
+
 namespace Inkscape {
 namespace UI {
 namespace Widget {
diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp
index fd68247cf..f5c7c8c56 100644
--- a/src/ui/widget/preferences-widget.cpp
+++ b/src/ui/widget/preferences-widget.cpp
@@ -21,6 +21,7 @@
 #include <gtkmm/frame.h>
 #include <gtkmm/alignment.h>
 #include <gtkmm/box.h>
+#include <gtkmm/stock.h>
 
 #include "preferences.h"
 #include "ui/widget/preferences-widget.h"
diff --git a/src/ui/widget/preferences-widget.h b/src/ui/widget/preferences-widget.h
index 8ddf8b596..6d4b5c553 100644
--- a/src/ui/widget/preferences-widget.h
+++ b/src/ui/widget/preferences-widget.h
@@ -17,11 +17,15 @@
 
 #include <iostream>
 #include <vector>
-#include <gtkmm.h>
 #include "ui/widget/spinbutton.h"
 #include <stddef.h>
 #include <sigc++/sigc++.h>
 #include <glibmm/i18n.h>
+#include <gtkmm/comboboxtext.h>
+#include <gtkmm/drawingarea.h>
+#include <gtkmm/filechooserbutton.h>
+#include <gtkmm/scale.h>
+#include <gtkmm/table.h>
 
 #include "ui/widget/color-picker.h"
 #include "ui/widget/unit-menu.h"
diff --git a/src/ui/widget/registered-widget.h b/src/ui/widget/registered-widget.h
index c9d37d037..80acb98e6 100644
--- a/src/ui/widget/registered-widget.h
+++ b/src/ui/widget/registered-widget.h
@@ -12,7 +12,6 @@
 #ifndef INKSCAPE_UI_WIDGET_REGISTERED_WIDGET__H_
 #define INKSCAPE_UI_WIDGET_REGISTERED_WIDGET__H_
 
-#include <gtkmm.h>
 #include <2geom/affine.h>
 #include "xml/node.h"
 #include "registry.h"
diff --git a/src/ui/widget/rendering-options.h b/src/ui/widget/rendering-options.h
index b29c4bfae..74c56591f 100644
--- a/src/ui/widget/rendering-options.h
+++ b/src/ui/widget/rendering-options.h
@@ -11,9 +11,11 @@
 #ifndef INKSCAPE_UI_WIDGET_RENDERING_OPTIONS_H
 #define INKSCAPE_UI_WIDGET_RENDERING_OPTIONS_H
 
-#include <gtkmm.h>
 #include "scalar.h"
 
+#include <gtkmm/frame.h>
+#include <gtkmm/radiobutton.h>
+
 namespace Inkscape {
 namespace UI {
 namespace Widget {
diff --git a/src/ui/widget/tolerance-slider.h b/src/ui/widget/tolerance-slider.h
index e3bd385cc..790ed0e74 100644
--- a/src/ui/widget/tolerance-slider.h
+++ b/src/ui/widget/tolerance-slider.h
@@ -10,8 +10,6 @@
 #ifndef INKSCAPE_UI_WIDGET_TOLERANCE_SLIDER__H_
 #define INKSCAPE_UI_WIDGET_TOLERANCE_SLIDER__H_
 
-#include <gtkmm.h>
-
 namespace Inkscape {
 namespace UI {
 namespace Widget {
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 215edf4a2..1b5912196 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -25,7 +25,6 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtkmm.h>
 #include <2geom/rect.h>
 
 #include "box3d-context.h"
diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp
index fc985687f..930412e55 100644
--- a/src/widgets/icon.cpp
+++ b/src/widgets/icon.cpp
@@ -20,7 +20,8 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
-#include <gtkmm.h>
+#include <gtkmm/icontheme.h>
+#include <gtkmm/image.h>
 #include <gdkmm/pixbuf.h>
 #include <glibmm/fileutils.h>
 #include <2geom/transforms.h>
diff --git a/src/widgets/sp-attribute-widget.h b/src/widgets/sp-attribute-widget.h
index 1754b6082..98f44b4f8 100644
--- a/src/widgets/sp-attribute-widget.h
+++ b/src/widgets/sp-attribute-widget.h
@@ -16,8 +16,10 @@
 #define SEEN_DIALOGS_SP_ATTRIBUTE_WIDGET_H
 
 #include <gtk/gtk.h>
-#include <gtkmm.h>
 #include <glib.h>
+#include <gtkmm/entry.h>
+#include <gtkmm/table.h>
+#include <gtkmm/widget.h>
 #include <stddef.h>
 #include <sigc++/connection.h>
 
diff --git a/src/widgets/spw-utilities.h b/src/widgets/spw-utilities.h
index 7ae36aa29..334aa7ce1 100644
--- a/src/widgets/spw-utilities.h
+++ b/src/widgets/spw-utilities.h
@@ -21,6 +21,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>      /* GtkWidget */
 #include <gtkmm/widget.h>
+#include <gtkmm/table.h>
 
 namespace Gtk {
   class Label;
diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
index eeba1ab61..12bfc20e1 100644
--- a/src/widgets/stroke-style.cpp
+++ b/src/widgets/stroke-style.cpp
@@ -58,6 +58,8 @@
 #include "fill-style.h" // to get sp_fill_style_widget_set_desktop
 #include "fill-n-stroke-factory.h"
 
+#include <gtkmm/optionmenu.h>
+
 using Inkscape::DocumentUndo;
 
 /** Marker selection option menus */
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 079ec4680..55f96a71e 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -32,7 +32,6 @@
 #include <cstring>
 #include <string>
 
-#include <gtkmm.h>
 #include <gtk/gtk.h>
 #include <iostream>
 #include <sstream>