Move more Gtkmm2ext widgets into libwidget

45 files changed, 142 insertions, 132 deletions

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index f956161b06..b7f61a3fb7 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -74,7 +74,6 @@
 #include "gtkmm2ext/bindings.h"
 #include "gtkmm2ext/gtk_ui.h"
 #include "gtkmm2ext/utils.h"
-#include "gtkmm2ext/popup.h"
 #include "gtkmm2ext/window_title.h"
 
 #include "widgets/fastmeter.h"
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 80baef517c..f66f9b467b 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -47,6 +47,8 @@
 #include <gtkmm/eventbox.h>
 #include <gtkmm/menu.h>
 #include <gtkmm/menuitem.h>
+#include <gtkmm/messagedialog.h>
+#include <gtkmm/notebook.h>
 #include <gtkmm/button.h>
 #include <gtkmm/togglebutton.h>
 #include <gtkmm/treeview.h>
@@ -151,7 +153,7 @@ namespace Gtk {
 	class ProgressBar;
 }
 
-namespace Gtkmm2ext {
+namespace ArdourWidgets {
 	class Tabbable;
 }
 
@@ -414,15 +416,15 @@ private:
 	bool          _initial_verbose_plugin_scan;
 	bool           first_time_engine_run;
 
-	void show_tabbable (Gtkmm2ext::Tabbable*);
-	void hide_tabbable (Gtkmm2ext::Tabbable*);
-	void detach_tabbable (Gtkmm2ext::Tabbable*);
-	void attach_tabbable (Gtkmm2ext::Tabbable*);
-	void button_change_tabbable_visibility (Gtkmm2ext::Tabbable*);
-	void key_change_tabbable_visibility (Gtkmm2ext::Tabbable*);
+	void show_tabbable (ArdourWidgets::Tabbable*);
+	void hide_tabbable (ArdourWidgets::Tabbable*);
+	void detach_tabbable (ArdourWidgets::Tabbable*);
+	void attach_tabbable (ArdourWidgets::Tabbable*);
+	void button_change_tabbable_visibility (ArdourWidgets::Tabbable*);
+	void key_change_tabbable_visibility (ArdourWidgets::Tabbable*);
 	void toggle_editor_and_mixer ();
 
-	void tabbable_state_change (Gtkmm2ext::Tabbable&);
+	void tabbable_state_change (ArdourWidgets::Tabbable&);
 
 	void toggle_meterbridge ();
 	void toggle_luawindow ();
diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index 84f1145adb..87beab6b0e 100644
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -153,7 +153,7 @@ ARDOUR_UI::tab_window_root_drop (GtkNotebook* src,
 	using namespace std;
 	Gtk::Notebook* nb = 0;
 	Gtk::Window* win = 0;
-	Gtkmm2ext::Tabbable* tabbable = 0;
+	ArdourWidgets::Tabbable* tabbable = 0;
 
 
 	if (w == GTK_WIDGET(editor->contents().gobj())) {
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index ffe39844bf..1a2188c85c 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -33,14 +33,15 @@
 #include <gtkmm/accelmap.h>
 #include <gtk/gtk.h>
 
+#include "pbd/file_utils.h"
+#include "pbd/fpu.h"
+#include "pbd/convert.h"
+
 #include "gtkmm2ext/cairo_packer.h"
-#include "gtkmm2ext/tearoff.h"
 #include "gtkmm2ext/utils.h"
 #include "gtkmm2ext/window_title.h"
 
-#include "pbd/file_utils.h"
-#include "pbd/fpu.h"
-#include "pbd/convert.h"
+#include "widgets/tearoff.h"
 
 #include "ardour_ui.h"
 #include "public_editor.h"
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 58b731f293..6a20d81316 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -57,12 +57,10 @@
 #include <gtkmm/menuitem.h>
 
 #include "gtkmm2ext/bindings.h"
-#include "gtkmm2ext/eventboxext.h"
 #include "gtkmm2ext/gtk_ui.h"
 #include "gtkmm2ext/keyboard.h"
 #include "gtkmm2ext/utils.h"
 #include "gtkmm2ext/window_title.h"
-#include "gtkmm2ext/choice.h"
 #include "gtkmm2ext/cell_renderer_pixbuf_toggle.h"
 
 #include "ardour/analysis_graph.h"
@@ -84,6 +82,7 @@
 #include "canvas/text.h"
 
 #include "widgets/ardour_spacer.h"
+#include "widgets/eventboxext.h"
 #include "widgets/tooltips.h"
 
 #include "control_protocol/control_protocol.h"
@@ -761,11 +760,11 @@ Editor::Editor ()
 	ebox->set_name("EditorWindow");
 	ebox->add (toolbar_hbox);
 
-	Gtk::EventBox* epane_box = manage (new Gtkmm2ext::EventBoxExt);  //a themeable box
+	Gtk::EventBox* epane_box = manage (new EventBoxExt);  //a themeable box
 	epane_box->set_name("EditorWindow");
 	epane_box->add (edit_pane);
 
-	Gtk::EventBox* epane_box2 = manage (new Gtkmm2ext::EventBoxExt);  //a themeable box
+	Gtk::EventBox* epane_box2 = manage (new EventBoxExt);  //a themeable box
 	epane_box2->set_name("EditorWindow");
 	epane_box2->add (global_vpacker);
 
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index ba1f989964..8be6dcf77c 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -36,7 +36,6 @@
 
 #include "gtkmm2ext/bindings.h"
 #include "gtkmm2ext/dndtreeview.h"
-#include "gtkmm2ext/pane.h"
 
 #include "pbd/stateful.h"
 #include "pbd/signals.h"
@@ -51,6 +50,7 @@
 
 #include "widgets/ardour_button.h"
 #include "widgets/ardour_dropdown.h"
+#include "widgets/pane.h"
 
 #include "ardour_dialog.h"
 #include "public_editor.h"
@@ -635,8 +635,8 @@ private:
 	void add_notebook_page (std::string const &, Gtk::Widget &);
 	bool notebook_tab_clicked (GdkEventButton *, Gtk::Widget *);
 
-	Gtkmm2ext::HPane   edit_pane;
-	Gtkmm2ext::VPane   editor_summary_pane;
+	ArdourWidgets::HPane edit_pane;
+	ArdourWidgets::VPane editor_summary_pane;
 
 	Gtk::EventBox meter_base;
 	Gtk::HBox     meter_box;
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index 17ee8e17a1..9fc9361bd2 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -483,38 +483,38 @@ Editor::register_actions ()
 
 	act = myactions.register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-object", _("Object Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseObject));
 	mouse_move_button.set_related_action (act);
-	mouse_move_button.set_icon (Gtkmm2ext::ArdourIcon::ToolGrab);
+	mouse_move_button.set_icon (ArdourWidgets::ArdourIcon::ToolGrab);
 	mouse_move_button.set_name ("mouse mode button");
 
 	act = myactions.register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-range", _("Range Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseRange));
 	mouse_select_button.set_related_action (act);
