diff --git a/gst/interleave/deinterleave.c b/gst/interleave/deinterleave.c
index f4caff0021..4d5ce98dbd 100644
--- a/gst/interleave/deinterleave.c
+++ b/gst/interleave/deinterleave.c
@@ -64,6 +64,7 @@
 
 #include <gst/gst.h>
 #include <string.h>
+#include "gstinterleaveelements.h"
 #include "deinterleave.h"
 
 GST_DEBUG_CATEGORY_STATIC (gst_deinterleave_debug);
@@ -116,6 +117,8 @@ deinterleave_24 (guint8 * out, guint8 * in, guint stride, guint nframes)
 
 #define gst_deinterleave_parent_class parent_class
 G_DEFINE_TYPE (GstDeinterleave, gst_deinterleave, GST_TYPE_ELEMENT);
+GST_ELEMENT_REGISTER_DEFINE (deinterleave, "deinterleave",
+    GST_RANK_NONE, gst_deinterleave_get_type ());
 
 enum
 {
diff --git a/gst/interleave/plugin.h b/gst/interleave/gstinterleaveelements.h
similarity index 82%
rename from gst/interleave/plugin.h
rename to gst/interleave/gstinterleaveelements.h
index 7956827605..7435b5ccad 100644
--- a/gst/interleave/plugin.h
+++ b/gst/interleave/gstinterleaveelements.h
@@ -20,12 +20,15 @@
  */
 
 
-#ifndef __GST_PLUGIN_INTERLEAVE_H__
-#define __GST_PLUGIN_INTERLEAVE_H__
+#ifndef __GST_INTERLEAVE_ELEMENTS_H__
+#define __GST_INTERLEAVE_ELEMENTS_H__
 
 
 #include <gst/gst.h>
 #include "interleave.h"
 #include "deinterleave.h"
 
-#endif /* __GST_PLUGIN_INTERLEAVE_H__ */
+GST_ELEMENT_REGISTER_DECLARE (interleave);
+GST_ELEMENT_REGISTER_DECLARE (deinterleave);
+
+#endif /* __GST_INTERLEAVE_ELEMENTS_H__ */
diff --git a/gst/interleave/interleave.c b/gst/interleave/interleave.c
index 35cebf31fa..91317dd8cc 100644
--- a/gst/interleave/interleave.c
+++ b/gst/interleave/interleave.c
@@ -70,6 +70,7 @@
 
 #include <gst/gst.h>
 #include <string.h>
+#include "gstinterleaveelements.h"
 #include "interleave.h"
 
 #include <gst/audio/audio.h>
@@ -192,6 +193,8 @@ gst_interleave_pad_class_init (GstPadClass * klass)
 
 #define gst_interleave_parent_class parent_class
 G_DEFINE_TYPE (GstInterleave, gst_interleave, GST_TYPE_ELEMENT);
+GST_ELEMENT_REGISTER_DEFINE (interleave, "interleave",
+    GST_RANK_NONE, gst_interleave_get_type ());
 
 enum
 {
diff --git a/gst/interleave/plugin.c b/gst/interleave/plugin.c
index 9eb72905a6..79596e4355 100644
--- a/gst/interleave/plugin.c
+++ b/gst/interleave/plugin.c
@@ -23,17 +23,17 @@
 #include "config.h"
 #endif
 
-#include "plugin.h"
+#include "gstinterleaveelements.h"
 
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  if (!gst_element_register (plugin, "interleave",
-          GST_RANK_NONE, gst_interleave_get_type ()) ||
-      !gst_element_register (plugin, "deinterleave",
-          GST_RANK_NONE, gst_deinterleave_get_type ()))
-    return FALSE;
-  return TRUE;
+  gboolean ret = FALSE;
+
+  ret |= GST_ELEMENT_REGISTER (interleave, plugin);
+  ret |= GST_ELEMENT_REGISTER (deinterleave, plugin);
+
+  return ret;
 }
 
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,