Remove <gtkmm.h> include from header files.

diff --git a/gtk2_ardour/add_video_dialog.cc b/gtk2_ardour/add_video_dialog.cc
index 98825381e832bfe388c607bbbaf81dbeae680307..2e092bb4da90161b720a89060e1ef49d81913214 100644 (file)
--- 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 6e3ced2dbfd1271529c1dfcf4ba8200425bca459..ef12ccddef2d4def8a7511b81850e6b786db5448 100644 (file)
--- 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 b7f61a3fb7089750c15d7147e200b372185e9cbe..b24fbafb05d530f9791bb26a0e76b0d87fac6efd 100644 (file)
--- 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 895bbe206648f7c68b9e8c4b64cf5e598dce0f03..a7794faf783972727e1b0499a586d726f7b413bd 100644 (file)
--- 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 023f3ad133d0abcae45d7fc10824ead2c6e34fb2..4be65dc9f0ce8f09c010fee97bfca52d40161840 100644 (file)
--- 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 c2d225b2db96ab971cb1eab79f78cf01ef851339..12b31f6d86a067cafa4b7f937b53189dd3685062 100644 (file)
--- 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 22f38c0545c76cce4c1031bed9cc8ce4d6f58f72..9cc7e291a541be8642b5c1a0feaafbadfe6c00c6 100644 (file)
--- 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 30eeed162f8a7de3fe6e48363ad2ac65518c1028..634db8e1c4b6b0997bb7560acbcbea243248595c 100644 (file)
--- 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 f7a3211d3d91c36a52e86e5c766057b8b796c7cd..d6c020e14be15afd491093b2c6986a914ec98fb2 100644 (file)
--- 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 17521e436cef865cd1c8aa47de40699563a1584b..0441ee9e524f5a17329385f89a3ac49c28441fc1 100644 (file)
--- 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 9679085501754b55c799b510d8bd7533bdbb9439..3284259ed70d1ccba56a3f1fcb70372ae36f1b4c 100644 (file)
--- 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 871a003563fd13cd5ec439e70116e4f48e2fb6d2..13a74fb44ae841847b6296b23d3ffacef4c38e69 100644 (file)
--- 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 0a1df68b02f7c856ac376970c24a1835b8f06db7..45c201a26e694a0e82ed9a4c9005ed03c2e9cd8c 100644 (file)
--- 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 b1f925d009e835ddbe53fde8b987ef3cf38760c2..c8c4726736cfb628f7cc9d87579c529084a891bb 100644 (file)
--- 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 d45b47ce724281e1472b24b46bbc5a642599aee0..1be8ec3547e3776c8277f7386b3da08c0be3ffba 100644 (file)
--- 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 6b9d74e7bffb968dedbe4fa5fc4084875d4faf88..9ba65a6646339637efd2a9745719674e58e48791 100644 (file)
--- 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 d03fa610f59b0317f49b69a258d43a9ce3b7cf92..09385a4b846525dea47e85b444a68b9734191671 100644 (file)
--- 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 19271d733591431e6a1185c61e51040057f9bb99..d2545cb0ae61ddde9fd7e4b5de8f36d4a3a3b222 100644 (file)
--- 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 9c485ef057bcf7878119e4a6717f0611a44d783a..576c5396315a8c6b5d55008addac0e52a0fd60f2 100644 (file)
--- 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 34ef8534ce1eb5f64e83fe82026869f8920a5063..36a9b664c5ea9498e7021538c43a6fa939192090 100644 (file)
--- 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 5707f3beb7ce55f607ff80b8f27dea56bfedfb37..6062d515003d90c76bca11f39e530c3b3b839625 100644 (file)
--- 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 35685382ee5b1173d84d61d6cd9e4a39b5702c8a..7df227ccb9c2cdabcfbf358e365b5f2c448d724e 100644 (file)
--- 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 c77a09cdec08e1248e24afe6fb7cf879fd0ba649..dbc74908d1e3469ae429a3065e28e0dbdf39486e 100644 (file)
--- 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 e416918d20d654add1727dafd063628fc445e246..2b7d371d0423de54324af3e566d78725af016438 100644 (file)
--- 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 018beae39ac04bfb2511d14adde015cab8d23ef8..7f5fac72d5cb347f0eb266914eceace2af235b90 100644 (file)
--- 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 6203b76dac1db64a61be6b1d0ab02391379dfcfc..748d26a326ba99445ef9a99715fcb967fb938d76 100644 (file)
--- 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 0d815f42ee864b954a2639bd44be2d0119a5735b..0228bd91309160f9d3d638946b38093d4b9760b9 100644 (file)
--- 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 af56cc1b818ebf9503f02f12845ad86a1ee0b2fb..1e1460db6cc3cdb62aa383351974daf3212c59a5 100644 (file)
--- 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 3dd20bb6b2ae19d89ae84a4b82cae657fec3cffb..1972561ed2ca63238ed38814cdc8082786e3af64 100644 (file)
--- 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 8e410cb6a02a61de801c251c7f778b4cbfe2a5cb..6e9b00558e6f2796b0b92dab9c7a3930d80c3998 100644 (file)
--- 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 f886bee078b29279ed68e8536f2284ed3020f795..e3120c2d27ff5e5e699c610cfceec7b4507cbe54 100644 (file)
--- 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 18a32d8366613970d85ebef5faef665ac4798333..c22476028c96c090330747ec3033c509bbade0fd 100644 (file)
--- 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 696e57f7bd3eee63830c5699d4e859a27e9aec78..9a4ed70084b72bd2cf1b03e92f2e1055cce5d50a 100644 (file)
--- 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 18c86475185b946ae1e62fbfb067a64ac700704d..b7cf2829c463249f1651854ca1d5bc974f715c75 100644 (file)
--- 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 5cb9901b74e90deae8b558fe1e33507ae3b866b9..0f665d78917f753ce0bcbd2bfb102ea980a5c43c 100644 (file)
--- 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 ef7a7dc4ed4d5d8c7c07433d7270b82b23169839..a985e4dabacf4665da110f04ac74f2bdd8c29d23 100644 (file)
--- 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 9bf90547ac1a236b8ff6a1df46865280b504ea46..9cbde979ecda6697d2f1c709c1badb3383956aeb 100644 (file)
--- 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 dbb3e08cd7c86e0ee89d8caa146a955b83568159..de7e7b0b57fab5592c95ecfa4a3eb8473dac4f7d 100644 (file)
--- 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 2fe95be06bd2b2fd95fed94118bc314f71a825dd..d9b2a3bf4a2ba0d8fcc41b88c370fce94d92cd8e 100644 (file)
--- 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 e7911e657588b3ea316579a5b3fb85d4b969a343..8f3ec8ba1722b138148cb3784f586a3e6db450ff 100644 (file)
--- 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 3cd876c80319a6e0f69fc84397e797e6fe2fef41..e344e6a94e20ff6659b3857ce03de4ae79f7f21e 100644 (file)
--- 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 ab484f0658ad926020db2c59c9eec76b8dd5ce6f..a877ab998c31a25619f1d8ef626d79d99ae7be6c 100644 (file)
--- 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 69006eda57ec66497d63a755569d196fc4328887..9f2ae3674ecd5562a995efe72718fb9f58c87d90 100644 (file)
--- 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 813c80ca4af38e453eed7316ab7cc62c8cee00e1..36e533d2122e8557bdb83e0ffc654566e18ec2cc 100644 (file)
--- 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 485c6498107dda4c32d8d457e271fa692ea683f9..c572b2fac8d8a6f4f21d02dd9171d38dad7cf085 100644 (file)
--- 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 8f101ee09d75a86b4565ee1a5aefecaca596b419..1b0c82975c88556ef4694c976844c28ac0b8a13a 100644 (file)
--- 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 850eb688e731b0a42b5eb8ebf79138e2fe6112e1..531c0daf5cd6894acd4cdc0e4d75c9336c2e706d 100644 (file)
--- 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 88489f8cc3e5cc1e27106a597635e724cfcacdc2..14a33ff361c5f304da5c90ab5d8c37943bed7858 100644 (file)
--- 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 9e3cec59bca5e4170fd78932e9816942f90ff961..f00c438667a70b39a8d573129032a77ff78a0e0a 100644 (file)
--- 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 5561a308ce1c271a8f909c89851c1606f7b838bf..2e66fea92f13b56883aa84ccb2d7c3e8d87e18ca 100644 (file)
--- 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 5c8e5cfa185f12768159642db8be00b6dc29078e..7cac271ac1af0c7e1381168ecf99f4719b7c7746 100644 (file)
--- 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 68b389601bd2993b40b8c016c1474911716dd7db..055ee9b8ebebf8e1f26ffaa2b5f3ecbe1fcf2d6a 100644 (file)
--- 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 33a961fdf5578a22d741faacce83f3c5cddba4c7..b1e8d850dbe45dbefe7e4528dc7ebec07ec75ada 100644 (file)
--- 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 cf6da3965be38b902d205ef5bae19015819fb688..09e5da4829b64445985440f527fd6b62bc390f60 100644 (file)
--- 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 14aa47322dfa847b36ea18ca784490f1d58fe8a8..e4fb89d5707ec576945972b2936a81de50ac0198 100644 (file)
--- 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 cbc0f7270014c9a896e05437cfcb8520383fe7fb..4075c94eb7cb66bab67629288c62a7e1ec674485 100644 (file)
--- 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 2cbd8b228f90c8ef4c6447e02942cc782ab9a14b..d0497357cd7e7e14c4bab4a9be784b6cb58928b1 100644 (file)
--- 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 156e89378b33b11b82af4ad000ce9ea762a464ae..bb0199678ee5be339300217553dbb86f4a983a64 100644 (file)
--- 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 b377c838db618880ff298fda5b8a8da6a5d33cac..20774126706f3d6bdca75088565a81568fc20ea5 100644 (file)
--- 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 e4c48caf04b83bf87cb5c4e4ab7193ad763b3b40..7cce7e69796d53a215904d2a7bd1688629a019b3 100644 (file)
--- 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 be5807dbf71e386a778787bf336cccda577c1bf0..39283e0136817625c68581e03b81062c1606c84d 100644 (file)
--- 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 0861c27099e2186eb173a471fdbf5c3e85e9c70f..794d57797ad225a7d38e9107c38de72943303324 100644 (file)
--- 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 e7285807f7e8cf0df707ebfa3885ff19f7a07b50..54c26ee2271fb5c2fe7cbf7dda644ffa90212e44 100644 (file)
--- 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 6f51511e449dbb4835c8bb869015da5c9c458576..f28148ec78f7338ca70b332f981213ec034baef7 100644 (file)
--- 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 ac5e54260d03f00a0b8ea54bdf2416dec57c62eb..d4dd945b460865e47fe388731f87335cd52362cb 100644 (file)
--- 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 29ae53524bab54456838fe8770c4b00bdb893808..a6ed77516ec1866bb0ff48d1628cefd77156c918 100644 (file)
--- 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 a4cfee2b1047ff33aa78eca0955fb3419553cdfa..43bf320be86c9353e9289313765f857f62265a9b 100644 (file)
--- 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 e1d02337b43e1c17262b1c440d5ee3f8a685716d..e7df63d6b9397c5d3de5ee9329e70f60ee980fe1 100644 (file)
--- 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 e9000fa096eb455a12b65873b138d4048b9b7bcd..5664665014152c08241b1ab717c1a3ad9ebd69a9 100644 (file)
--- 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 1e76f6bf9a1555272c975a1c30d05abfc363bf85..494bf12296123a943cbc32c2c936589d7c1e8634 100644 (file)
--- 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 964db3a6d02ab82b65a0bcd17e7fa19d303f8f75..1ab13a6b369aa4b0a11504a0aa578dc13f46fdee 100644 (file)
--- 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 1c095c9b5017e40db7422327ca9a8c0fbe37fb49..322bd94d1e47590a1b57e9a5b3588b6fbdb723b5 100644 (file)
--- 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 32cabedffe706faa197262c8e59f21166b731b68..bcd6bf342d1dd36bd922ca4816e3a219dd1933e8 100644 (file)
--- 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 8f1d941158a1a6a6b63e8817166e25197b3665f4..586e339b09eeee489810321ca6c8cc9ccbaf9972 100644 (file)
--- 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 8bf4af7d2c27955d0c3acbeb93b9707cd9cd7660..284ba62eabf1523acbfa53cae8394eeb329c95cf 100644 (file)
--- 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 bd41c8467d3f18d39f10fb701ca338dde8e72f5c..403c5d73efdd0ad63c71fe65667818027855cb80 100644 (file)
--- 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 be2140d9d3559e8ddfe492293752940578f418bd..eb7750f4f81b492385b6100b23d22babec2a40ed 100644 (file)
--- 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 5bb4ce8b680460e835a9e1157b961118bcc41281..bf253925fed272d21c75b70adf3aa7958455512c 100644 (file)
--- 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 c20ad40362cff5ae6fad2760112395c9d45281be..74e00356452279551875b06ce8f00c65b5ab413a 100644 (file)
--- 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 fce66bced1533f3a94927f8016c8c5f54d17d191..d1331706aa450587a822898c9431053245cd8855 100644 (file)
--- 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 7315a7254056787c496fc9e980555148f7239323..c575bfcbad27fa9229611a26c00153c3d9df8e22 100644 (file)
--- 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 12120b7ecc5e49b5bcfa0c81edcac8781a41f111..d00232a7983c429057b671b82ed8903ab6f0a825 100644 (file)
--- 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 5bd9f7e772ea5fde01e13d9c7b8dd456915e45e1..beefb53696b792dcf320253dd97cb8f7e32c97c5 100644 (file)
--- 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 d9a73ef340a427673257e010ef55bb092de4d22a..b53a45c17db77d37e4af9685f2255d65f30927ad 100644 (file)
--- 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"

