diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 8d1c679f0f..5facb42463 100644
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -359,6 +359,8 @@ def build(bld):
     obj.use          = ['libpbd','libmidipp','libevoral','libvamphost',
                         'libvampplugin','libtaglib','librubberband',
                         'libaudiographer']
+    if bld.is_defined ('HAVE_SOUNDGRID'):
+        obj.uselib      += [ 'SOUNDGRID' ]
     obj.vnum         = LIBARDOUR_LIB_VERSION
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
     obj.defines      = [
diff --git a/libs/soundgrid/driver.cc b/libs/soundgrid/driver.cc
index 87aafbbae8..1e3a8de5fc 100644
--- a/libs/soundgrid/driver.cc
+++ b/libs/soundgrid/driver.cc
@@ -1,3 +1,5 @@
+#include <WavesPublicAPI/WavesMixerAPI/1.0/WavesMixerAPI.h>
+
 void
 driver_main()
 {
diff --git a/libs/soundgrid/wscript b/libs/soundgrid/wscript
index 4d6295b694..72cb3060b0 100644
--- a/libs/soundgrid/wscript
+++ b/libs/soundgrid/wscript
@@ -52,13 +52,8 @@ def build(bld):
     driver.includes     = ['.']
     driver.name         = 'libsgardour'
     driver.target       = 'sgardour'
-    driver.uselib       = 'GLIBMM SIGCPP XML UUID SNDFILE GIOMM'
-    if sys.platform == 'darwin':
-        # if/when Waves releases the SG Mixer Core as a framework we'll use this
-        # driver.linkflags = [ '-framework', 'SGMixerCore' ]
-        # driver.defines   = [ '-framework', 'SGMixerCore' ]
-        # but until then, we'll use this
-        driver.linkflags = [ "-L. -lmixerapplicationcoresg" ]
+    driver.uselib       = [ 'SOUNDGRID', 'GLIBMM', 'SIGCPP', 'XML', 'UUID', 'SNDFILE', 'GIOMM' ]
+    driver.use          = [ 'libardour' ]
     driver.vnum         = LIBSGARDOUR_LIB_VERSION
     driver.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
     driver.defines     = ['PACKAGE="' + I18N_PACKAGE + '"']
diff --git a/wscript b/wscript
index 21375904e2..c4dd56fe7e 100644
--- a/wscript
+++ b/wscript
@@ -530,8 +530,13 @@ def configure(conf):
             conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'Carbon'])
 
     if Options.options.soundgrid:
-        conf.env.append_value ('CXXFLAGS', '-DUSE_SOUNDGRID')
-        conf.env.append_value ('CFLAGS', '-DUSE_SOUNDGRID')
+        conf.env.append_value ('CXXFLAGS_SOUNDGRID', [ '-D__MACOS__', '-DUSE_SOUNDGRID', '-I/Volumes/Work/paul/ardour/3.0-SG/soundgrid' ])
+        conf.env.append_value ('CFLAGS_SOUNDGRID', [ '-D__MACOS__', '-DUSE_SOUNDGRID', '-I/Volumes/Work/paul/ardour/3.0-SG/soundgrid' ])
+        sglib = ''.join ([ '-L', os.path.expanduser ('/Volumes/Work/paul/ardour/3.0-SG/soundgrid') ])
+        conf.env.append_value ('LINKFLAGS_SOUNDGRID', [ sglib, '-lmixerapplicationcore' ])
+        conf.check_cxx (header_name='WavesPublicAPI/WavesMixerAPI/1.0/WavesMixerAPI.h', 
+                        mandatory=True, use='SOUNDGRID')
+        conf.define('HAVE_SOUNDGRID', 1)
 
     if Options.options.boost_include != '':
         conf.env.append_value('CXXFLAGS', '-I' + Options.options.boost_include)