-	mouse_select_button.set_icon (Gtkmm2ext::ArdourIcon::ToolRange);
+	mouse_select_button.set_icon (ArdourWidgets::ArdourIcon::ToolRange);
 	mouse_select_button.set_name ("mouse mode button");
 
 	act = myactions.register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-draw", _("Note Drawing Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseDraw));
 	mouse_draw_button.set_related_action (act);
-	mouse_draw_button.set_icon (Gtkmm2ext::ArdourIcon::ToolDraw);
+	mouse_draw_button.set_icon (ArdourWidgets::ArdourIcon::ToolDraw);
 	mouse_draw_button.set_name ("mouse mode button");
 
 	act = myactions.register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-audition", _("Audition Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseAudition));
 	mouse_audition_button.set_related_action (act);
-	mouse_audition_button.set_icon (Gtkmm2ext::ArdourIcon::ToolAudition);
+	mouse_audition_button.set_icon (ArdourWidgets::ArdourIcon::ToolAudition);
 	mouse_audition_button.set_name ("mouse mode button");
 
 	act = myactions.register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-timefx", _("Time FX Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseTimeFX));
 	mouse_timefx_button.set_related_action (act);
-	mouse_timefx_button.set_icon (Gtkmm2ext::ArdourIcon::ToolStretch);
+	mouse_timefx_button.set_icon (ArdourWidgets::ArdourIcon::ToolStretch);
 	mouse_timefx_button.set_name ("mouse mode button");
 
 	act = myactions.register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-content", _("Content Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseContent));
 	mouse_content_button.set_related_action (act);
-	mouse_content_button.set_icon (Gtkmm2ext::ArdourIcon::ToolContent);
+	mouse_content_button.set_icon (ArdourWidgets::ArdourIcon::ToolContent);
 	mouse_content_button.set_name ("mouse mode button");
 
 	if(!Profile->get_mixbus()) {
 		act = myactions.register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-cut", _("Cut Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseCut));
 		mouse_cut_button.set_related_action (act);
-		mouse_cut_button.set_icon (Gtkmm2ext::ArdourIcon::ToolCut);
+		mouse_cut_button.set_icon (ArdourWidgets::ArdourIcon::ToolCut);
 		mouse_cut_button.set_name ("mouse mode button");
 	}
 
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index 1e8d157f14..c217f05823 100644
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -31,7 +31,7 @@
 #include "pbd/shortpath.h"
 #include "pbd/stateful_diff_command.h"
 
-#include <gtkmm2ext/choice.h>
+#include "widgets/choice.h"
 
 #include "ardour/audio_track.h"
 #include "ardour/audiofilesource.h"