diff --git a/libs/gtkmm2ext/gtkmm2ext/doi.h b/libs/gtkmm2ext/gtkmm2ext/doi.h
index d1d653c85e346e668755f8e471801e82c910ed5f..4a9e58f920bf6598ce2307963759322931b12460 100644 (file)
--- a/libs/gtkmm2ext/gtkmm2ext/doi.h
+++ b/libs/gtkmm2ext/gtkmm2ext/doi.h
@@ -24,7 +24,8 @@
 #undef interface
 #endif
 
-#include <gtkmm.h>
+#include <gdk/gdkevents.h>
+#include <glibmm/main.h>
 
 #include "gtkmm2ext/visibility.h"
 

diff --git a/libs/gtkmm2ext/gtkmm2ext/textviewer.h b/libs/gtkmm2ext/gtkmm2ext/textviewer.h
index 65c0bad65e90f794c971718a0f74281156a93685..a2d3a0ccf46c330cf1129ecbe78fc2cf92e4cf78 100644 (file)
--- a/libs/gtkmm2ext/gtkmm2ext/textviewer.h
+++ b/libs/gtkmm2ext/gtkmm2ext/textviewer.h
@@ -20,7 +20,12 @@
 #define __pbd_gtkmm_textviewer_h__
 
 #include <string>
