diff --git a/src/output/osx_output_plugin.c b/src/output/osx_output_plugin.c
index fbba817..d712630 100644
--- a/src/output/osx_output_plugin.c
+++ b/src/output/osx_output_plugin.c
@@ -240,21 +240,21 @@ osx_output_enable(struct audio_output *ao, GError **error_r)
 {
 	struct osx_output *oo = (struct osx_output *)ao;
 
-	ComponentDescription desc;
+	AudioComponentDescription desc;
 	desc.componentType = kAudioUnitType_Output;
 	desc.componentSubType = oo->component_subtype;
 	desc.componentManufacturer = kAudioUnitManufacturer_Apple;
 	desc.componentFlags = 0;
 	desc.componentFlagsMask = 0;
 
-	Component comp = FindNextComponent(NULL, &desc);
+	AudioComponent comp = AudioComponentFindNext(NULL, &desc);
 	if (comp == 0) {
 		g_set_error(error_r, osx_output_quark(), 0,
 			    "Error finding OS X component");
 		return false;
 	}
 
-	OSStatus status = OpenAComponent(comp, &oo->au);
+	OSStatus status = AudioComponentInstanceNew(comp, &oo->au);
 	if (status != noErr) {
 		g_set_error(error_r, osx_output_quark(), status,
 			    "Unable to open OS X component: %s",
@@ -263,7 +263,7 @@ osx_output_enable(struct audio_output *ao, GError **error_r)
 	}
 
 	if (!osx_output_set_device(oo, error_r)) {
-		CloseComponent(oo->au);
+		AudioComponentInstanceDispose(oo->au);
 		return false;
 	}
 
@@ -277,7 +277,7 @@ osx_output_enable(struct audio_output *ao, GError **error_r)
 				     kAudioUnitScope_Input, 0,
 				     &callback, sizeof(callback));
 	if (result != noErr) {
-		CloseComponent(oo->au);
+		AudioComponentInstanceDispose(oo->au);
 		g_set_error(error_r, osx_output_quark(), result,
 			    "unable to set callback for OS X audio unit");
 		return false;
@@ -291,7 +291,7 @@ osx_output_disable(struct audio_output *ao)
 {
 	struct osx_output *oo = (struct osx_output *)ao;
 
-	CloseComponent(oo->au);
+	AudioComponentInstanceDispose(oo->au);
 }
 
 static void