@@ -651,7 +651,7 @@ Editor::embed_sndfiles (vector<string>            paths,
 				choices.push_back (_("Don't embed it"));
 				choices.push_back (_("Embed all without questions"));
 
-				Gtkmm2ext::Choice rate_choice (
+				ArdourWidgets::Choice rate_choice (
 					_("Sample rate"),
 					string_compose (_("%1\nThis audiofile's sample rate doesn't match the session sample rate!"),
 							short_path (path, 40)),
@@ -677,7 +677,7 @@ Editor::embed_sndfiles (vector<string>            paths,
 				choices.push_back (_("Cancel"));
 				choices.push_back (_("Embed it anyway"));
 
-				Gtkmm2ext::Choice rate_choice (
+				ArdourWidgets::Choice rate_choice (
 					_("Sample rate"),
 					string_compose (_("%1\nThis audiofile's sample rate doesn't match the session sample rate!"), path),
 					choices, false
diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc
index f2cc8e3d04..1a4f88e2f2 100644
--- a/gtk2_ardour/editor_export_audio.cc
+++ b/gtk2_ardour/editor_export_audio.cc
@@ -27,8 +27,6 @@
 
 #include "pbd/gstdio_compat.h"
 
-#include "gtkmm2ext/choice.h"
-
 #include "pbd/pthread_utils.h"
 
 #include "ardour/audio_track.h"
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 3cb62da846..17521e436c 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -36,9 +36,10 @@
 #include "pbd/whitespace.h"
 #include "pbd/stateful_diff_command.h"
 
-#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/choice.h>
-#include <gtkmm2ext/popup.h>
+#include "gtkmm2ext/utils.h"
+
+#include "widgets/choice.h"
+#include "widgets/popup.h"
 
 #include "ardour/audio_track.h"
 #include "ardour/audioregion.h"
@@ -5047,7 +5048,7 @@ Editor::remove_last_capture ()
 		choices.push_back (_("No, do nothing."));
 		choices.push_back (_("Yes, destroy it."));
 
-		Gtkmm2ext::Choice prompter (_("Destroy last capture"), prompt, choices);
+		Choice prompter (_("Destroy last capture"), prompt, choices);
 
 		if (prompter.run () == 1) {
 			_session->remove_last_capture ();
diff --git a/gtk2_ardour/editor_pt_import.cc b/gtk2_ardour/editor_pt_import.cc
index cb3054a62b..55c3b0b43c 100644
--- a/gtk2_ardour/editor_pt_import.cc
+++ b/gtk2_ardour/editor_pt_import.cc
@@ -29,8 +29,6 @@
 #include "pbd/shortpath.h"
 #include "pbd/stateful_diff_command.h"
 
-#include <gtkmm2ext/choice.h>
-
 #include "ardour/audio_track.h"
 #include "ardour/audiofilesource.h"
 #include "ardour/audioregion.h"
diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc
index 83b3f00165..0372e1f3d8 100644
--- a/gtk2_ardour/editor_regions.cc
+++ b/gtk2_ardour/editor_regions.cc
@@ -33,10 +33,10 @@
 #include "ardour/session.h"
 #include "ardour/profile.h"
 
-#include "gtkmm2ext/choice.h"
 #include "gtkmm2ext/treeutils.h"
 #include "gtkmm2ext/utils.h"
 
+#include "widgets/choice.h"
 #include "widgets/tooltips.h"
 
 #include "audio_clock.h"
@@ -503,7 +503,7 @@ EditorRegions::remove_unused_regions ()
 	choices.push_back (_("No, do nothing."));
 	choices.push_back (_("Yes, remove."));
 
-	Gtkmm2ext::Choice prompter (_("Remove unused regions"), prompt, choices);
+	ArdourWidgets::Choice prompter (_("Remove unused regions"), prompt, choices);
 
 	if (prompter.run () == 1) {
 		_no_redisplay = true;
diff --git a/gtk2_ardour/editor_snapshots.cc b/gtk2_ardour/editor_snapshots.cc
index 0a2ea085cd..8ab16cc48b 100644
--- a/gtk2_ardour/editor_snapshots.cc
+++ b/gtk2_ardour/editor_snapshots.cc
@@ -26,13 +26,13 @@
 
 #include <gtkmm/liststore.h>
 
-#include "gtkmm2ext/choice.h"
-
 #include "ardour/filename_extensions.h"
 #include "ardour/session.h"
 #include "ardour/session_state_utils.h"
 #include "ardour/session_directory.h"
 
+#include "widgets/choice.h"
+
 #include "editor_snapshots.h"
 #include "ardour_ui.h"
 #include "pbd/i18n.h"
@@ -173,7 +173,7 @@ EditorSnapshots::remove (std::string name)
 	choices.push_back (_("No, do nothing."));
 	choices.push_back (_("Yes, remove it."));
 
-	Gtkmm2ext::Choice prompter (_("Remove snapshot"), prompt, choices);
+	ArdourWidgets::Choice prompter (_("Remove snapshot"), prompt, choices);
 
 	if (prompter.run () == 1) {
 		_session->remove_state (name);
diff --git a/gtk2_ardour/engine_dialog.h b/gtk2_ardour/engine_dialog.h
index b9bfabb61e..2f5399e564 100644
--- a/gtk2_ardour/engine_dialog.h
+++ b/gtk2_ardour/engine_dialog.h
@@ -24,14 +24,15 @@
 #include <vector>
 #include <string>
 
+#include <gtkmm/box.h>
+#include <gtkmm/button.h>
+#include <gtkmm/buttonbox.h>
+#include <gtkmm/comboboxtext.h>
 #include <gtkmm/checkbutton.h>
+#include <gtkmm/expander.h>
+#include <gtkmm/notebook.h>
 #include <gtkmm/spinbutton.h>
-#include <gtkmm/comboboxtext.h>
 #include <gtkmm/table.h>
-#include <gtkmm/expander.h>
-#include <gtkmm/box.h>
-#include <gtkmm/buttonbox.h>
-#include <gtkmm/button.h>
 
 #include "pbd/signals.h"
 
diff --git a/gtk2_ardour/enums.cc b/gtk2_ardour/enums.cc
index 2f141d23a9..608d257645 100644
--- a/gtk2_ardour/enums.cc
+++ b/gtk2_ardour/enums.cc
@@ -19,7 +19,7 @@
 
 #include "pbd/enumwriter.h"
 
-#include "gtkmm2ext/ardour_icon.h"
+#include "widgets/ardour_icon.h"
 
 #include "audio_clock.h"
 #include "editing.h"
@@ -30,7 +30,7 @@ using namespace std;
 using namespace PBD;
 using namespace ARDOUR;
 using namespace Editing;
-using namespace Gtkmm2ext;
+using namespace ArdourWidgets;
 
 void
 setup_gtk_ardour_enums ()
diff --git a/gtk2_ardour/location_ui.h b/gtk2_ardour/location_ui.h
index 0d1115feba..46495aa4fc 100644
--- a/gtk2_ardour/location_ui.h
+++ b/gtk2_ardour/location_ui.h
@@ -33,8 +33,8 @@
 #include "ardour/location.h"
 #include "ardour/session_handle.h"
 
-#include "gtkmm2ext/pane.h"
 #include "widgets/ardour_button.h"
+#include "widgets/pane.h"
 
 #include "ardour_window.h"
 #include "audio_clock.h"
@@ -180,7 +180,7 @@ private:
 	LocationEditRow      punch_edit_row;
 	Gtk::VBox loop_punch_box;
 
-	Gtkmm2ext::VPane loc_range_panes;
+	ArdourWidgets::VPane loc_range_panes;
 
 	Gtk::VBox  loc_frame_box;
 	Gtk::Button add_location_button;
diff --git a/gtk2_ardour/luawindow.cc b/gtk2_ardour/luawindow.cc
index 8a9c2aee3b..beb2cc0356 100644
--- a/gtk2_ardour/luawindow.cc
+++ b/gtk2_ardour/luawindow.cc
@@ -34,10 +34,10 @@
 #include "pbd/md5.h"
 
 #include "gtkmm2ext/gtk_ui.h"
-#include "gtkmm2ext/pane.h"
 #include "gtkmm2ext/utils.h"
 #include "gtkmm2ext/window_title.h"
 
+#include "widgets/pane.h"
 #include "widgets/tooltips.h"
 
 #include "ardour/filesystem_paths.h"
@@ -156,7 +156,7 @@ LuaWindow::LuaWindow ()
 	vbox->pack_start (*scrollin, true, true, 0);
 	vbox->pack_start (*hbox, false, false, 2);
 
-	Gtkmm2ext::VPane *vpane = manage (new Gtkmm2ext::VPane ());
+	ArdourWidgets::VPane *vpane = manage (new ArdourWidgets::VPane ());
 	vpane->add (*vbox);
 	vpane->add (scrollout);
 	vpane->set_divider (0, 0.75);
diff --git a/gtk2_ardour/luawindow.h b/gtk2_ardour/luawindow.h
index 3994970adb..c786e4d63a 100644
--- a/gtk2_ardour/luawindow.h
+++ b/gtk2_ardour/luawindow.h
@@ -24,6 +24,7 @@
 #include <gtkmm/box.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/label.h>
+#include <gtkmm/textview.h>
 #include <gtkmm/window.h>
 
 #include "pbd/signals.h"
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 1113fce769..9c9981bcc3 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -48,8 +48,9 @@
 #include "ardour/filesystem_paths.h"
 
 #include <gtkmm/main.h>
+#include <gtkmm/stock.h>
+
 #include <gtkmm2ext/application.h>
-#include <gtkmm2ext/popup.h>
 #include <gtkmm2ext/utils.h>
 
 #include "ardour_ui.h"
diff --git a/gtk2_ardour/midi_channel_selector.h b/gtk2_ardour/midi_channel_selector.h
index 7f1281d7d0..c7c754c2b7 100644
--- a/gtk2_ardour/midi_channel_selector.h
+++ b/gtk2_ardour/midi_channel_selector.h
@@ -30,7 +30,7 @@
 #include "gtkmm/radiobutton.h"
 #include "gtkmm/label.h"
 
-#include "gtkmm2ext/stateful_button.h"
+#include "widgets/stateful_button.h"
 
 #include "ardour/types.h"
 
@@ -53,11 +53,11 @@ public:
 
 protected:
 	virtual void button_toggled(Gtk::ToggleButton* button, uint8_t button_nr) = 0;
-	Gtk::Label                      _button_labels[4][4];
-	Gtkmm2ext::StatefulToggleButton _buttons[4][4];
-	int                             _recursion_counter;
+	Gtk::Label                          _button_labels[4][4];
+	ArdourWidgets::StatefulToggleButton _buttons[4][4];
+	int                                 _recursion_counter;
 
-	bool              was_clicked (GdkEventButton*);
+	bool was_clicked (GdkEventButton*);
 };
 
 class SingleMidiChannelSelector : public MidiChannelSelector
diff --git a/gtk2_ardour/midi_scroomer.cc b/gtk2_ardour/midi_scroomer.cc
index 0cd7eae46a..6fad2cc1f1 100644
--- a/gtk2_ardour/midi_scroomer.cc
+++ b/gtk2_ardour/midi_scroomer.cc
@@ -22,14 +22,13 @@
 #include "midi_scroomer.h"
 #include "ui_config.h"
 
-using namespace Gtkmm2ext;
 using namespace Gtk;
 using namespace std;
 
 //std::map<int, Glib::RefPtr<Gdk::Pixmap> > MidiScroomer::piano_pixmaps;
 
 MidiScroomer::MidiScroomer(Adjustment& adj)
-	: Gtkmm2ext::Scroomer(adj)
+	: ArdourWidgets::Scroomer(adj)
 {
 
 	adj.set_lower(0);
diff --git a/gtk2_ardour/midi_scroomer.h b/gtk2_ardour/midi_scroomer.h
index 2b4ebe6c64..bbf1ec3d64 100644
--- a/gtk2_ardour/midi_scroomer.h
+++ b/gtk2_ardour/midi_scroomer.h
@@ -20,10 +20,9 @@
 #ifndef __ardour_midi_scroomer_h__
 #define __ardour_midi_scroomer_h__
 
-#include <gtkmm2ext/scroomer.h>
-#include <gdkmm/pixbuf.h>
+#include "widgets/scroomer.h"
 
-class MidiScroomer : public Gtkmm2ext::Scroomer
+class MidiScroomer : public ArdourWidgets::Scroomer
 {
 public:
 	MidiScroomer(Gtk::Adjustment&);
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 32a82fc2a6..8f101ee09d 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -30,7 +30,6 @@
 #include "gtkmm2ext/gtk_ui.h"
 #include "gtkmm2ext/menu_elems.h"
 #include "gtkmm2ext/utils.h"
-#include "gtkmm2ext/choice.h"
 #include "gtkmm2ext/doi.h"
 
 #include "widgets/tooltips.h"
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 02391a3a44..88489f8cc3 100644
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -33,15 +33,6 @@
 #include "pbd/stacktrace.h"
 #include "pbd/unwind.h"
 
-#include <glibmm/threads.h>
-
-#include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/keyboard.h>
-#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/tearoff.h>
-#include <gtkmm2ext/window_title.h>
-#include <gtkmm2ext/doi.h>
-
 #include "ardour/amp.h"
 #include "ardour/debug.h"
 #include "ardour/audio_track.h"
@@ -53,6 +44,14 @@
 #include "ardour/vca.h"
 #include "ardour/vca_manager.h"
 
+#include "gtkmm2ext/gtk_ui.h"
+#include "gtkmm2ext/keyboard.h"
+#include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/window_title.h"
+#include "gtkmm2ext/doi.h"
+
+#include "widgets/tearoff.h"
+
 #include "keyboard.h"
 #include "mixer_ui.h"
 #include "mixer_strip.h"
diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index adf86b09d2..9485ea252f 100644
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -30,6 +30,7 @@
 #include <gtkmm/frame.h>
 #include <gtkmm/menu.h>
 #include <gtkmm/treeview.h>
+#include <gtkmm/treestore.h>
 #include <gtkmm/liststore.h>
 
 #include "pbd/stateful.h"
@@ -43,10 +44,11 @@
 
 #include <gtkmm2ext/bindings.h>
 #include "gtkmm2ext/dndtreeview.h"
-#include <gtkmm2ext/pane.h>
-#include "gtkmm2ext/tabbable.h"
 #include "gtkmm2ext/treeutils.h"
 
+#include "widgets/pane.h"
+#include "widgets/tabbable.h"
+
 #include "axis_provider.h"
 #include "enums.h"
 #include "route_processor_selection.h"
@@ -77,7 +79,7 @@ protected:
 	virtual bool row_drop_possible_vfunc (const Gtk::TreeModel::Path&, const Gtk::SelectionData&) const;
 };
 
-class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr, public AxisViewProvider
+class Mixer_UI : public ArdourWidgets::Tabbable, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr, public AxisViewProvider
 {
 public:
 	static Mixer_UI* instance();
@@ -152,9 +154,9 @@ private:
 	Gtk::Frame            track_display_frame;
 	Gtk::Frame            group_display_frame;
 	Gtk::Frame            favorite_plugins_frame;
-	Gtkmm2ext::VPane      rhs_pane1;
-	Gtkmm2ext::VPane      rhs_pane2;
-	Gtkmm2ext::HPane      inner_pane;
+	ArdourWidgets::VPane  rhs_pane1;
+	ArdourWidgets::VPane  rhs_pane2;
+	ArdourWidgets::HPane  inner_pane;
 	Gtk::HBox             strip_packer;
 	Gtk::ScrolledWindow   vca_scroller;
 	Gtk::HBox             vca_hpacker;
@@ -163,7 +165,7 @@ private:
 	Gtk::Label            vca_label;
 	Gtk::EventBox         vca_scroller_base;
 	Gtk::HBox             out_packer;
-	Gtkmm2ext::HPane      list_hpane;
+	ArdourWidgets::HPane  list_hpane;
 
 	MixerGroupTabs* _group_tabs;
 
diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc
index ca0b23399d..4ec75a4ce4 100644
--- a/gtk2_ardour/monitor_section.cc
+++ b/gtk2_ardour/monitor_section.cc
@@ -23,13 +23,13 @@
 #include "pbd/error.h"
 #include "pbd/replace_all.h"
 
-#include "gtkmm2ext/tearoff.h"
 #include "gtkmm2ext/actions.h"
 #include "gtkmm2ext/utils.h"
 
 #include <gtkmm/menu.h>
 #include <gtkmm/menuitem.h>
 
+#include "widgets/tearoff.h"
 #include "widgets/tooltips.h"
 
 #include "ardour/amp.h"
diff --git a/gtk2_ardour/monitor_section.h b/gtk2_ardour/monitor_section.h
index ca85aa5457..9e3cec59bc 100644
--- a/gtk2_ardour/monitor_section.h
+++ b/gtk2_ardour/monitor_section.h
@@ -35,7 +35,7 @@
 #include "processor_box.h"
 #include "processor_selection.h"
 
-namespace Gtkmm2ext {
+namespace ArdourWidgets {
 	class TearOff;
 }
 
@@ -47,7 +47,7 @@ public:
 
 	void set_session (ARDOUR::Session*);
 
-	Gtkmm2ext::TearOff& tearoff() const { return *_tearoff; }
+	ArdourWidgets::TearOff& tearoff() const { return *_tearoff; }
 
 	std::string state_id() const;
 
@@ -56,7 +56,7 @@ public:
 private:
 	Gtk::HBox hpacker;
 	Gtk::VBox vpacker;
-	Gtkmm2ext::TearOff* _tearoff;
+	ArdourWidgets::TearOff* _tearoff;
 
 	Gtk::HBox  channel_table_packer;
 	Gtk::HBox  table_hpacker;
diff --git a/gtk2_ardour/mono_panner.h b/gtk2_ardour/mono_panner.h
index aef11d9c7a..5022e9b52d 100644
--- a/gtk2_ardour/mono_panner.h
+++ b/gtk2_ardour/mono_panner.h
@@ -24,7 +24,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "gtkmm2ext/binding_proxy.h"
+#include "widgets/binding_proxy.h"
 
 #include "panner_interface.h"
 
@@ -72,7 +72,7 @@ private:
 	double accumulated_delta;
 	bool detented;
 
-	BindingProxy position_binder;
+	ArdourWidgets::BindingProxy position_binder;
 
 	void set_tooltip ();
 
diff --git a/gtk2_ardour/plugin_selector.cc b/gtk2_ardour/plugin_selector.cc
index cd904f6cd9..0a609eb9cd 100644
--- a/gtk2_ardour/plugin_selector.cc
+++ b/gtk2_ardour/plugin_selector.cc
@@ -25,10 +25,13 @@
 
 #include <algorithm>
 
-#include <gtkmm/table.h>
-#include <gtkmm/stock.h>
 #include <gtkmm/button.h>
+#include <gtkmm/comboboxtext.h>
+#include <gtkmm/frame.h>
+#include <gtkmm/messagedialog.h>
 #include <gtkmm/notebook.h>
+#include <gtkmm/stock.h>
+#include <gtkmm/table.h>
 
 #include "gtkmm2ext/utils.h"
 #include "pbd/convert.h"
diff --git a/gtk2_ardour/plugin_selector.h b/gtk2_ardour/plugin_selector.h
index 548ed826ff..14aa47322d 100644
--- a/gtk2_ardour/plugin_selector.h
+++ b/gtk2_ardour/plugin_selector.h
@@ -23,6 +23,9 @@
 #include <gtkmm/dialog.h>
 #include <gtkmm/notebook.h>
 #include <gtkmm/treeview.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/liststore.h>
+
 #include "gtkmm2ext/dndtreeview.h"
 
 #include "ardour/plugin.h"
diff --git a/gtk2_ardour/plugin_setup_dialog.cc b/gtk2_ardour/plugin_setup_dialog.cc
index c3bbc0dbc0..db128b5c5f 100644
--- a/gtk2_ardour/plugin_setup_dialog.cc
+++ b/gtk2_ardour/plugin_setup_dialog.cc
@@ -19,6 +19,8 @@
 
 #include <gtkmm/frame.h>
 #include <gtkmm/label.h>
+#include <gtkmm/stock.h>
+#include <gtkmm/table.h>
 
 #include "plugin_setup_dialog.h"
 #include "pbd/i18n.h"
diff --git a/gtk2_ardour/port_insert_ui.h b/gtk2_ardour/port_insert_ui.h
index a04ef1fe40..3249cb0c3f 100644
--- a/gtk2_ardour/port_insert_ui.h
+++ b/gtk2_ardour/port_insert_ui.h
@@ -20,7 +20,7 @@
 #ifndef __gtkardour_port_insert_ui_h__
 #define __gtkardour_port_insert_ui_h__
 
-#include "gtkmm2ext/stateful_button.h"
+#include "widgets/stateful_button.h"
 #include "ardour_dialog.h"
 #include "io_selector.h"
 
@@ -40,7 +40,7 @@ private:
 	boost::shared_ptr<ARDOUR::PortInsert> _pi;
 
 	Gtk::Notebook notebook;
-	Gtkmm2ext::StatefulToggleButton latency_button;
+	ArdourWidgets::StatefulToggleButton latency_button;
 	IOSelector input_selector;
 	IOSelector output_selector;
 	Gtk::Label latency_display;
diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index a3d1833e34..ec29255d90 100644
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -37,11 +37,10 @@
 #include "gtkmm2ext/gtk_ui.h"
 #include "gtkmm2ext/menu_elems.h"
 #include "gtkmm2ext/utils.h"
-#include "gtkmm2ext/choice.h"
-#include "gtkmm2ext/utils.h"
 #include "gtkmm2ext/doi.h"
 #include "gtkmm2ext/rgb_macros.h"
 
+#include "widgets/choice.h"
 #include "widgets/tooltips.h"
 
 #include "ardour/amp.h"
@@ -3470,7 +3469,7 @@ ProcessorBox::clear_processors ()
 	choices.push_back (_("Cancel"));
 	choices.push_back (_("Yes, remove them all"));
 
-	Gtkmm2ext::Choice prompter (_("Remove processors"), prompt, choices);
+	ArdourWidgets::Choice prompter (_("Remove processors"), prompt, choices);
 
 	if (prompter.run () == 1) {
 		_route->clear_processors (PreFader);
@@ -3495,7 +3494,7 @@ ProcessorBox::clear_processors (Placement p)
 	choices.push_back (_("Cancel"));
 	choices.push_back (_("Yes, remove them all"));
 
-	Gtkmm2ext::Choice prompter (_("Remove processors"), prompt, choices);
+	ArdourWidgets::Choice prompter (_("Remove processors"), prompt, choices);
 
 	if (prompter.run () == 1) {
 		_route->clear_processors (p);
diff --git a/gtk2_ardour/prompter.cc b/gtk2_ardour/prompter.cc
index 16428eef19..6cf9018dbc 100644
--- a/gtk2_ardour/prompter.cc
+++ b/gtk2_ardour/prompter.cc
@@ -20,7 +20,7 @@
 #include "prompter.h"
 
 ArdourPrompter::ArdourPrompter (bool modal)
-	: Gtkmm2ext::Prompter (modal)
+	: ArdourWidgets::Prompter (modal)
 {
 }
 
diff --git a/gtk2_ardour/prompter.h b/gtk2_ardour/prompter.h
index cea78f6b22..b01f845baf 100644
--- a/gtk2_ardour/prompter.h
+++ b/gtk2_ardour/prompter.h
@@ -20,9 +20,9 @@
 #ifndef __ardour_gtk_prompter_h__
 #define __ardour_gtk_prompter_h__
 
-#include <gtkmm2ext/prompter.h>
+#include "widgets/prompter.h"
 
-class ArdourPrompter : public Gtkmm2ext::Prompter
+class ArdourPrompter : public ArdourWidgets::Prompter
 {
 public:
 	ArdourPrompter (bool modal = false);
diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index b83a806b00..183ae1cc8d 100644
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -46,9 +46,10 @@
 
 #include "gtkmm2ext/actions.h"
 #include "gtkmm2ext/bindings.h"
-#include "gtkmm2ext/tabbable.h"
 #include "gtkmm2ext/visibility_tracker.h"
 
+#include "widgets/tabbable.h"
+
 #include "axis_provider.h"
 #include "editing.h"
 #include "selection.h"
@@ -108,7 +109,7 @@ using ARDOUR::framecnt_t;
  * of PublicEditor need not be recompiled if private methods or member variables
  * change.
  */
-class PublicEditor : public Gtkmm2ext::Tabbable,  public ARDOUR::SessionHandlePtr, public AxisViewProvider
+class PublicEditor : public ArdourWidgets::Tabbable,  public ARDOUR::SessionHandlePtr, public AxisViewProvider
 {
 public:
 	PublicEditor (Gtk::Widget& content);
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index edc85643d2..b69cddf89e 100644
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -35,7 +35,6 @@
 
 #include "gtkmm2ext/utils.h"
 #include "gtkmm2ext/gtk_ui.h"
-#include "gtkmm2ext/paths_dialog.h"
 #include "gtkmm2ext/window_title.h"
 
 #include "pbd/fpu.h"
@@ -53,6 +52,8 @@
 #include "control_protocol/control_protocol.h"
 
 #include "canvas/wave_view.h"
+
+#include "widgets/paths_dialog.h"
 #include "widgets/tooltips.h"
 
 #include "ardour_dialog.h"
@@ -3995,7 +3996,7 @@ void RCOptionEditor::clear_au_blacklist () {
 
 void RCOptionEditor::edit_lxvst_path () {
 	Glib::RefPtr<Gdk::Window> win = get_parent_window ();
-	Gtkmm2ext::PathsDialog *pd = new Gtkmm2ext::PathsDialog (
+	PathsDialog *pd = new PathsDialog (
 		*current_toplevel(), _("Set Linux VST Search Path"),
 		_rc_config->get_plugin_path_lxvst(),
 		PluginManager::instance().get_default_lxvst_path()
@@ -4017,7 +4018,7 @@ void RCOptionEditor::edit_lxvst_path () {
 }
 
 void RCOptionEditor::edit_vst_path () {
-	Gtkmm2ext::PathsDialog *pd = new Gtkmm2ext::PathsDialog (
+	PathsDialog *pd = new PathsDialog (
 		*current_toplevel(), _("Set Windows VST Search Path"),
 		_rc_config->get_plugin_path_vst(),
 		PluginManager::instance().get_default_windows_vst_path()
diff --git a/gtk2_ardour/rc_option_editor.h b/gtk2_ardour/rc_option_editor.h
index d6c5bed4a7..3a3283e86c 100644
--- a/gtk2_ardour/rc_option_editor.h
+++ b/gtk2_ardour/rc_option_editor.h
@@ -20,7 +20,7 @@
 #ifndef __gtk_ardour_rc_option_editor_h__
 #define __gtk_ardour_rc_option_editor_h__
 
-#include "gtkmm2ext/tabbable.h"
+#include "widgets/tabbable.h"
 
 #include "option_editor.h"
 #include "visibility_group.h"
@@ -34,7 +34,7 @@
  */
 
 /** Editor for options which are obtained from and written back to one of the .rc files. */
-class RCOptionEditor : public OptionEditorContainer, public ARDOUR::SessionHandlePtr, public Gtkmm2ext::Tabbable
+class RCOptionEditor : public OptionEditorContainer, public ARDOUR::SessionHandlePtr, public ArdourWidgets::Tabbable
 {
 public:
 	RCOptionEditor ();
diff --git a/gtk2_ardour/route_params_ui.h b/gtk2_ardour/route_params_ui.h
index fea6d02050..76a56c7957 100644
--- a/gtk2_ardour/route_params_ui.h
+++ b/gtk2_ardour/route_params_ui.h
@@ -36,7 +36,7 @@
 
 #include "ardour/ardour.h"
 
-#include <gtkmm2ext/pane.h>
+#include <widgets/pane.h>
 
 #include "ardour_window.h"
 #include "processor_box.h"
@@ -71,22 +71,22 @@ private:
 	Gtk::ScrolledWindow      route_select_scroller;
 
 	Gtk::Notebook            notebook;
-	Gtk::Frame		 input_frame;
-	Gtk::Frame		 output_frame;
-	Gtkmm2ext::HPane	 redir_hpane;
+	Gtk::Frame               input_frame;
+	Gtk::Frame               output_frame;
+	ArdourWidgets::HPane     redir_hpane;
 
-	Gtk::Frame		 route_select_frame;
+	Gtk::Frame               route_select_frame;
 
 	Gtk::HBox                route_hpacker;
 	Gtk::VBox                route_vpacker;
 
 	ProcessorBox*            insert_box;
 
-	Gtkmm2ext::HPane	 list_hpane;
+	ArdourWidgets::HPane     list_hpane;
 
-	Gtkmm2ext::HPane	 right_hpane;
+	ArdourWidgets::HPane     right_hpane;
 
-	Gtk::Frame		 route_param_frame;
+	Gtk::Frame               route_param_frame;
 
 	Gtk::VBox                choice_vpacker;
 
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index e5c4d196f5..be5807dbf7 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -21,12 +21,12 @@
 #include <boost/algorithm/string.hpp>
 
 #include "gtkmm2ext/gtk_ui.h"
-#include "gtkmm2ext/choice.h"
 #include "gtkmm2ext/doi.h"
 #include "gtkmm2ext/gtk_ui.h"
 #include "gtkmm2ext/utils.h"
 
 #include "widgets/ardour_button.h"
+#include "widgets/binding_proxy.h"
 
 #include "pbd/memento_command.h"
 #include "pbd/stacktrace.h"
@@ -416,7 +416,7 @@ RouteUI::mute_press (GdkEventButton* ev)
 	}
 
 	//if this is a binding action, let the ArdourButton handle it
-	if ( BindingProxy::is_bind_action(ev) )
+	if (BindingProxy::is_bind_action(ev) )
 		return false;
 
 	multiple_mute_change = false;
@@ -591,7 +591,7 @@ RouteUI::solo_press(GdkEventButton* ev)
 	}
 
 	//if this is a binding action, let the ArdourButton handle it
-	if ( BindingProxy::is_bind_action(ev) )
+	if (BindingProxy::is_bind_action(ev) )
 		return false;
 
 	multiple_solo_change = false;
@@ -767,7 +767,7 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
 	}
 
 	//if this is a binding action, let the ArdourButton handle it
-	if ( BindingProxy::is_bind_action(ev) )
+	if (BindingProxy::is_bind_action(ev) )
 		return false;
 
 	if (!_session->engine().connected()) {
diff --git a/gtk2_ardour/session_dialog.cc b/gtk2_ardour/session_dialog.cc
index 7490b48b8f..bec810d53e 100644
--- a/gtk2_ardour/session_dialog.cc
+++ b/gtk2_ardour/session_dialog.cc
@@ -30,6 +30,7 @@
 #include <glibmm/datetime.h>
 
 #include <gtkmm/filechooser.h>
+#include <gtkmm/stock.h>
 
 #include "pbd/basename.h"
 #include "pbd/failed_constructor.h"
diff --git a/gtk2_ardour/shuttle_control.h b/gtk2_ardour/shuttle_control.h
index 1b6cce5870..bba5f17df1 100644
--- a/gtk2_ardour/shuttle_control.h
+++ b/gtk2_ardour/shuttle_control.h
@@ -21,15 +21,15 @@
 
 #include <gtkmm/drawingarea.h>
 
-#include "gtkmm2ext/binding_proxy.h"
-#include "gtkmm2ext/cairo_widget.h"
-
 #include "pbd/controllable.h"
 
 #include "ardour/session_handle.h"
 #include "ardour/types.h"
 
+#include "gtkmm2ext/cairo_widget.h"
+
 #include "widgets/ardour_button.h"
+#include "widgets/binding_proxy.h"
 
 namespace Gtk {
 	class Menu;
@@ -76,10 +76,10 @@ protected:
 	ARDOUR::microseconds_t last_shuttle_request;
 	PBD::ScopedConnection parameter_connection;
 	ArdourWidgets::ArdourButton _info_button;
-	Gtk::Menu*        shuttle_unit_menu;
-	Gtk::Menu*        shuttle_style_menu;
-	Gtk::Menu*        shuttle_context_menu;
-	BindingProxy      binding_proxy;
+	Gtk::Menu*                  shuttle_unit_menu;
+	Gtk::Menu*                  shuttle_style_menu;
+	Gtk::Menu*                  shuttle_context_menu;
+	ArdourWidgets::BindingProxy binding_proxy;
 	float bg_r, bg_g, bg_b;
 	void build_shuttle_context_menu ();
 	void shuttle_style_changed();
diff --git a/gtk2_ardour/stereo_panner.h b/gtk2_ardour/stereo_panner.h
index d897bd3644..f1e1025d76 100644
--- a/gtk2_ardour/stereo_panner.h
+++ b/gtk2_ardour/stereo_panner.h
@@ -21,7 +21,7 @@
 #define __gtk_ardour_stereo_panner_h__
 
 #include "pbd/signals.h"
-#include "gtkmm2ext/binding_proxy.h"
+#include "widgets/binding_proxy.h"
 #include "panner_interface.h"
 
 namespace ARDOUR {
@@ -79,8 +79,8 @@ private:
 	double accumulated_delta;
 	bool detented;
 
-	BindingProxy position_binder;
-	BindingProxy width_binder;
+	ArdourWidgets::BindingProxy position_binder;
+	ArdourWidgets::BindingProxy width_binder;
 
 	void set_tooltip ();
 
diff --git a/gtk2_ardour/strip_silence_dialog.cc b/gtk2_ardour/strip_silence_dialog.cc
index 5fa115d692..52f05a6b94 100644
--- a/gtk2_ardour/strip_silence_dialog.cc
+++ b/gtk2_ardour/strip_silence_dialog.cc
@@ -21,6 +21,7 @@
 
 #include <gtkmm/table.h>
 #include <gtkmm/label.h>
+#include <gtkmm/progressbar.h>
 #include <gtkmm/stock.h>
 
 #include "ardour/audioregion.h"
diff --git a/gtk2_ardour/toolbar_test.cc b/gtk2_ardour/toolbar_test.cc
index e1b9623bc3..ab248fde72 100644
--- a/gtk2_ardour/toolbar_test.cc
+++ b/gtk2_ardour/toolbar_test.cc
@@ -100,7 +100,7 @@ LogReceiver::receive (Transmitter::Channel chn, const char * str)
 /* ***************************************************************************/
 
 void
-setup_action_button (ArdourButton& button, std::string const & action, Gtkmm2ext::ArdourIcon::Icon icon, std::string const & button_theme_name)
+setup_action_button (ArdourButton& button, std::string const & action, ArdourWidgets::ArdourIcon::Icon icon, std::string const & button_theme_name)
 {
 	button.set_name (button_theme_name + string (" button"));
 	Glib::RefPtr<Gtk::Action> act;
@@ -110,7 +110,7 @@ setup_action_button (ArdourButton& button, std::string const & action, Gtkmm2ext
 }
 
 ArdourButton*
-make_action_button (std::string const & action, Gtkmm2ext::ArdourIcon::Icon icon, std::string const & button_theme_name)
+make_action_button (std::string const & action, ArdourWidgets::ArdourIcon::Icon icon, std::string const & button_theme_name)
 {
 	ArdourButton* button = new ArdourButton;
 	setup_action_button (*button, action, icon, button_theme_name);
@@ -227,7 +227,7 @@ CANVAS_UI::build_toolbar (ArdourCanvas::Item* parent, std::string const & spec_p
 			break;
 		}
 
-		Gtkmm2ext::ArdourIcon::Icon i = (ArdourIcon::Icon) string_2_enum (string ("ArdourIcon::") + icon, i);
+		ArdourWidgets::ArdourIcon::Icon i = (ArdourWidgets::ArdourIcon::Icon) string_2_enum (string ("ArdourIcon::") + icon, i);
 
 		ArdourCanvas::Widget* w = new ArdourCanvas::Widget (canvas, *make_action_button (action, i, theme_name));
 		grid->place (w, col, row);