3 files changed, 9 insertions, 12 deletions
diff --git a/libs/surfaces/osc/interface.cc b/libs/surfaces/osc/interface.cc
index a414d4eb82..7c09828f46 100644
--- a/libs/surfaces/osc/interface.cc
+++ b/libs/surfaces/osc/interface.cc
@@ -23,7 +23,7 @@
 
 using namespace ARDOUR;
 
-ControlProtocol*
+static ControlProtocol*
 new_osc_protocol (ControlProtocolDescriptor* /*descriptor*/, Session* s)
 {
 	OSC* osc = new OSC (*s, Config->get_osc_port());
@@ -33,13 +33,13 @@ new_osc_protocol (ControlProtocolDescriptor* /*descriptor*/, Session* s)
 	return osc;
 }
 
-void
+static void
 delete_osc_protocol (ControlProtocolDescriptor* /*descriptor*/, ControlProtocol* cp)
 {
 	delete cp;
 }
 
-bool
+static bool
 probe_osc_protocol (ControlProtocolDescriptor* /*descriptor*/)
 {
 	return true; // we can always do OSC
@@ -57,10 +57,5 @@ static ControlProtocolDescriptor osc_descriptor = {
 	destroy : delete_osc_protocol
 };
 
-extern "C" {
-ControlProtocolDescriptor* 
-protocol_descriptor () {
-	return &osc_descriptor;
-}
-}
+extern "C" LIBCONTROLCP_API ControlProtocolDescriptor* protocol_descriptor () { return &osc_descriptor; }
 
diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index 37fe0715eb..e252d22e3d 100644
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -28,6 +28,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
+#include <glib/gstdio.h>
 #include <glibmm/miscutils.h>
 
 #include <pbd/convert.h>
@@ -190,7 +191,7 @@ OSC::start ()
 	int fd = mkstemp(tmpstr);
 	
 	if (fd >= 0 ) {
-		unlink (tmpstr);
+		::g_unlink (tmpstr);
 		close (fd);
 		
 		_osc_unix_server = lo_server_new (tmpstr, error_callback);
@@ -293,11 +294,11 @@ OSC::stop ()
 	}
 	
 	if (!_osc_unix_socket_path.empty()) {
-		unlink (_osc_unix_socket_path.c_str());
+		::g_unlink (_osc_unix_socket_path.c_str());
 	}
 	
 	if (!_osc_url_file.empty() ) {
-		unlink (_osc_url_file.c_str() );
+		::g_unlink (_osc_url_file.c_str() );
 	}
 
 	// Delete any active route observers
diff --git a/libs/surfaces/osc/wscript b/libs/surfaces/osc/wscript
index cd77f99871..a00663e977 100644
--- a/libs/surfaces/osc/wscript
+++ b/libs/surfaces/osc/wscript
@@ -30,6 +30,7 @@ def build(bld):
     obj.defines     = [ 'PACKAGE="ardour_osc"' ]
     obj.includes     = ['.', './osc']
     obj.name         = 'libardour_osc'
+    obj.defines      = [ 'ARDOURSURFACE_DLL_EXPORTS' ]
     obj.target       = 'ardour_osc'
     obj.uselib       = ' LO '
     obj.use          = 'libardour libardour_cp libpbd'