diff --git a/gtk2_ardour/fix_carbon.h b/gtk2_ardour/fix_carbon.h
index 62ff0f3e4e..bc483e33a8 100644
--- a/gtk2_ardour/fix_carbon.h
+++ b/gtk2_ardour/fix_carbon.h
@@ -25,7 +25,12 @@
 /* an awful hack to stop Carbon #defines from messing with other code
  */
 
-#include "/System/Library/Frameworks/CoreServices.framework/Headers/../Frameworks/CarbonCore.framework/Headers/MacTypes.h" 
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9
+    #include "MacTypes.h"
+#else
+    #include "/System/Library/Frameworks/CoreServices.framework/Headers/../Frameworks/CarbonCore.framework/Headers/MacTypes.h"
+#endif
+
 #undef Style
 #undef Fixed
 #undef Yes
diff --git a/libs/appleutility/CAConditionalMacros.h b/libs/appleutility/CAConditionalMacros.h
index 62f642709a..c5100ad354 100644
--- a/libs/appleutility/CAConditionalMacros.h
+++ b/libs/appleutility/CAConditionalMacros.h
@@ -65,7 +65,7 @@
 
 //	Include the regular ConditionalMacros.h too, since it has useful stuff that
 //	TargetConditionals.h lacks for some reason.
-#if	CoreAudio_Use_Framework_Includes
+#if	CoreAudio_Use_Framework_Includes && !(MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9)
 	#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/ConditionalMacros.h>
 #else
 	#include "ConditionalMacros.h"
diff --git a/libs/audiographer/wscript b/libs/audiographer/wscript
index 0e4cd5d7f4..d69d2dec5a 100644
--- a/libs/audiographer/wscript
+++ b/libs/audiographer/wscript
@@ -70,7 +70,7 @@ def build(bld):
         # macros for this shared library
         audiographer.defines      = [ 'LIBAUDIOGRAPHER_DLL_EXPORTS=1' ]
     else:
-        audiographer              = bld.stlib(features = 'c cxx cstlib cxxstlib', source=libardour_sources)
+        audiographer              = bld.stlib(features = 'c cxx cstlib cxxstlib', source=audiographer_sources)
         audiographer.cxxflags     = [ '-fPIC' ]
         audiographer.cflags       = [ '-fPIC' ]
         audiographer.defines      = []
diff --git a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRNativeAudio.h b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRNativeAudio.h
index 75c5e1430c..4df931bf0a 100644
--- a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRNativeAudio.h
+++ b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRNativeAudio.h
@@ -17,6 +17,10 @@
 #include "WCRefManager.h"
 #include "WCMRAudioDeviceManager.h"
 
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9
+#include <unistd.h>
+#endif
+
 class WCMRNativeAudioDevice; //forward
 
 
diff --git a/libs/canvas/wscript b/libs/canvas/wscript
index e5edb68767..be78cbbf32 100644
--- a/libs/canvas/wscript
+++ b/libs/canvas/wscript
@@ -87,7 +87,7 @@ def build(bld):
     obj.target       = 'canvas'
     obj.vnum         = CANVAS_LIB_VERSION
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
-    obj.defines      += [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
+    obj.defines      = [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
     
     if bld.env['BUILD_TESTS'] and bld.env['HAVE_CPPUNIT']:
 
diff --git a/wscript b/wscript
index a7c4e28ca7..f4bc879d75 100755
--- a/wscript
+++ b/wscript
@@ -152,12 +152,14 @@ def set_compiler_flags (conf,opt):
     # waf adds -O0 -g itself. thanks waf!
     is_clang = conf.env['CXX'][0].endswith('clang++')
     
+    if platform == "darwin":
+        cxx_flags.append('-stdlib=libc++')
+        linker_flags.append('-lc++')
+    
     if conf.options.cxx11:
         conf.check_cxx(cxxflags=["-std=c++11"])
         cxx_flags.append('-std=c++11')
         if platform == "darwin":
-            cxx_flags.append('-stdlib=libc++')
-            link_flags.append('-lc++')
             # Prevents visibility issues in standard headers
             conf.define("_DARWIN_C_SOURCE", 1)
 
@@ -274,7 +276,7 @@ def set_compiler_flags (conf,opt):
     if conf.env['FPU_OPTIMIZATION']:
         if sys.platform == 'darwin':
             compiler_flags.append("-DBUILD_VECLIB_OPTIMIZATIONS");
-            linker_flags.append("-framework Accelerate")
+            #linker_flags.append("-framework Accelerate")
         elif conf.env['build_target'] == 'i686' or conf.env['build_target'] == 'x86_64':
             compiler_flags.append ("-DBUILD_SSE_OPTIMIZATIONS")
         if not build_host_supports_sse: