diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc
index 9490d1757d..c794e3d8f7 100644
--- a/gtk2_ardour/add_route_dialog.cc
+++ b/gtk2_ardour/add_route_dialog.cc
@@ -26,6 +26,8 @@
 #include <cmath>
 
 #include <sigc++/bind.h>
+
+#include <gtkmm/alignment.h>
 #include <gtkmm/stock.h>
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/separator.h>
diff --git a/gtk2_ardour/add_video_dialog.cc b/gtk2_ardour/add_video_dialog.cc
index 9a49174086..8f320ab625 100644
--- a/gtk2_ardour/add_video_dialog.cc
+++ b/gtk2_ardour/add_video_dialog.cc
@@ -22,6 +22,7 @@
 #include <sigc++/bind.h>
 #include <curl/curl.h>
 
+#include <gtkmm/alignment.h>
 #include <gtkmm/box.h>
 #include <gtkmm/filechooserdialog.h>
 #include <gtkmm/scrolledwindow.h>
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 4f6eb41c77..bcb94fbdcb 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -180,7 +180,6 @@
 #include "splash.h"
 #include "template_dialog.h"
 #include "time_axis_view_item.h"
-#include "time_info_box.h"
 #include "timers.h"
 #include "application_bar.h" //TODO: remove this and put in Rec/Edit/Mix/Cue
 #include "transport_masters_dialog.h"
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index f0fdf82410..3b2ee0b0cd 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -89,7 +89,6 @@
 #include "ardour_window.h"
 #include "editing.h"
 #include "enums.h"
-#include "mini_timeline.h"
 #include "shuttle_control.h"
 #include "startup_fsm.h"
 #include "transport_control.h"
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 2268ee6a2e..36bfc4a53b 100644
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -68,7 +68,6 @@
 #include "application_bar.h" //TODO: move to each window
 #include "trigger_page.h"
 #include "utils.h"
-#include "time_info_box.h"
 #include "midi_tracer.h"
 #include "global_port_matrix.h"
 #include "location_ui.h"
diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index e51669a8ca..e5bb98da0e 100644
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -54,7 +54,6 @@
 #include "keyeditor.h"
 #include "rc_option_editor.h"
 #include "route_params_ui.h"
-#include "time_info_box.h"
 #include "trigger_ui.h"
 #include "step_entry.h"
 #include "opts.h"
diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index eadddc4fd0..8d8a44752b 100644
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -70,7 +70,6 @@
 #include "meter_patterns.h"
 #include "monitor_section.h"
 #include "midi_tracer.h"
-#include "mini_timeline.h"
 #include "mixer_ui.h"
 #include "plugin_dspload_window.h"
 #include "plugin_manager_ui.h"
@@ -84,7 +83,6 @@
 #include "speaker_dialog.h"
 #include "splash.h"
 #include "sfdb_ui.h"
-#include "time_info_box.h"
 #include "timers.h"
 #include "application_bar.h"  //TODO: remove
 #include "transport_masters_dialog.h"
diff --git a/gtk2_ardour/ardour_ui_keys.cc b/gtk2_ardour/ardour_ui_keys.cc
index 76244db66c..582e7c5938 100644
--- a/gtk2_ardour/ardour_ui_keys.cc
+++ b/gtk2_ardour/ardour_ui_keys.cc
@@ -42,6 +42,8 @@
 #include "public_editor.h"
 #include "virtual_keyboard_window.h"
 
+#include "gtkmm2ext/utils.h"
+
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtkmm2ext;
diff --git a/gtk2_ardour/ardour_ui_session.cc b/gtk2_ardour/ardour_ui_session.cc
index 4a2643f734..4e568f1eea 100644
--- a/gtk2_ardour/ardour_ui_session.cc
+++ b/gtk2_ardour/ardour_ui_session.cc
@@ -47,6 +47,7 @@
 
 #include "gtkmm2ext/application.h"
 #include "gtkmm2ext/doi.h"
+#include "gtkmm2ext/utils.h"
 
 #include "widgets/prompter.h"
 
diff --git a/gtk2_ardour/dsp_stats_ui.cc b/gtk2_ardour/dsp_stats_ui.cc
index fe2429d61c..bc515adfa3 100644
--- a/gtk2_ardour/dsp_stats_ui.cc
+++ b/gtk2_ardour/dsp_stats_ui.cc
@@ -16,6 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <gtkmm/alignment.h>
 #include <gtkmm/frame.h>
 
 #include "gtkmm2ext/utils.h"
diff --git a/gtk2_ardour/recorder_ui.cc b/gtk2_ardour/recorder_ui.cc
index b5fa908f05..ea3da4736b 100644
--- a/gtk2_ardour/recorder_ui.cc
+++ b/gtk2_ardour/recorder_ui.cc
@@ -53,6 +53,7 @@
 #include "actions.h"
 #include "ardour_dialog.h"
 #include "ardour_ui.h"
+#include "audio_clock.h"
 #include "gui_thread.h"
 #include "instrument_selector.h"
 #include "public_editor.h"
@@ -1838,7 +1839,7 @@ RecorderUI::RecRuler::render (Cairo::RefPtr<Cairo::Context> const& cr, cairo_rec
 
 		char buf[32];
 		int lw, lh;
-		AudioClock::print_minsec (when, buf, sizeof (buf), _session->sample_rate (), 0);
+		AudioClock::AudioClock::print_minsec (when, buf, sizeof (buf), _session->sample_rate (), 0);
 		_layout->set_text (string(buf).substr(1));
 		_layout->get_pixel_size (lw, lh);
 
diff --git a/gtk2_ardour/trigger_ui.cc b/gtk2_ardour/trigger_ui.cc
index 4726b8a44b..8c5f042754 100644
--- a/gtk2_ardour/trigger_ui.cc
+++ b/gtk2_ardour/trigger_ui.cc
@@ -40,6 +40,7 @@
 #include "ardour/triggerbox.h"
 
 #include "gtkmm2ext/colors.h"
+#include <gtkmm2ext/utils.h>
 
 #include "slot_properties_box.h"