-#include <gtkmm.h>
+
+#include <gtkmm/box.h>
+#include <gtkmm/button.h>
+#include <gtkmm/textview.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/window.h>
 
 #include "pbd/transmitter.h"
 

diff --git a/libs/widgets/paths_dialog.cc b/libs/widgets/paths_dialog.cc
index cf366a7c7cbe75ac6c5d370d72a9a555f43569df..6d2350fa67634129464808e857d527fdaec29156 100644 (file)
--- a/libs/widgets/paths_dialog.cc
+++ b/libs/widgets/paths_dialog.cc
@@ -18,6 +18,11 @@
 */
 #include <cstdio>
 
+#include <gtkmm/filechooserdialog.h>
+#include <gtkmm/liststore.h>
+#include <gtkmm/stock.h>
+#include <gtkmm/treestore.h>
+
 #include "pbd/i18n.h"
 #include "pbd/pathexpand.h"
 #include "widgets/paths_dialog.h"

diff --git a/libs/widgets/widgets/ardour_spinner.h b/libs/widgets/widgets/ardour_spinner.h
index b0928fa432b20afad748b7186ce25cd829f070dc..01f1b1dea91f7262e2ab08ae50a8797a6e7fca86 100644 (file)
--- a/libs/widgets/widgets/ardour_spinner.h
+++ b/libs/widgets/widgets/ardour_spinner.h
@@ -21,7 +21,10 @@
 #define _WIDGETS_ARDOUR_SPINNER_H_
 
 #include <boost/algorithm/string.hpp>
