Remove <gtkmm.h> include from header files.

84 files changed, 406 insertions, 144 deletions

diff --git a/gtk2_ardour/add_video_dialog.cc b/gtk2_ardour/add_video_dialog.cc
index 98825381e8..2e092bb4da 100644
--- a/gtk2_ardour/add_video_dialog.cc
+++ b/gtk2_ardour/add_video_dialog.cc
@@ -23,6 +23,11 @@
 #include <sigc++/bind.h>
 #include <curl/curl.h>
 
+#include <gtkmm/box.h>
+#include <gtkmm/filechooserdialog.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/stock.h>
+
 #include "pbd/error.h"
 #include "pbd/convert.h"
 #include "gtkmm2ext/utils.h"
diff --git a/gtk2_ardour/add_video_dialog.h b/gtk2_ardour/add_video_dialog.h
index 6e3ced2dbf..ef12ccddef 100644
--- a/gtk2_ardour/add_video_dialog.h
+++ b/gtk2_ardour/add_video_dialog.h
@@ -26,7 +26,18 @@
 #undef interface
 #endif
 
-#include <gtkmm.h>
+#include <gtkmm/box.h>
+#include <gtkmm/button.h>
+#include <gtkmm/cellrendererpixbuf.h>
+#include <gtkmm/checkbutton.h>
+#include <gtkmm/filechooserwidget.h>
+#include <gtkmm/image.h>
+#include <gtkmm/label.h>
+#include <gtkmm/liststore.h>
+#include <gtkmm/notebook.h>
+#include <gtkmm/scale.h>
+#include <gtkmm/treemodel.h>
+#include <gtkmm/treeview.h>
 
 #include "ardour/types.h"
 #include "ardour/template_utils.h"
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index b7f61a3fb7..b24fbafb05 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -47,9 +47,10 @@
 #include <glib.h>
 #include "pbd/gstdio_compat.h"
 
-#include <gtkmm/messagedialog.h>
 #include <gtkmm/accelmap.h>
+#include <gtkmm/messagedialog.h>
 #include <gtkmm/stock.h>
+#include <gtkmm/uimanager.h>
 
 #include "pbd/error.h"
 #include "pbd/basename.h"
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 895bbe2066..a7794faf78 100644
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -29,6 +29,8 @@
 #include <cmath>
 
 #include <sigc++/bind.h>
+#include <gtkmm/settings.h>
+
 #include "canvas/canvas.h"
 
 #include "pbd/error.h"
diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index 023f3ad133..4be65dc9f0 100644
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -25,6 +25,8 @@
 
 #include <vector>
 
+#include <gtkmm/treemodelfilter.h>
+
 #include "pbd/convert.h"
 
 #include "ardour/audioengine.h"
diff --git a/gtk2_ardour/automation_controller.h b/gtk2_ardour/automation_controller.h
index c2d225b2db..12b31f6d86 100644
--- a/gtk2_ardour/automation_controller.h
+++ b/gtk2_ardour/automation_controller.h
@@ -29,7 +29,8 @@
 #endif
 
 #include <boost/shared_ptr.hpp>
-#include <gtkmm.h>
+
+#include <gtkmm/alignment.h>
 
 #include "pbd/signals.h"
 #include "evoral/Parameter.hpp"
@@ -41,6 +42,11 @@ namespace ARDOUR {
 	class AutomationControl;
 }
 
