diff --git a/libs/surfaces/control_protocol/control_protocol/basic_ui.h b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
index 96a1227463..9bbfe65979 100644
--- a/libs/surfaces/control_protocol/control_protocol/basic_ui.h
+++ b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
@@ -32,12 +32,21 @@
 
 #include "timecode/time.h"
 
+#include "ardour/visibility.h"
+
 namespace ARDOUR {
 	class Session;
 	class SessionEvent;
 }
 
-class BasicUI {
+#ifdef ARDOURCP_DLL_EXPORTS // defined if we are building the ARDOUR Control Protocol DLL (instead of using it)
+    #define ARDOURCP_API LIBARDOUR_HELPER_DLL_EXPORT
+#else
+    #define ARDOURCP_API LIBARDOUR_HELPER_DLL_IMPORT
+#endif 
+#define ARDOURCP_LOCAL LIBARDOUR_HELPER_DLL_LOCAL
+
+class ARDOURCP_API BasicUI {
   public:
 	BasicUI (ARDOUR::Session&);
 	virtual ~BasicUI ();
diff --git a/libs/surfaces/control_protocol/control_protocol/control_protocol.h b/libs/surfaces/control_protocol/control_protocol/control_protocol.h
index b20771b726..37322530e4 100644
--- a/libs/surfaces/control_protocol/control_protocol/control_protocol.h
+++ b/libs/surfaces/control_protocol/control_protocol/control_protocol.h
@@ -33,8 +33,6 @@
 #include "control_protocol/basic_ui.h"
 #include "control_protocol/types.h"
 
-#include "ardour/visibility.h"
-
 #ifdef ARDOURSURFACE_DLL_EXPORTS // defined if we are building the ARDOUR surface DLLs (instead of using them)
     #define ARDOURSURFACE_API LIBARDOUR_HELPER_DLL_EXPORT
 #else
@@ -48,7 +46,7 @@ class Route;
 class Session;
 class Bundle;
 
-class ARDOURSURFACE_API ControlProtocol : public PBD::Stateful, public PBD::ScopedConnectionList, public BasicUI
+class ARDOURCP_API ControlProtocol : public PBD::Stateful, public PBD::ScopedConnectionList, public BasicUI
 {
   public:
 	ControlProtocol (Session&, std::string name);