diff --git a/gtk2_ardour/ardour_dialog.cc b/gtk2_ardour/ardour_dialog.cc
index cd95666b16..278433c7ef 100644
--- a/gtk2_ardour/ardour_dialog.cc
+++ b/gtk2_ardour/ardour_dialog.cc
@@ -56,14 +56,14 @@ bool
 ArdourDialog::on_enter_notify_event (GdkEventCrossing *ev)
 {
 	Keyboard::the_keyboard().enter_window (ev, this);
-	return false;
+	return Dialog::on_enter_notify_event (ev);
 }
 
 bool
 ArdourDialog::on_leave_notify_event (GdkEventCrossing *ev)
 {
 	Keyboard::the_keyboard().leave_window (ev, this);
-	return false;
+	return Dialog::on_leave_notify_event (ev);
 }
 
 void
@@ -94,9 +94,3 @@ ArdourDialog::init ()
 	set_border_width (10);
 	CloseAllDialogs.connect (sigc::bind (sigc::mem_fun (*this, &ArdourDialog::response), RESPONSE_CANCEL));
 }
-
-bool
-ArdourDialog::on_key_press_event (GdkEventKey* key)
-{
-	return Gtk::Dialog::on_key_press_event (key);
-}
diff --git a/gtk2_ardour/ardour_dialog.h b/gtk2_ardour/ardour_dialog.h
index bd74afc47d..4f53662c23 100644
--- a/gtk2_ardour/ardour_dialog.h
+++ b/gtk2_ardour/ardour_dialog.h
@@ -23,13 +23,8 @@
 #include <gtkmm/window.h>
 #include <gtkmm/dialog.h>
 
-#include "ardour/ardour.h"
 #include "ardour/session_handle.h"
 
-namespace ARDOUR {
-	class Session;
-}
-
 /*
  * This virtual parent class is so that each dialog box uses the
  * same mechanism to declare its closing. It shares a common
@@ -43,9 +38,6 @@ class ArdourDialog : public Gtk::Dialog, public ARDOUR::SessionHandlePtr
 	ArdourDialog (Gtk::Window& parent, std::string title, bool modal = false, bool use_separator = false);
 	~ArdourDialog();
 
-	static int close_all_current_dialogs (int response);
-
-	bool on_key_press_event (GdkEventKey *);
 	bool on_enter_notify_event (GdkEventCrossing*);
 	bool on_leave_notify_event (GdkEventCrossing*);
 	void on_unmap ();
diff --git a/gtk2_ardour/latency_gui.cc b/gtk2_ardour/latency_gui.cc
index 7558fbeb06..180af93776 100644
--- a/gtk2_ardour/latency_gui.cc
+++ b/gtk2_ardour/latency_gui.cc
@@ -22,6 +22,7 @@
 #include <iomanip>
 #include "ardour/latent.h"
 #include "pbd/convert.h"
+#include "pbd/error.h"
 #include <gtkmm2ext/utils.h>
 
 #include "latency_gui.h"