-#include <gtkmm.h>
+
+#include <gtkmm/adjustment.h>
+#include <gtkmm/alignment.h>
+#include <gtkmm/spinbutton.h>
 
 #include "pbd/controllable.h"
 

diff --git a/libs/widgets/widgets/auto_spin.h b/libs/widgets/widgets/auto_spin.h
index ecea31e7fe91dcd5a23eb7c85624e7cb1d80ba6c..099976f4db69ed5aa70ef6df251f9fe38628929d 100644 (file)
--- a/libs/widgets/widgets/auto_spin.h
+++ b/libs/widgets/widgets/auto_spin.h
@@ -24,7 +24,7 @@
 #undef interface
 #endif
 
-#include <gtkmm.h>
+#include <gtkmm/adjustment.h>
 
 #include "widgets/visibility.h"
 

diff --git a/libs/widgets/widgets/click_box.h b/libs/widgets/widgets/click_box.h
index c83db83858afb0bf1d315859ab3b7ae971c23e6a..ae4ee8961afe873c9874a8aa1e8f8a419a34ef59 100644 (file)
--- a/libs/widgets/widgets/click_box.h
+++ b/libs/widgets/widgets/click_box.h
@@ -25,7 +25,9 @@
 #endif
 
 #include <string>
-#include <gtkmm.h>
+
+#include <gtkmm/adjustment.h>
+#include <gtkmm/drawingarea.h>
 
 #include "widgets/auto_spin.h"
 #include "widgets/binding_proxy.h"