+namespace Gtk {
+	class Adjustment;
+	class Widget;
+}
+
 class AutomationBarController : public ArdourWidgets::BarController {
 public:
 	AutomationBarController(boost::shared_ptr<ARDOUR::AutomationControl> ac,
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index 22f38c0545..9cc7e291a5 100644
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -18,9 +18,11 @@
 */
 
 #include <utility>
-#include <gtkmm2ext/utils.h>
+
 #include <boost/algorithm/string.hpp>
 
+#include <gtkmm/separator.h>
+
 #include "pbd/error.h"
 #include "pbd/memento_command.h"
 #include "pbd/stacktrace.h"
@@ -36,6 +38,8 @@
 #include "ardour/route.h"
 #include "ardour/session.h"
 
+#include "gtkmm2ext/utils.h"
+
 #include "canvas/debug.h"
 
 #include "widgets/tooltips.h"
diff --git a/gtk2_ardour/color_theme_manager.cc b/gtk2_ardour/color_theme_manager.cc
index 30eeed162f..634db8e1c4 100644
--- a/gtk2_ardour/color_theme_manager.cc
+++ b/gtk2_ardour/color_theme_manager.cc
@@ -20,6 +20,8 @@
 #include <cmath>
 #include <errno.h>
 
+#include <gtkmm/stock.h>
+
 #include "fix_carbon.h"
 
 #include "pbd/gstdio_compat.h"
diff --git a/gtk2_ardour/configinfo.cc b/gtk2_ardour/configinfo.cc
index f7a3211d3d..d6c020e14b 100644
--- a/gtk2_ardour/configinfo.cc
+++ b/gtk2_ardour/configinfo.cc
@@ -17,7 +17,8 @@
 
 */
 
-#include <gtkmm.h>
+#include <gtkmm/box.h>
+#include <gtkmm/stock.h>
 
 #include "ardour/ardour.h"
 
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 17521e436c..0441ee9e52 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -28,6 +28,8 @@
 #include <map>
 #include <set>
 
+#include <gtkmm/messagedialog.h>
+
 #include "pbd/error.h"
 #include "pbd/basename.h"
 #include "pbd/pthread_utils.h"
diff --git a/gtk2_ardour/editor_regions.h b/gtk2_ardour/editor_regions.h
index 9679085501..3284259ed7 100644
--- a/gtk2_ardour/editor_regions.h
+++ b/gtk2_ardour/editor_regions.h
@@ -19,9 +19,15 @@
 #ifndef __gtk_ardour_editor_regions_h__
 #define __gtk_ardour_editor_regions_h__
 
-#include "editor_component.h"
 #include <boost/unordered_map.hpp>
 
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/treemodel.h>
+#include <gtkmm/treerowreference.h>
+#include <gtkmm/treestore.h>
+
+#include "editor_component.h"
+
 class EditorRegions : public EditorComponent, public ARDOUR::SessionHandlePtr
 {
 public:
diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc
index 871a003563..13a74fb44a 100644
--- a/gtk2_ardour/editor_route_groups.cc
+++ b/gtk2_ardour/editor_route_groups.cc
@@ -26,6 +26,8 @@
 
 #include "fix_carbon.h"
 
+#include <gtkmm/stock.h>
+
 #include "gtkmm2ext/gtk_ui.h"
 #include "gtkmm2ext/cell_renderer_color_selector.h"
 
diff --git a/gtk2_ardour/editor_route_groups.h b/gtk2_ardour/editor_route_groups.h
index 0a1df68b02..45c201a26e 100644
--- a/gtk2_ardour/editor_route_groups.h
+++ b/gtk2_ardour/editor_route_groups.h
@@ -20,6 +20,11 @@
 #ifndef __gtk_ardour_editor_route_groups_h__
 #define __gtk_ardour_editor_route_groups_h__
 
+#include <gtkmm/liststore.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/treemodel.h>
+#include <gtkmm/treeview.h>
+
 #include "editor_component.h"
 
 class EditorRouteGroups : public EditorComponent, public ARDOUR::SessionHandlePtr
diff --git a/gtk2_ardour/editor_routes.h b/gtk2_ardour/editor_routes.h
index b1f925d009..c8c4726736 100644
--- a/gtk2_ardour/editor_routes.h
+++ b/gtk2_ardour/editor_routes.h
@@ -20,6 +20,11 @@
 #ifndef __ardour_gtk_editor_route_h__
 #define __ardour_gtk_editor_route_h__
 
+#include <gtkmm/liststore.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/treemodel.h>
+#include <gtkmm/treestore.h>
+
 #include "pbd/signals.h"
 #include "gtkmm2ext/widget_state.h"
 
diff --git a/gtk2_ardour/export_channel_selector.h b/gtk2_ardour/export_channel_selector.h
index d45b47ce72..1be8ec3547 100644
--- a/gtk2_ardour/export_channel_selector.h
+++ b/gtk2_ardour/export_channel_selector.h
@@ -29,10 +29,20 @@
 #undef interface
 #endif
 
-#include <gtkmm.h>
 #include <sigc++/signal.h>
 #include <boost/shared_ptr.hpp>
 
+#include <gtkmm/alignment.h>
+#include <gtkmm/box.h>
+#include <gtkmm/cellrenderercombo.h>
+#include <gtkmm/checkbutton.h>
+#include <gtkmm/label.h>
+#include <gtkmm/liststore.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/spinbutton.h>
+#include <gtkmm/treemodel.h>
+#include <gtkmm/treeview.h>
+
 namespace ARDOUR {
 	class Session;
 	class ExportChannelConfiguration;
diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc
index 6b9d74e7bf..9ba65a6646 100644
--- a/gtk2_ardour/export_dialog.cc
+++ b/gtk2_ardour/export_dialog.cc
@@ -22,6 +22,7 @@
 #include <sigc++/signal.h>
 
 #include <gtkmm/messagedialog.h>
+#include <gtkmm/stock.h>
 
 #include "ardour/audioregion.h"
 #include "ardour/export_channel_configuration.h"
diff --git a/gtk2_ardour/export_dialog.h b/gtk2_ardour/export_dialog.h
index d03fa610f5..09385a4b84 100644
--- a/gtk2_ardour/export_dialog.h
+++ b/gtk2_ardour/export_dialog.h
@@ -21,8 +21,14 @@
 #ifndef __export_dialog_h__
 #define __export_dialog_h__
 
-#include <boost/scoped_ptr.hpp>
 #include <string>
+#include <boost/scoped_ptr.hpp>
+
+#include <gtkmm/box.h>
+#include <gtkmm/button.h>
+#include <gtkmm/label.h>
+#include <gtkmm/notebook.h>
+#include <gtkmm/progressbar.h>
 
 #include "ardour/export_profile_manager.h"
 
@@ -34,8 +40,6 @@
 #include "ardour_dialog.h"
 #include "soundcloud_export_selector.h"
 
-#include <gtkmm.h>
-
 namespace ARDOUR {
 	class ExportStatus;
 	class ExportHandler;
diff --git a/gtk2_ardour/export_file_notebook.h b/gtk2_ardour/export_file_notebook.h
index 19271d7335..d2545cb0ae 100644
--- a/gtk2_ardour/export_file_notebook.h
+++ b/gtk2_ardour/export_file_notebook.h
@@ -22,7 +22,13 @@
 #define __export_file_notebook_h__
 
 #include <sigc++/signal.h>
-#include <gtkmm.h>
+
+#include <gtkmm/alignment.h>
+#include <gtkmm/box.h>
+#include <gtkmm/button.h>
+#include <gtkmm/checkbutton.h>
+#include <gtkmm/label.h>
+#include <gtkmm/notebook.h>
 
 #include "ardour/export_profile_manager.h"
 #include "ardour/session_handle.h"
diff --git a/gtk2_ardour/export_filename_selector.cc b/gtk2_ardour/export_filename_selector.cc
index 9c485ef057..576c539631 100644
--- a/gtk2_ardour/export_filename_selector.cc
+++ b/gtk2_ardour/export_filename_selector.cc
@@ -18,7 +18,9 @@
 
 */
 
+#include <gtkmm/filechooserdialog.h>
 #include <gtkmm/messagedialog.h>
+#include <gtkmm/stock.h>
 
 #include "pbd/openuri.h"
 #include "export_filename_selector.h"
diff --git a/gtk2_ardour/export_filename_selector.h b/gtk2_ardour/export_filename_selector.h
index 34ef8534ce..36a9b664c5 100644
--- a/gtk2_ardour/export_filename_selector.h
+++ b/gtk2_ardour/export_filename_selector.h
@@ -21,7 +21,17 @@
 #ifndef __export_filename_selector_h__
 #define __export_filename_selector_h__
 
-#include <gtkmm.h>
+#include <gtkmm/box.h>
+#include <gtkmm/button.h>
+#include <gtkmm/checkbutton.h>
+#include <gtkmm/combobox.h>
+#include <gtkmm/comboboxtext.h>
+#include <gtkmm/entry.h>
+#include <gtkmm/label.h>
+#include <gtkmm/liststore.h>
+#include <gtkmm/sizegroup.h>
+#include <gtkmm/spinbutton.h>
+#include <gtkmm/treemodel.h>
 
 #include "ardour/export_profile_manager.h"
 #include "ardour/export_filename.h"
diff --git a/gtk2_ardour/export_format_dialog.cc b/gtk2_ardour/export_format_dialog.cc
index 5707f3beb7..6062d51500 100644
--- a/gtk2_ardour/export_format_dialog.cc
+++ b/gtk2_ardour/export_format_dialog.cc
@@ -18,6 +18,8 @@
 
 */
 
+#include <gtkmm/stock.h>
+
 #include "ardour/session.h"
 #include "ardour/export_format_specification.h"
 
diff --git a/gtk2_ardour/export_format_dialog.h b/gtk2_ardour/export_format_dialog.h
index 35685382ee..7df227ccb9 100644
--- a/gtk2_ardour/export_format_dialog.h
+++ b/gtk2_ardour/export_format_dialog.h
@@ -36,7 +36,17 @@
 #undef interface
 #endif
 
-#include <gtkmm.h>
+#include <gtkmm/adjustment.h>
+#include <gtkmm/box.h>
+#include <gtkmm/checkbutton.h>
+#include <gtkmm/combobox.h>
+#include <gtkmm/entry.h>
+#include <gtkmm/label.h>
+#include <gtkmm/liststore.h>
+#include <gtkmm/radiobutton.h>
+#include <gtkmm/spinbutton.h>
+#include <gtkmm/table.h>
+#include <gtkmm/treeview.h>
 
 class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList
 {
diff --git a/gtk2_ardour/export_format_selector.cc b/gtk2_ardour/export_format_selector.cc
index c77a09cdec..dbc74908d1 100644
--- a/gtk2_ardour/export_format_selector.cc
+++ b/gtk2_ardour/export_format_selector.cc
@@ -17,14 +17,15 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-
-#include "export_format_selector.h"
-
-#include "export_format_dialog.h"
+#include <gtkmm/messagedialog.h>
+#include <gtkmm/stock.h>
 
 #include "ardour/export_format_specification.h"
 #include "ardour/export_profile_manager.h"
 
+#include "export_format_selector.h"
+#include "export_format_dialog.h"
+
 #include "pbd/i18n.h"
 
 ExportFormatSelector::ExportFormatSelector () :
diff --git a/gtk2_ardour/export_format_selector.h b/gtk2_ardour/export_format_selector.h
index e416918d20..2b7d371d04 100644
--- a/gtk2_ardour/export_format_selector.h
+++ b/gtk2_ardour/export_format_selector.h
@@ -22,10 +22,15 @@
 #define __export_format_selector_h__
 
 #include <string>
-#include <gtkmm.h>
 #include <sigc++/signal.h>
 #include <boost/shared_ptr.hpp>
 
+#include <gtkmm/box.h>
+#include <gtkmm/button.h>
+#include <gtkmm/combobox.h>
+#include <gtkmm/liststore.h>
+#include <gtkmm/treemodel.h>
+
 #include "ardour/export_profile_manager.h"
 #include "ardour/session_handle.h"
 
diff --git a/gtk2_ardour/export_preset_selector.cc b/gtk2_ardour/export_preset_selector.cc
index 018beae39a..7f5fac72d5 100644
--- a/gtk2_ardour/export_preset_selector.cc
+++ b/gtk2_ardour/export_preset_selector.cc
@@ -18,10 +18,13 @@
 
 */
 
-#include "export_preset_selector.h"
+#include <gtkmm/messagedialog.h>
+#include <gtkmm/stock.h>
 
 #include "ardour/export_preset.h"
 
+#include "export_preset_selector.h"
+
 #include "pbd/i18n.h"
 
 ExportPresetSelector::ExportPresetSelector () :
diff --git a/gtk2_ardour/export_preset_selector.h b/gtk2_ardour/export_preset_selector.h
index 6203b76dac..748d26a326 100644
--- a/gtk2_ardour/export_preset_selector.h
+++ b/gtk2_ardour/export_preset_selector.h
@@ -22,7 +22,13 @@
 #define __export_preset_selector_h__
 
 #include <sigc++/signal.h>
-#include <gtkmm.h>
+
+#include <gtkmm/box.h>
+#include <gtkmm/button.h>
+#include <gtkmm/comboboxentry.h>
+#include <gtkmm/label.h>
+#include <gtkmm/liststore.h>
+#include <gtkmm/treemodel.h>
 
 #include "ardour/export_profile_manager.h"
 
diff --git a/gtk2_ardour/export_timespan_selector.cc b/gtk2_ardour/export_timespan_selector.cc
index 0d815f42ee..0228bd9130 100644
--- a/gtk2_ardour/export_timespan_selector.cc
+++ b/gtk2_ardour/export_timespan_selector.cc
@@ -18,7 +18,11 @@
 
 */
 
-#include "export_timespan_selector.h"
+#include <sstream>
+#include <iomanip>
+
+#include "pbd/enumwriter.h"
+#include "pbd/string_convert.h"
 
 #include "ardour/location.h"
 #include "ardour/types.h"
@@ -26,11 +30,7 @@
 #include "ardour/export_handler.h"
 #include "ardour/export_timespan.h"
 
-#include "pbd/enumwriter.h"
-#include "pbd/string_convert.h"
-
-#include <sstream>
-#include <iomanip>
+#include "export_timespan_selector.h"
 
 #include "pbd/i18n.h"
 
diff --git a/gtk2_ardour/export_timespan_selector.h b/gtk2_ardour/export_timespan_selector.h
index af56cc1b81..1e1460db6c 100644
--- a/gtk2_ardour/export_timespan_selector.h
+++ b/gtk2_ardour/export_timespan_selector.h
@@ -29,9 +29,17 @@
 #undef interface
 #endif
 
-#include <gtkmm.h>
 #include <boost/shared_ptr.hpp>
 
+#include <gtkmm/box.h>
+#include <gtkmm/checkbutton.h>
+#include <gtkmm/combobox.h>
+#include <gtkmm/label.h>
+#include <gtkmm/liststore.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/treemodel.h>
+#include <gtkmm/treestore.h>
+#include <gtkmm/treeview.h>
 
 #include "ardour/types.h"
 #include "ardour/session_handle.h"
diff --git a/gtk2_ardour/export_video_dialog.cc b/gtk2_ardour/export_video_dialog.cc
index 3dd20bb6b2..1972561ed2 100644
--- a/gtk2_ardour/export_video_dialog.cc
+++ b/gtk2_ardour/export_video_dialog.cc
@@ -29,6 +29,10 @@
 
 #include <sigc++/bind.h>
 
+#include <gtkmm/filechooserdialog.h>
+#include <gtkmm/stock.h>
+#include <gtkmm/table.h>
+
 #include "pbd/gstdio_compat.h"
 
 #include "pbd/error.h"
diff --git a/gtk2_ardour/export_video_dialog.h b/gtk2_ardour/export_video_dialog.h
index 8e410cb6a0..6e9b00558e 100644
--- a/gtk2_ardour/export_video_dialog.h
+++ b/gtk2_ardour/export_video_dialog.h
@@ -22,7 +22,13 @@
 
 #include <string>
 
-#include <gtkmm.h>
+#include <gtkmm/box.h>
+#include <gtkmm/button.h>
+#include <gtkmm/comboboxtext.h>
+#include <gtkmm/checkbutton.h>
+#include <gtkmm/entry.h>
+#include <gtkmm/label.h>
+#include <gtkmm/progressbar.h>
 
 #include "ardour/types.h"
 #include "ardour/template_utils.h"
diff --git a/gtk2_ardour/export_video_infobox.cc b/gtk2_ardour/export_video_infobox.cc
index f886bee078..e3120c2d27 100644
--- a/gtk2_ardour/export_video_infobox.cc
+++ b/gtk2_ardour/export_video_infobox.cc
@@ -17,10 +17,17 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#include "ardour/session.h"
 #ifdef interface
 #undef interface
 #endif
+
+#include <gtkmm/box.h>
+#include <gtkmm/label.h>
+#include <gtkmm/separator.h>
+#include <gtkmm/stock.h>
+
+#include "ardour/session.h"
+
 #include "export_video_infobox.h"
 #include "pbd/i18n.h"
 
diff --git a/gtk2_ardour/export_video_infobox.h b/gtk2_ardour/export_video_infobox.h
index 18a32d8366..c22476028c 100644
--- a/gtk2_ardour/export_video_infobox.h
+++ b/gtk2_ardour/export_video_infobox.h
@@ -20,7 +20,7 @@
 #ifndef __gtk_ardour_export_video_infobox_h__
 #define __gtk_ardour_export_video_infobox_h__
 
-#include <gtkmm.h>
+#include <gtkmm/checkbutton.h>
 #include "ardour_dialog.h"
 
 /** @class ExportVideoInfobox
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 696e57f7bd..9a4ed70084 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -19,6 +19,12 @@
 
 #include <limits.h>
 
+#include <pangomm.h>
+
+#include <gtkmm/alignment.h>
+#include <gdkmm/color.h>
+#include <gtkmm/style.h>
+
 #include "ardour/amp.h"
 #include "ardour/logmeter.h"
 #include "ardour/route_group.h"
@@ -26,10 +32,6 @@
 #include "ardour/dB.h"
 #include "ardour/utils.h"
 
-#include <pangomm.h>
-
-#include "gtkmm/style.h"
-#include "gdkmm/color.h"
 #include "gtkmm2ext/utils.h"
 #include "gtkmm2ext/gtk_ui.h"
 
diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h
index 18c8647518..b7cf2829c4 100644
--- a/gtk2_ardour/gain_meter.h
+++ b/gtk2_ardour/gain_meter.h
@@ -23,14 +23,16 @@
 #include <vector>
 #include <map>
 
-#include <gtkmm/box.h>
 #include <gtkmm/adjustment.h>
-#include <gtkmm/frame.h>
-#include <gtkmm/eventbox.h>
+#include <gtkmm/alignment.h>
+#include <gtkmm/box.h>
 #include <gtkmm/button.h>
-#include <gtkmm/table.h>
 #include <gtkmm/drawingarea.h>
-#include <gdkmm/colormap.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/frame.h>
+#include <gtkmm/table.h>
+
+//#include <gdkmm/colormap.h>
 
 #include "pbd/signals.h"
 
diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc
index 5cb9901b74..0f665d7891 100644
--- a/gtk2_ardour/generic_pluginui.cc
+++ b/gtk2_ardour/generic_pluginui.cc
@@ -27,11 +27,18 @@
 #include <string>
 #include <vector>
 
+#include <gtkmm/separator.h>
+
 #include "pbd/stl_delete.h"
 #include "pbd/unwind.h"
 #include "pbd/xml++.h"
 #include "pbd/failed_constructor.h"
 
+#include "ardour/plugin.h"
+#include "ardour/plugin_insert.h"
+#include "ardour/session.h"
+#include "ardour/value_as_string.h"
+
 #include "gtkmm2ext/utils.h"
 #include "gtkmm2ext/doi.h"
 
@@ -41,11 +48,6 @@
 #include "widgets/slider_controller.h"
 #include "widgets/tooltips.h"
 
-#include "ardour/plugin.h"
-#include "ardour/plugin_insert.h"
-#include "ardour/session.h"
-#include "ardour/value_as_string.h"
-
 #include "prompter.h"
 #include "plugin_ui.h"
 #include "gui_thread.h"
diff --git a/gtk2_ardour/keyeditor.cc b/gtk2_ardour/keyeditor.cc
index ef7a7dc4ed..a985e4daba 100644
--- a/gtk2_ardour/keyeditor.cc
+++ b/gtk2_ardour/keyeditor.cc
@@ -30,10 +30,12 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
-#include <gtkmm/stock.h>
-#include <gtkmm/label.h>
 #include <gtkmm/accelkey.h>
 #include <gtkmm/accelmap.h>
+#include <gtkmm/label.h>
+#include <gtkmm/separator.h>
+#include <gtkmm/stock.h>
+#include <gtkmm/treemodelsort.h>
 #include <gtkmm/uimanager.h>
 
 #include "gtkmm2ext/bindings.h"
diff --git a/gtk2_ardour/keyeditor.h b/gtk2_ardour/keyeditor.h
index 9bf90547ac..9cbde979ec 100644
--- a/gtk2_ardour/keyeditor.h
+++ b/gtk2_ardour/keyeditor.h
@@ -25,8 +25,9 @@
 #include <gtkmm/buttonbox.h>
 #include <gtkmm/notebook.h>
 #include <gtkmm/scrolledwindow.h>
-#include <gtkmm/treeview.h>
+#include <gtkmm/treemodelfilter.h>
 #include <gtkmm/treestore.h>
+#include <gtkmm/treeview.h>
 
 #include "widgets/searchbar.h"
 
diff --git a/gtk2_ardour/latency_gui.cc b/gtk2_ardour/latency_gui.cc
index dbb3e08cd7..de7e7b0b57 100644
--- a/gtk2_ardour/latency_gui.cc
+++ b/gtk2_ardour/latency_gui.cc
@@ -18,12 +18,15 @@
 */
 
 #include <inttypes.h>
-
 #include <iomanip>
-#include "ardour/latent.h"
+
+#include <gtkmm/stock.h>
+
 #include "pbd/convert.h"
 #include "pbd/error.h"
-#include <gtkmm2ext/utils.h>
+#include "ardour/latent.h"
+
+#include "gtkmm2ext/utils.h"
 
 #include "latency_gui.h"
 
diff --git a/gtk2_ardour/latency_gui.h b/gtk2_ardour/latency_gui.h
index 2fe95be06b..d9b2a3bf4a 100644
--- a/gtk2_ardour/latency_gui.h
+++ b/gtk2_ardour/latency_gui.h
@@ -23,10 +23,10 @@
 #include <vector>
 #include <string>
 
-#include <gtkmm/dialog.h>
+#include <gtkmm/adjustment.h>
 #include <gtkmm/box.h>
 #include <gtkmm/button.h>
-#include <gtkmm/adjustment.h>
+#include <gtkmm/comboboxtext.h>
 
 #include "pbd/controllable.h"
 #include "ardour/types.h"
diff --git a/gtk2_ardour/lua_script_manager.cc b/gtk2_ardour/lua_script_manager.cc
index e7911e6575..8f3ec8ba17 100644
--- a/gtk2_ardour/lua_script_manager.cc
+++ b/gtk2_ardour/lua_script_manager.cc
@@ -16,6 +16,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#include <gtkmm/box.h>
+#include <gtkmm/frame.h>
+#include <gtkmm/messagedialog.h>
+
 #include "gtkmm2ext/gui_thread.h"
 #include "gtkmm2ext/utils.h"
 
diff --git a/gtk2_ardour/lua_script_manager.h b/gtk2_ardour/lua_script_manager.h
index 3cd876c803..e344e6a94e 100644
--- a/gtk2_ardour/lua_script_manager.h
+++ b/gtk2_ardour/lua_script_manager.h
@@ -19,7 +19,12 @@
 #ifndef _gtk2_ardour_lua_script_manager_h_
 #define _gtk2_ardour_lua_script_manager_h_
 
-#include <gtkmm.h>
+#include <gtkmm/button.h>
+#include <gtkmm/notebook.h>
+#include <gtkmm/liststore.h>
+#include <gtkmm/treemodel.h>
+#include <gtkmm/treeview.h>
+
 #include "ardour/luascripting.h"
 
 #include "ardour_window.h"
diff --git a/gtk2_ardour/meter_strip.h b/gtk2_ardour/meter_strip.h
index ab484f0658..a877ab998c 100644
--- a/gtk2_ardour/meter_strip.h
+++ b/gtk2_ardour/meter_strip.h
@@ -21,9 +21,14 @@
 #define __ardour_meter_strip__
 
 #include <vector>
-
 #include <cmath>
 
+#include <gtkmm/alignment.h>
+#include <gtkmm/box.h>
+#include <gtkmm/drawingarea.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/separator.h>
+
 #include "pbd/stateful.h"
 
 #include "ardour/types.h"
@@ -31,19 +36,14 @@
 
 #include "widgets/ardour_button.h"
 
-#include "route_ui.h"
-
 #include "level_meter.h"
+#include "route_ui.h"
 
 namespace ARDOUR {
 	class Route;
 	class RouteGroup;
 	class Session;
 }
-namespace Gtk {
-	class Window;
-	class Style;
-}
 
 class MeterStrip : public Gtk::VBox, public AxisView, public RouteUI
 {
diff --git a/gtk2_ardour/meterbridge.cc b/gtk2_ardour/meterbridge.cc
index 69006eda57..9f2ae3674e 100644
--- a/gtk2_ardour/meterbridge.cc
+++ b/gtk2_ardour/meterbridge.cc
@@ -26,6 +26,7 @@
 #include <sigc++/bind.h>
 
 #include <gtkmm/accelmap.h>
+#include <gtkmm/comboboxtext.h>
 
 #include <glibmm/threads.h>
 
diff --git a/gtk2_ardour/midi_export_dialog.h b/gtk2_ardour/midi_export_dialog.h
index 813c80ca4a..36e533d212 100644
--- a/gtk2_ardour/midi_export_dialog.h
+++ b/gtk2_ardour/midi_export_dialog.h
@@ -22,7 +22,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <gtkmm/filechooser.h>
+#include <gtkmm/filechooserwidget.h>
 
 #include "ardour_dialog.h"
 #include "public_editor.h"
diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc
index 485c649810..c572b2fac8 100644
--- a/gtk2_ardour/midi_time_axis.cc
+++ b/gtk2_ardour/midi_time_axis.cc
@@ -25,6 +25,9 @@
 
 #include <sigc++/bind.h>
 
+#include <gtkmm/separator.h>
+#include <gtkmm/stock.h>
+
 #include "pbd/error.h"
 #include "pbd/ffs.h"
 #include "pbd/stl_delete.h"
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 8f101ee09d..1b0c82975c 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -22,18 +22,13 @@
 
 #include <sigc++/bind.h>
 
+#include <gtkmm/messagedialog.h>
+
 #include "pbd/convert.h"
 #include "pbd/enumwriter.h"
 #include "pbd/replace_all.h"
 #include "pbd/stacktrace.h"
 
-#include "gtkmm2ext/gtk_ui.h"
-#include "gtkmm2ext/menu_elems.h"
-#include "gtkmm2ext/utils.h"
-#include "gtkmm2ext/doi.h"
-
-#include "widgets/tooltips.h"
-
 #include "ardour/amp.h"
 #include "ardour/audio_track.h"
 #include "ardour/audioengine.h"
@@ -56,6 +51,13 @@
 #include "ardour/vca.h"
 #include "ardour/vca_manager.h"
 
+#include "gtkmm2ext/gtk_ui.h"
+#include "gtkmm2ext/menu_elems.h"
+#include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/doi.h"
+
+#include "widgets/tooltips.h"
+
 #include "ardour_window.h"
 #include "enums_convert.h"
 #include "mixer_strip.h"
diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index 850eb688e7..531c0daf5c 100644
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -23,16 +23,16 @@
 
 #include <cmath>
 
-#include <gtkmm/eventbox.h>
+#include <gtkmm/adjustment.h>
 #include <gtkmm/button.h>
 #include <gtkmm/box.h>
+#include <gtkmm/eventbox.h>
 #include <gtkmm/frame.h>
-#include <gtkmm/button.h>
 #include <gtkmm/label.h>
-#include <gtkmm/togglebutton.h>
 #include <gtkmm/menu.h>
+#include <gtkmm/sizegroup.h>
 #include <gtkmm/textview.h>
-#include <gtkmm/adjustment.h>
+#include <gtkmm/togglebutton.h>
 
 #include "pbd/stateful.h"
 
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 88489f8cc3..14a33ff361 100644
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -27,7 +27,10 @@
 
 #include <boost/foreach.hpp>
 
+#include <glibmm/threads.h>
+
 #include <gtkmm/accelmap.h>
+#include <gtkmm/stock.h>
 
 #include "pbd/convert.h"
 #include "pbd/stacktrace.h"
diff --git a/gtk2_ardour/monitor_section.h b/gtk2_ardour/monitor_section.h
index 9e3cec59bc..f00c438667 100644
--- a/gtk2_ardour/monitor_section.h
+++ b/gtk2_ardour/monitor_section.h
@@ -18,8 +18,10 @@
 */
 
 #include <gtkmm/box.h>
-#include <gtkmm/table.h>
 #include <gtkmm/eventbox.h>
+#include <gtkmm/sizegroup.h>
+#include <gtkmm/table.h>
+#include <gtkmm/viewport.h>
 
 #include "gtkmm2ext/bindings.h"
 
diff --git a/gtk2_ardour/mono_panner_editor.cc b/gtk2_ardour/mono_panner_editor.cc
index 5561a308ce..2e66fea92f 100644
--- a/gtk2_ardour/mono_panner_editor.cc
+++ b/gtk2_ardour/mono_panner_editor.cc
@@ -17,7 +17,8 @@
 
 */
 
-#include <gtkmm.h>
+#include <gtkmm/table.h>
+
 #include "gtkmm2ext/utils.h"
 #include "gtkmm2ext/gtk_ui.h"
 #include "gtkmm2ext/gui_thread.h"
diff --git a/gtk2_ardour/mono_panner_editor.h b/gtk2_ardour/mono_panner_editor.h
index 5c8e5cfa18..7cac271ac1 100644
--- a/gtk2_ardour/mono_panner_editor.h
+++ b/gtk2_ardour/mono_panner_editor.h
@@ -20,7 +20,7 @@
 #ifndef __gtk_ardour_mono_panner_editor_h__
 #define __gtk_ardour_mono_panner_editor_h__
 
-#include <gtkmm.h>
+#include <gtkmm/spinbutton.h>
 #include "panner_editor.h"
 
 class MonoPanner;
diff --git a/gtk2_ardour/option_editor.h b/gtk2_ardour/option_editor.h
index 68b389601b..055ee9b8eb 100644
--- a/gtk2_ardour/option_editor.h
+++ b/gtk2_ardour/option_editor.h
@@ -19,11 +19,16 @@
 #ifndef __gtk_ardour_option_editor_h__
 #define __gtk_ardour_option_editor_h__
 
-#include <gtkmm/notebook.h>
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/comboboxtext.h>
+#include <gtkmm/filechooserbutton.h>
+#include <gtkmm/label.h>
+#include <gtkmm/notebook.h>
+#include <gtkmm/scale.h>
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/table.h>
+#include <gtkmm/treestore.h>
+#include <gtkmm/treeview.h>
 #include <gtkmm/window.h>
 
 #include "widgets/slider_controller.h"
diff --git a/gtk2_ardour/plugin_pin_dialog.cc b/gtk2_ardour/plugin_pin_dialog.cc
index 33a961fdf5..b1e8d850db 100644
--- a/gtk2_ardour/plugin_pin_dialog.cc
+++ b/gtk2_ardour/plugin_pin_dialog.cc
@@ -19,9 +19,11 @@
 
 #include <boost/algorithm/string.hpp>
 
-#include <gtkmm/table.h>
+#include <gtkmm/box.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/label.h>
+#include <gtkmm/separator.h>
+#include <gtkmm/table.h>
 
 #include "pbd/replace_all.h"
 
diff --git a/gtk2_ardour/plugin_pin_dialog.h b/gtk2_ardour/plugin_pin_dialog.h
index cf6da3965b..09e5da4829 100644
--- a/gtk2_ardour/plugin_pin_dialog.h
+++ b/gtk2_ardour/plugin_pin_dialog.h
@@ -27,7 +27,11 @@
 #include "ardour/plugin_insert.h"
 #include "ardour/route.h"
 
+#include <gtkmm/alignment.h>
 #include <gtkmm/box.h>
+#include <gtkmm/drawingarea.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/sizegroup.h>
 
 #include "gtkmm2ext/persistent_tooltip.h"
 
diff --git a/gtk2_ardour/plugin_selector.h b/gtk2_ardour/plugin_selector.h
index 14aa47322d..e4fb89d570 100644
--- a/gtk2_ardour/plugin_selector.h
+++ b/gtk2_ardour/plugin_selector.h
@@ -20,11 +20,14 @@
 #ifndef __ardour_plugin_selector_h__
 #define __ardour_plugin_selector_h__
 
-#include <gtkmm/dialog.h>
+#include <gtkmm/button.h>
+#include <gtkmm/comboboxtext.h>
+#include <gtkmm/entry.h>
+#include <gtkmm/liststore.h>
 #include <gtkmm/notebook.h>
-#include <gtkmm/treeview.h>
 #include <gtkmm/scrolledwindow.h>
-#include <gtkmm/liststore.h>
+#include <gtkmm/treemodel.h>
+#include <gtkmm/treeview.h>
 
 #include "gtkmm2ext/dndtreeview.h"
 
diff --git a/gtk2_ardour/plugin_ui.h b/gtk2_ardour/plugin_ui.h
index cbc0f72700..4075c94eb7 100644
--- a/gtk2_ardour/plugin_ui.h
+++ b/gtk2_ardour/plugin_ui.h
@@ -30,19 +30,20 @@
 
 #include <sigc++/signal.h>
 
-#include <gtkmm/button.h>
+#include <gtkmm/adjustment.h>
 #include <gtkmm/box.h>
-#include <gtkmm/table.h>
+#include <gtkmm/button.h>
 #include <gtkmm/eventbox.h>
-#include <gtkmm/viewport.h>
-#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/expander.h>
+#include <gtkmm/filechooserbutton.h>
+#include <gtkmm/image.h>
 #include <gtkmm/label.h>
 #include <gtkmm/menu.h>
-#include <gtkmm/image.h>
-#include <gtkmm/adjustment.h>
-#include <gtkmm/togglebutton.h>
-#include <gtkmm/socket.h>
+#include <gtkmm/scrolledwindow.h>
 #include <gtkmm/socket.h>
+#include <gtkmm/table.h>
+#include <gtkmm/togglebutton.h>
+#include <gtkmm/viewport.h>
 
 #include "ardour/types.h"
 #include "ardour/plugin.h"
diff --git a/gtk2_ardour/port_insert_ui.cc b/gtk2_ardour/port_insert_ui.cc
index 2cbd8b228f..d0497357cd 100644
--- a/gtk2_ardour/port_insert_ui.cc
+++ b/gtk2_ardour/port_insert_ui.cc
@@ -17,16 +17,18 @@
 
 */
 
-#include <gtkmm/messagedialog.h>
 #include <glibmm/objectbase.h>
 
-#include <gtkmm2ext/doi.h>
+#include <gtkmm/messagedialog.h>
+#include <gtkmm/stock.h>
 
 #include "ardour/audioengine.h"
 #include "ardour/mtdm.h"
 #include "ardour/port_insert.h"
 #include "ardour/session.h"
 
+#include "gtkmm2ext/doi.h"
+
 #include "port_insert_ui.h"
 #include "gui_thread.h"
 #include "pbd/i18n.h"
diff --git a/gtk2_ardour/region_editor.cc b/gtk2_ardour/region_editor.cc
index 156e89378b..bb0199678e 100644
--- a/gtk2_ardour/region_editor.cc
+++ b/gtk2_ardour/region_editor.cc
@@ -20,6 +20,7 @@
 #include <cmath>
 
 #include <gtkmm/listviewtext.h>
+#include <gtkmm/stock.h>
 
 #include "pbd/memento_command.h"
 #include "pbd/stateful_diff_command.h"
diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc
index b377c838db..2077412670 100644
--- a/gtk2_ardour/route_params_ui.cc
+++ b/gtk2_ardour/route_params_ui.cc
@@ -21,8 +21,7 @@
 #include <inttypes.h>
 
 #include <glibmm/threads.h>
-#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/window_title.h>
+#include <gtkmm/stock.h>
 
 #include "ardour/audioengine.h"
 #include "ardour/audio_track.h"
@@ -35,6 +34,9 @@
 #include "ardour/send.h"
 #include "ardour/internal_send.h"
 
+#include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/window_title.h"
+
 #include "ardour_ui.h"
 #include "gui_thread.h"
 #include "io_selector.h"
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index e4c48caf04..7cce7e6979 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -28,6 +28,10 @@
 
 #include <sigc++/bind.h>
 
+#include <gtkmm/menu.h>
+#include <gtkmm/menuitem.h>
+#include <gtkmm/stock.h>
+
 #include "pbd/error.h"
 #include "pbd/stl_delete.h"
 #include "pbd/whitespace.h"
@@ -35,13 +39,7 @@
 #include "pbd/enumwriter.h"
 #include "pbd/stateful_diff_command.h"
 
-#include "gtkmm/menu.h"
-#include "gtkmm/menuitem.h"
-#include "gtkmm2ext/gtk_ui.h"
-#include "gtkmm2ext/utils.h"
-
-#include "widgets/ardour_button.h"
-#include "widgets/tooltips.h"
+#include "evoral/Parameter.hpp"
 
 #include "ardour/amp.h"
 #include "ardour/meter.h"
@@ -53,11 +51,16 @@
 #include "ardour/route_group.h"
 #include "ardour/session.h"
 #include "ardour/session_playlists.h"
-
-#include "evoral/Parameter.hpp"
+#include "ardour/track.h"
 
 #include "canvas/debug.h"
 
+#include "gtkmm2ext/gtk_ui.h"
+#include "gtkmm2ext/utils.h"
+
+#include "widgets/ardour_button.h"
+#include "widgets/tooltips.h"
+
 #include "ardour_ui.h"
 #include "audio_streamview.h"
 #include "debug.h"
@@ -81,8 +84,6 @@
 #include "utils.h"
 #include "route_group_menu.h"
 
-#include "ardour/track.h"
-
 #include "pbd/i18n.h"
 
 using namespace ARDOUR;
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index be5807dbf7..39283e0136 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -20,13 +20,7 @@
 #include <map>
 #include <boost/algorithm/string.hpp>
 
-#include "gtkmm2ext/gtk_ui.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 <gtkmm/stock.h>
 
 #include "pbd/memento_command.h"
 #include "pbd/stacktrace.h"
@@ -53,6 +47,13 @@
 #include "ardour/session.h"
 #include "ardour/template_utils.h"
 
+#include "gtkmm2ext/gtk_ui.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 "ardour_dialog.h"
 #include "ardour_ui.h"
@@ -73,8 +74,8 @@
 #include "ui_config.h"
 #include "utils.h"
 
-
 #include "pbd/i18n.h"
+
 using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace ARDOUR;
diff --git a/gtk2_ardour/script_selector.cc b/gtk2_ardour/script_selector.cc
index 0861c27099..794d57797a 100644
--- a/gtk2_ardour/script_selector.cc
+++ b/gtk2_ardour/script_selector.cc
@@ -16,6 +16,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#include <gtkmm/frame.h>
+#include <gtkmm/stock.h>
+#include <gtkmm/table.h>
+
 #include "gtkmm2ext/utils.h"
 
 #include "script_selector.h"
diff --git a/gtk2_ardour/script_selector.h b/gtk2_ardour/script_selector.h
index e7285807f7..54c26ee227 100644
--- a/gtk2_ardour/script_selector.h
+++ b/gtk2_ardour/script_selector.h
@@ -16,7 +16,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <gtkmm.h>
+#include <gtkmm/button.h>
+#include <gtkmm/comboboxtext.h>
+#include <gtkmm/label.h>
+
 #include "ardour/luascripting.h"
 
 #include "ardour_dialog.h"
diff --git a/gtk2_ardour/search_path_option.cc b/gtk2_ardour/search_path_option.cc
index 6f51511e44..f28148ec78 100644
--- a/gtk2_ardour/search_path_option.cc
+++ b/gtk2_ardour/search_path_option.cc
@@ -16,6 +16,8 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include <gtkmm/stock.h>
+
 #include "pbd/strsplit.h"
 #include "pbd/compose.h"
 #include "pbd/shortpath.h"
diff --git a/gtk2_ardour/session_import_dialog.cc b/gtk2_ardour/session_import_dialog.cc
index ac5e54260d..d4dd945b46 100644
--- a/gtk2_ardour/session_import_dialog.cc
+++ b/gtk2_ardour/session_import_dialog.cc
@@ -18,7 +18,8 @@
 
 */
 
-#include "session_import_dialog.h"
+#include <gtkmm/messagedialog.h>
+#include <gtkmm/stock.h>
 
 #include "pbd/failed_constructor.h"
 
@@ -29,10 +30,12 @@
 #include "ardour/location_importer.h"
 #include "ardour/tempo_map_importer.h"
 
-#include <gtkmm2ext/utils.h>
+#include "gtkmm2ext/utils.h"
 
 #include "gui_thread.h"
 #include "prompter.h"
+#include "session_import_dialog.h"
+
 #include "pbd/i18n.h"
 
 using namespace std;
diff --git a/gtk2_ardour/session_import_dialog.h b/gtk2_ardour/session_import_dialog.h
index 29ae53524b..a6ed77516e 100644
--- a/gtk2_ardour/session_import_dialog.h
+++ b/gtk2_ardour/session_import_dialog.h
@@ -26,7 +26,16 @@
 #include <utility>
 
 #include <boost/shared_ptr.hpp>
-#include <gtkmm.h>
+
+#include <gtkmm/box.h>
+#include <gtkmm/button.h>
+#include <gtkmm/entry.h>
+#include <gtkmm/filechooserdialog.h>
+#include <gtkmm/frame.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/treemodel.h>
+#include <gtkmm/treestore.h>
+#include <gtkmm/treeview.h>
 
 #include "pbd/xml++.h"
 
diff --git a/gtk2_ardour/session_metadata_dialog.cc b/gtk2_ardour/session_metadata_dialog.cc
index a4cfee2b10..43bf320be8 100644
--- a/gtk2_ardour/session_metadata_dialog.cc
+++ b/gtk2_ardour/session_metadata_dialog.cc
@@ -17,11 +17,10 @@
     675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "session_metadata_dialog.h"
-
 #include <sstream>
-
-#include <gtkmm2ext/utils.h>
+#include <gtkmm/filechooserdialog.h>
+#include <gtkmm/messagedialog.h>
+#include <gtkmm/stock.h>
 
 #include "pbd/xml++.h"
 #include "pbd/error.h"
@@ -30,6 +29,10 @@
 #include "ardour/session.h"
 #include "ardour/session_utils.h"
 
+#include "gtkmm2ext/utils.h"
+
+#include "session_metadata_dialog.h"
+
 #include "pbd/i18n.h"
 
 using namespace std;
diff --git a/gtk2_ardour/session_metadata_dialog.h b/gtk2_ardour/session_metadata_dialog.h
index e1d02337b4..e7df63d6b9 100644
--- a/gtk2_ardour/session_metadata_dialog.h
+++ b/gtk2_ardour/session_metadata_dialog.h
@@ -26,7 +26,17 @@
 #undef interface
 #endif
 
-#include <gtkmm.h>
+#include <gtkmm/box.h>
+#include <gtkmm/button.h>
+#include <gtkmm/checkbutton.h>
+#include <gtkmm/entry.h>
+#include <gtkmm/label.h>
+#include <gtkmm/liststore.h>
+#include <gtkmm/notebook.h>
+#include <gtkmm/table.h>
+#include <gtkmm/treemodel.h>
+#include <gtkmm/treeview.h>
+
 #include <boost/shared_ptr.hpp>
 
 #include <string>
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index e9000fa096..5664665014 100644
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -31,6 +31,7 @@
 #include <limits.h>
 
 #include <gtkmm/box.h>
+#include <gtkmm/scrolledwindow.h>
 #include <gtkmm/stock.h>
 
 #include "pbd/gstdio_compat.h"
diff --git a/gtk2_ardour/simple_progress_dialog.h b/gtk2_ardour/simple_progress_dialog.h
index 1e76f6bf9a..494bf12296 100644
--- a/gtk2_ardour/simple_progress_dialog.h
+++ b/gtk2_ardour/simple_progress_dialog.h
@@ -1,9 +1,10 @@
 #ifndef _ardour_gtk_simpple_progress_dialog_h_
 #define _ardour_gtk_simpple_progress_dialog_h_
 
-#include <gtkmm/messagedialog.h>
 #include <gtkmm/button.h>
+#include <gtkmm/messagedialog.h>
 #include <gtkmm/progressbar.h>
+#include <gtkmm/stock.h>
 
 #include "ardour/types.h"
 
diff --git a/gtk2_ardour/soundcloud_export_selector.cc b/gtk2_ardour/soundcloud_export_selector.cc
index 964db3a6d0..1ab13a6b36 100644
--- a/gtk2_ardour/soundcloud_export_selector.cc
+++ b/gtk2_ardour/soundcloud_export_selector.cc
@@ -20,6 +20,8 @@
 
 
 *************************************************************************************/
+#include <gtkmm/frame.h>
+
 #include "ardour/debug.h"
 #include "ardour/soundcloud_upload.h"
 #include "soundcloud_export_selector.h"
diff --git a/gtk2_ardour/soundcloud_export_selector.h b/gtk2_ardour/soundcloud_export_selector.h
index 1c095c9b50..322bd94d1e 100644
--- a/gtk2_ardour/soundcloud_export_selector.h
+++ b/gtk2_ardour/soundcloud_export_selector.h
@@ -12,8 +12,13 @@
 #include <string>
 #include <sstream>
 #include <vector>
-#include <gtkmm.h>
+
+#include <gtkmm/box.h>
+#include <gtkmm/checkbutton.h>
+#include <gtkmm/entry.h>
+#include <gtkmm/label.h>
 #include <gtkmm/progressbar.h>
+#include <gtkmm/table.h>
 
 class SoundcloudExportSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr
 {
diff --git a/gtk2_ardour/stereo_panner_editor.h b/gtk2_ardour/stereo_panner_editor.h
index 32cabedffe..bcd6bf342d 100644
--- a/gtk2_ardour/stereo_panner_editor.h
+++ b/gtk2_ardour/stereo_panner_editor.h
@@ -20,7 +20,7 @@
 #ifndef __gtk_ardour_stereo_panner_editor_h__
 #define __gtk_ardour_stereo_panner_editor_h__
 
-#include <gtkmm.h>
+#include <gtkmm/spinbutton.h>
 #include "panner_editor.h"
 
 class StereoPanner;
diff --git a/gtk2_ardour/stripable_treemodel.h b/gtk2_ardour/stripable_treemodel.h
index 8f1d941158..586e339b09 100644
--- a/gtk2_ardour/stripable_treemodel.h
+++ b/gtk2_ardour/stripable_treemodel.h
@@ -24,7 +24,7 @@
 #include <boost/weak_ptr.hpp>
 #include <stdint.h>
 
-#include <gtkmm.h>
+#include <gtkmm/treemodel.h>
 
 namespace ARDOUR {
 	class Session;
diff --git a/gtk2_ardour/tape_region_view.cc b/gtk2_ardour/tape_region_view.cc
index 8bf4af7d2c..284ba62eab 100644
--- a/gtk2_ardour/tape_region_view.cc
+++ b/gtk2_ardour/tape_region_view.cc
@@ -20,8 +20,6 @@
 #include <cmath>
 #include <algorithm>
 
-#include <gtkmm.h>
-
 #include <gtkmm2ext/gtk_ui.h>
 
 #include "ardour/audioregion.h"
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index bd41c8467d..403c5d73ef 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -23,14 +23,14 @@
 #include <string>
 #include <list>
 
+#include <gtkmm/separator.h>
 
 #include "pbd/error.h"
 #include "pbd/convert.h"
 #include "pbd/stacktrace.h"
 #include "pbd/unwind.h"
 
-#include <gtkmm2ext/doi.h>
-#include <gtkmm2ext/utils.h>
+#include "ardour/profile.h"
 
 #include "canvas/canvas.h"
 #include "canvas/rectangle.h"
@@ -38,9 +38,10 @@
 #include "canvas/utils.h"
 #include "canvas/colors.h"
 
-#include "widgets/tooltips.h"
+#include "gtkmm2ext/doi.h"
+#include "gtkmm2ext/utils.h"
 
-#include "ardour/profile.h"
+#include "widgets/tooltips.h"
 
 #include "ardour_dialog.h"
 #include "floating_text_entry.h"
diff --git a/gtk2_ardour/time_fx_dialog.cc b/gtk2_ardour/time_fx_dialog.cc
index be2140d9d3..eb7750f4f8 100644
--- a/gtk2_ardour/time_fx_dialog.cc
+++ b/gtk2_ardour/time_fx_dialog.cc
@@ -21,16 +21,17 @@
 #include <iostream>
 #include <cstdlib>
 #include <cmath>
-
 #include <string>
 
+#include <gtkmm/stock.h>
+
 #include "pbd/error.h"
 #include "pbd/pthread_utils.h"
 #include "pbd/memento_command.h"
 #include "pbd/unwind.h"
 #include "pbd/stacktrace.h"
 
-#include <gtkmm2ext/utils.h>
+#include "gtkmm2ext/utils.h"
 
 #include "audio_clock.h"
 #include "editor.h"
diff --git a/gtk2_ardour/transcode_video_dialog.cc b/gtk2_ardour/transcode_video_dialog.cc
index 5bb4ce8b68..bf253925fe 100644
--- a/gtk2_ardour/transcode_video_dialog.cc
+++ b/gtk2_ardour/transcode_video_dialog.cc
@@ -29,6 +29,9 @@
 
 #include <sigc++/bind.h>
 
+#include <gtkmm/filechooserdialog.h>
+#include <gtkmm/stock.h>
+
 #include "pbd/gstdio_compat.h"
 
 #include "pbd/error.h"
diff --git a/gtk2_ardour/transcode_video_dialog.h b/gtk2_ardour/transcode_video_dialog.h
index c20ad40362..74e0035645 100644
--- a/gtk2_ardour/transcode_video_dialog.h
+++ b/gtk2_ardour/transcode_video_dialog.h
@@ -22,7 +22,15 @@
 
 #include <string>
 
-#include <gtkmm.h>
+#include <gtkmm/adjustment.h>
+#include <gtkmm/box.h>
+#include <gtkmm/button.h>
+#include <gtkmm/checkbutton.h>
+#include <gtkmm/comboboxtext.h>
+#include <gtkmm/label.h>
+#include <gtkmm/entry.h>
+#include <gtkmm/progressbar.h>
+#include <gtkmm/spinbutton.h>
 
 #include "ardour/types.h"
 #include "ardour/template_utils.h"
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index fce66bced1..d1331706aa 100644
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -28,26 +28,29 @@
 #include <cmath>
 #include <list>
 #include <sys/stat.h>
-#include <gtkmm/rc.h>
-#include <gtkmm/window.h>
+
+#include <boost/algorithm/string.hpp>
+
+#include <gtk/gtkpaned.h>
 #include <gtkmm/combo.h>
 #include <gtkmm/label.h>
 #include <gtkmm/paned.h>
-#include <gtk/gtkpaned.h>
-#include <boost/algorithm/string.hpp>
+#include <gtkmm/rc.h>
+#include <gtkmm/stock.h>
+#include <gtkmm/window.h>
 
 #include "pbd/basename.h"
 #include "pbd/file_utils.h"
 #include "pbd/stacktrace.h"
 
-#include <gtkmm2ext/utils.h>
-
 #include "ardour/filesystem_paths.h"
 #include "ardour/search_paths.h"
 
 #include "canvas/item.h"
 #include "canvas/utils.h"
 
+#include "gtkmm2ext/utils.h"
+
 #include "debug.h"
 #include "public_editor.h"
 #include "keyboard.h"
diff --git a/gtk2_ardour/utils_videotl.h b/gtk2_ardour/utils_videotl.h
index 7315a72540..c575bfcbad 100644
--- a/gtk2_ardour/utils_videotl.h
+++ b/gtk2_ardour/utils_videotl.h
@@ -25,7 +25,6 @@
 #define __gtk_ardour_video_utils_h__
 
 #include <string>
-#include <gtkmm.h>
 
 #include "ardour/rc_configuration.h"
 #include "ardour/types.h"
diff --git a/gtk2_ardour/vca_master_strip.h b/gtk2_ardour/vca_master_strip.h
index 12120b7ecc..d00232a798 100644
--- a/gtk2_ardour/vca_master_strip.h
+++ b/gtk2_ardour/vca_master_strip.h
@@ -21,9 +21,10 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "gtkmm/box.h"
-#include "gtkmm/menuitem.h"
-#include "gtkmm/colorselection.h"
+#include <gtkmm/box.h>
+#include <gtkmm/colorselection.h>
+#include <gtkmm/menuitem.h>
+#include <gtkmm/messagedialog.h>
 
 #include "widgets/ardour_button.h"
 
diff --git a/gtk2_ardour/video_server_dialog.cc b/gtk2_ardour/video_server_dialog.cc
index 5bd9f7e772..beefb53696 100644
--- a/gtk2_ardour/video_server_dialog.cc
+++ b/gtk2_ardour/video_server_dialog.cc
@@ -22,6 +22,11 @@
 
 #include <sigc++/bind.h>
 
+#include <gtkmm/box.h>
+#include <gtkmm/filechooserdialog.h>
+#include <gtkmm/stock.h>
+#include <gtkmm/table.h>
+
 #include "pbd/error.h"
 #include "pbd/file_utils.h"
 #include "ardour/session_directory.h"
diff --git a/gtk2_ardour/video_server_dialog.h b/gtk2_ardour/video_server_dialog.h
index d9a73ef340..b53a45c17d 100644
--- a/gtk2_ardour/video_server_dialog.h
+++ b/gtk2_ardour/video_server_dialog.h
@@ -22,7 +22,13 @@
 
 #include <string>
 
-#include <gtkmm.h>
+#include <gtkmm/adjustment.h>
+#include <gtkmm/button.h>
+#include <gtkmm/checkbutton.h>
+#include <gtkmm/comboboxtext.h>
+#include <gtkmm/entry.h>
+#include <gtkmm/label.h>
+#include <gtkmm/spinbutton.h>
 
 #include "ardour/types.h"
 #include "ardour/template_utils.h"