diff --git a/libs/surfaces/control_protocol/control_protocol/basic_ui.h b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
index d3785c0b2d..f321c4aaa7 100644
--- a/libs/surfaces/control_protocol/control_protocol/basic_ui.h
+++ b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
@@ -34,12 +34,12 @@
 #include <string>
 
 namespace ARDOUR {
-	class Session;
-}
+
+class Session;
 
 class LIBCONTROLCP_API BasicUI {
   public:
-	BasicUI (ARDOUR::Session&);
+	BasicUI (Session&);
 	virtual ~BasicUI ();
 
 	void add_marker (const std::string& = std::string());
@@ -66,13 +66,13 @@ class LIBCONTROLCP_API BasicUI {
 	double get_transport_speed () const;
 	double transport_rolling () const;
 
-	void jump_by_seconds (double sec, ARDOUR::LocateTransportDisposition ltd = ARDOUR::RollIfAppropriate);
-	void jump_by_bars (int bars, ARDOUR::LocateTransportDisposition ltd = ARDOUR::RollIfAppropriate);
-	void jump_by_beats (int beats, ARDOUR::LocateTransportDisposition ltd = ARDOUR::RollIfAppropriate);
+	void jump_by_seconds (double sec, LocateTransportDisposition ltd = RollIfAppropriate);
+	void jump_by_bars (int bars, LocateTransportDisposition ltd = RollIfAppropriate);
+	void jump_by_beats (int beats, LocateTransportDisposition ltd = RollIfAppropriate);
 
-	ARDOUR::samplepos_t transport_sample ();
-	void locate (ARDOUR::samplepos_t sample, ARDOUR::LocateTransportDisposition ltd);
-	void locate (ARDOUR::samplepos_t sample, bool);
+	samplepos_t transport_sample ();
+	void locate (samplepos_t sample, LocateTransportDisposition ltd);
+	void locate (samplepos_t sample, bool);
 	bool locating ();
 	bool locked ();
 
@@ -142,7 +142,7 @@ class LIBCONTROLCP_API BasicUI {
 
 	void goto_nth_marker (int n);
 
-	ARDOUR::samplecnt_t timecode_frames_per_hour ();
+	samplecnt_t timecode_frames_per_hour ();
 
 	void timecode_time (samplepos_t where, Timecode::Time&);
 	void timecode_to_sample (Timecode::Time& timecode, samplepos_t & sample, bool use_offset, bool use_subframes) const;
@@ -155,7 +155,9 @@ class LIBCONTROLCP_API BasicUI {
 	bool loop_button_onoff() const;
 
   protected:
-	ARDOUR::Session* _session;
+	Session* _session;
 };
 
+} // namespace ARDOUR
+
 #endif /* __ardour_basic_ui_h__ */
diff --git a/libs/surfaces/websockets/component.cc b/libs/surfaces/websockets/component.cc
index 97feee0a42..de87fcf943 100644
--- a/libs/surfaces/websockets/component.cc
+++ b/libs/surfaces/websockets/component.cc
@@ -21,7 +21,7 @@
 
 using namespace ArdourSurface;
 
-BasicUI&
+ARDOUR::BasicUI&
 SurfaceComponent::basic_ui () const
 {
 	return _surface;
diff --git a/libs/surfaces/websockets/component.h b/libs/surfaces/websockets/component.h
index 7b2443bd1c..0872e498f5 100644
--- a/libs/surfaces/websockets/component.h
+++ b/libs/surfaces/websockets/component.h
@@ -52,7 +52,7 @@ public:
 		return 0;
 	}
 
-	BasicUI&                     basic_ui () const;
+	ARDOUR::BasicUI&             basic_ui () const;
 	virtual PBD::EventLoop*      event_loop () const;
 	Glib::RefPtr<Glib::MainLoop> main_loop () const;
 	ARDOUR::Session&             session () const;