diff --git a/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudio.c b/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudio.c
index 99dfdbf8dd..dc3758e455 100644
--- a/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudio.c
+++ b/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudio.c
@@ -37,21 +37,15 @@
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  if (!gst_element_register (plugin, "osxaudiosink", GST_RANK_PRIMARY,
-          GST_TYPE_OSX_AUDIO_SINK)) {
-    return FALSE;
-  }
-  if (!gst_element_register (plugin, "osxaudiosrc", GST_RANK_PRIMARY,
-          GST_TYPE_OSX_AUDIO_SRC)) {
-    return FALSE;
-  }
+  gboolean ret = FALSE;
+
+  ret |= GST_ELEMENT_REGISTER (osxaudiosrc, plugin);
+  ret |= GST_ELEMENT_REGISTER (osxaudiosink, plugin);
 #ifndef HAVE_IOS
-  if (!gst_device_provider_register (plugin, "osxaudiodeviceprovider",
-          GST_RANK_PRIMARY, GST_TYPE_OSX_AUDIO_DEVICE_PROVIDER))
-    return FALSE;
+  ret |= GST_DEVICE_PROVIDER_REGISTER (osxaudiodeviceprovider, plugin);
 #endif
 
-  return TRUE;
+  return ret;
 }
 
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
diff --git a/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudiodeviceprovider.c b/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudiodeviceprovider.c
index 4870fb1a07..dc0f34ec5b 100644
--- a/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudiodeviceprovider.c
+++ b/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudiodeviceprovider.c
@@ -51,6 +51,9 @@ static GstOsxAudioDevice *gst_osx_audio_device_new (AudioDeviceID device_id,
 
 G_DEFINE_TYPE (GstOsxAudioDeviceProvider, gst_osx_audio_device_provider,
     GST_TYPE_DEVICE_PROVIDER);
+GST_DEVICE_PROVIDER_REGISTER_DEFINE (osxaudiodeviceprovider,
+    "osxaudiodeviceprovider", GST_RANK_PRIMARY,
+    GST_TYPE_OSX_AUDIO_DEVICE_PROVIDER);
 
 static GList *gst_osx_audio_device_provider_probe (GstDeviceProvider *
     provider);
diff --git a/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudiodeviceprovider.h b/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudiodeviceprovider.h
index bd54178ee8..1f6c2bd311 100644
--- a/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudiodeviceprovider.h
+++ b/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudiodeviceprovider.h
@@ -87,5 +87,7 @@ struct _GstOsxAudioDeviceClass
 
 GType gst_osx_audio_device_get_type (void);
 
+GST_DEVICE_PROVIDER_REGISTER_DECLARE(osxaudiodeviceprovider);
+
 G_END_DECLS
 #endif /* __GST_OSX_AUDIO_DEIVCE_PROVIDER_H__ */
diff --git a/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudiosink.c b/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudiosink.c
index b02e1a861b..4b48e0dd59 100644
--- a/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudiosink.c
+++ b/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudiosink.c
@@ -148,6 +148,8 @@ gst_osx_audio_sink_do_init (GType type)
 #define gst_osx_audio_sink_parent_class parent_class
 G_DEFINE_TYPE_WITH_CODE (GstOsxAudioSink, gst_osx_audio_sink,
     GST_TYPE_AUDIO_BASE_SINK, gst_osx_audio_sink_do_init (g_define_type_id));
+GST_ELEMENT_REGISTER_DEFINE (osxaudiosink, "osxaudiosink", GST_RANK_PRIMARY,
+    GST_TYPE_OSX_AUDIO_SINK);
 
 static void
 gst_osx_audio_sink_class_init (GstOsxAudioSinkClass * klass)
diff --git a/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudiosink.h b/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudiosink.h
index 2f55c4d2e6..a15b0ec3c3 100644
--- a/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudiosink.h
+++ b/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudiosink.h
@@ -96,6 +96,8 @@ struct _GstOsxAudioSinkClass
 
 GType gst_osx_audio_sink_get_type (void);
 
+GST_ELEMENT_REGISTER_DECLARE (osxaudiosink);
+
 G_END_DECLS
 
 #endif /* __GST_OSXAUDIOSINK_H__ */
diff --git a/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudiosrc.c b/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudiosrc.c
index 8e3c3a2a6d..75793bb692 100644
--- a/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudiosrc.c
+++ b/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudiosrc.c
@@ -123,6 +123,8 @@ gst_osx_audio_src_do_init (GType type)
 #define gst_osx_audio_src_parent_class parent_class
 G_DEFINE_TYPE_WITH_CODE (GstOsxAudioSrc, gst_osx_audio_src,
     GST_TYPE_AUDIO_BASE_SRC, gst_osx_audio_src_do_init (g_define_type_id));
+GST_ELEMENT_REGISTER_DEFINE (osxaudiosrc, "osxaudiosrc", GST_RANK_PRIMARY,
+    GST_TYPE_OSX_AUDIO_SRC);
 
 static void
 gst_osx_audio_src_class_init (GstOsxAudioSrcClass * klass)
diff --git a/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudiosrc.h b/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudiosrc.h
index 9d825b0286..980cf91722 100644
--- a/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudiosrc.h
+++ b/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudiosrc.h
@@ -82,6 +82,8 @@ struct _GstOsxAudioSrcClass
 
 GType gst_osx_audio_src_get_type (void);
 
+GST_ELEMENT_REGISTER_DECLARE (osxaudiosrc);
+
 G_END_DECLS
 
 #endif /* __GST_OSXAUDIOSRC_H__ */