diff --git a/libs/ardour/ardour/vst_types.h b/libs/ardour/ardour/vst_types.h
index 22ad936431..3df795e108 100644
--- a/libs/ardour/ardour/vst_types.h
+++ b/libs/ardour/ardour/vst_types.h
@@ -27,6 +27,19 @@
 
 #ifdef MACVST_SUPPORT
 #include <Carbon/Carbon.h>
+
+/* fix up stupid apple macros */
+#undef check
+#undef require
+#undef verify
+
+#ifdef YES
+#undef YES
+#endif
+#ifdef NO
+#undef NO
+#endif
+
 #endif
 
 struct LIBARDOUR_API _VSTKey
diff --git a/libs/ardour/mac_vst_support.cc b/libs/ardour/mac_vst_support.cc
index 344e4adc3d..12567f06c2 100644
--- a/libs/ardour/mac_vst_support.cc
+++ b/libs/ardour/mac_vst_support.cc
@@ -39,8 +39,6 @@
 
 #include "pbd/i18n.h"
 
-#include <Carbon/Carbon.h>
-
 /*Simple error handler stuff for VSTFX*/
 
 void mac_vst_error (const char *fmt, ...)
@@ -96,7 +94,6 @@ mac_vst_load (const char *path)
 
 	fhandle = mac_vst_handle_new ();
 
-	fhandle->dll = NULL;
 	fhandle->bundleRef = 0;
 
 	CFURLRef url;
@@ -152,10 +149,9 @@ mac_vst_unload (VSTHandle* fhandle)
 
 	if (fhandle->bundleRef)
 	{
-		CFBundleRef* bundleRefPtr = (CFBundleRef*) fhandle->dll;
-		CFBundleCloseBundleResourceMap (*bundleRefPtr, (CFBundleRefNum)fhandle->res_file_id);
-		CFRelease (*bundleRefPtr);
-		fhandle->dll = 0;
+		CFBundleCloseBundleResourceMap (fhandle->bundleRef, fhandle->res_file_id);
+		CFRelease (fhandle->bundleRef);
+		fhandle->bundleRef = 0;
 	}
 
 	if (fhandle->name)