diff --git a/libs/widgets/widgets/paths_dialog.h b/libs/widgets/widgets/paths_dialog.h
index 8757c8b032478d874b524f28b7c66ef7b7b4d023..fa39c7326419221e74a29c3fc0cde19cc6c12b54 100644 (file)
--- a/libs/widgets/widgets/paths_dialog.h
+++ b/libs/widgets/widgets/paths_dialog.h
@@ -21,7 +21,10 @@
 
 #include <string>
 #include <vector>
-#include <gtkmm.h>
+
+#include <gtkmm/button.h>
+#include <gtkmm/dialog.h>
+#include <gtkmm/listviewtext.h>
 
 #include "widgets/visibility.h"
 

diff --git a/libs/widgets/widgets/popup.h b/libs/widgets/widgets/popup.h
index 769a1a56fdf93052742b7e7bc374ce1abbae8dd5..5cc57a1c00d1c039bf3d7f7c70df681d59c8f01d 100644 (file)
--- a/libs/widgets/widgets/popup.h
+++ b/libs/widgets/widgets/popup.h
@@ -25,7 +25,9 @@
 #endif
 
 #include <string>
-#include <gtkmm.h>
+
+#include <gtkmm/label.h>
+#include <gtkmm/window.h>
 
 #include <pbd/touchable.h>
 

diff --git a/libs/widgets/widgets/slider_controller.h b/libs/widgets/widgets/slider_controller.h
index f8414ce4b4c8fce5927ac256d81c8aacedbf04c3..0b773260dc4a6d45f352da6160dd6c48af29e7a8 100644 (file)
--- a/libs/widgets/widgets/slider_controller.h
+++ b/libs/widgets/widgets/slider_controller.h
@@ -23,9 +23,11 @@
 #undef interface
 #endif
 
-#include <gtkmm.h>
 #include <boost/shared_ptr.hpp>
 
+#include <gtkmm/adjustment.h>
+#include <gtkmm/spinbutton.h>
+
 #include "widgets/ardour_fader.h"
 #include "widgets/binding_proxy.h"
 #include "widgets/visibility.h"