diff --git a/ext/closedcaption/gstcccombiner.c b/ext/closedcaption/gstcccombiner.c
index 5e47318f53..079c77cee4 100644
--- a/ext/closedcaption/gstcccombiner.c
+++ b/ext/closedcaption/gstcccombiner.c
@@ -51,8 +51,10 @@ static GstStaticPadTemplate captiontemplate =
     ("closedcaption/x-cea-608,format={ (string) raw, (string) s334-1a}; "
         "closedcaption/x-cea-708,format={ (string) cc_data, (string) cdp }"));
 
-G_DEFINE_TYPE (GstCCCombiner, gst_cc_combiner, GST_TYPE_AGGREGATOR);
 #define parent_class gst_cc_combiner_parent_class
+G_DEFINE_TYPE (GstCCCombiner, gst_cc_combiner, GST_TYPE_AGGREGATOR);
+GST_ELEMENT_REGISTER_DEFINE (cccombiner, "cccombiner",
+    GST_RANK_NONE, GST_TYPE_CCCOMBINER);
 
 enum
 {
diff --git a/ext/closedcaption/gstcccombiner.h b/ext/closedcaption/gstcccombiner.h
index 2965915f32..e94fa83061 100644
--- a/ext/closedcaption/gstcccombiner.h
+++ b/ext/closedcaption/gstcccombiner.h
@@ -81,5 +81,7 @@ struct _GstCCCombinerClass
 
 GType gst_cc_combiner_get_type (void);
 
+GST_ELEMENT_REGISTER_DECLARE (cccombiner);
+
 G_END_DECLS
 #endif /* __GST_CCCOMBINER_H__ */
diff --git a/ext/closedcaption/gstccconverter.c b/ext/closedcaption/gstccconverter.c
index e1c0600165..3b3ad9297b 100644
--- a/ext/closedcaption/gstccconverter.c
+++ b/ext/closedcaption/gstccconverter.c
@@ -69,8 +69,10 @@ static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS (CC_CAPS));
 
-G_DEFINE_TYPE (GstCCConverter, gst_cc_converter, GST_TYPE_BASE_TRANSFORM);
 #define parent_class gst_cc_converter_parent_class
+G_DEFINE_TYPE (GstCCConverter, gst_cc_converter, GST_TYPE_BASE_TRANSFORM);
+GST_ELEMENT_REGISTER_DEFINE (ccconverter, "ccconverter",
+    GST_RANK_NONE, GST_TYPE_CCCONVERTER);
 
 #define GST_TYPE_CC_CONVERTER_CDP_MODE (gst_cc_converter_cdp_mode_get_type())
 static GType
diff --git a/ext/closedcaption/gstccconverter.h b/ext/closedcaption/gstccconverter.h
index 7529889173..1e3578b27f 100644
--- a/ext/closedcaption/gstccconverter.h
+++ b/ext/closedcaption/gstccconverter.h
@@ -88,5 +88,7 @@ struct _GstCCConverterClass
 
 GType gst_cc_converter_get_type (void);
 
+GST_ELEMENT_REGISTER_DECLARE (ccconverter);
+
 G_END_DECLS
 #endif /* __GST_CCCONVERTER_H__ */
diff --git a/ext/closedcaption/gstccextractor.c b/ext/closedcaption/gstccextractor.c
index aed91b1473..8b44df039b 100644
--- a/ext/closedcaption/gstccextractor.c
+++ b/ext/closedcaption/gstccextractor.c
@@ -65,8 +65,10 @@ static GstStaticPadTemplate captiontemplate =
     ("closedcaption/x-cea-608,format={ (string) raw, (string) s334-1a}; "
         "closedcaption/x-cea-708,format={ (string) cc_data, (string) cdp }"));
 
-G_DEFINE_TYPE (GstCCExtractor, gst_cc_extractor, GST_TYPE_ELEMENT);
 #define parent_class gst_cc_extractor_parent_class
+G_DEFINE_TYPE (GstCCExtractor, gst_cc_extractor, GST_TYPE_ELEMENT);
+GST_ELEMENT_REGISTER_DEFINE (ccextractor, "ccextractor",
+    GST_RANK_NONE, GST_TYPE_CCEXTRACTOR);
 
 static gboolean gst_cc_extractor_sink_event (GstPad * pad, GstObject * parent,
     GstEvent * event);
diff --git a/ext/closedcaption/gstccextractor.h b/ext/closedcaption/gstccextractor.h
index 7dcfb20550..36b0ef9bf4 100644
--- a/ext/closedcaption/gstccextractor.h
+++ b/ext/closedcaption/gstccextractor.h
@@ -61,5 +61,7 @@ struct _GstCCExtractorClass
 
 GType gst_cc_extractor_get_type (void);
 
+GST_ELEMENT_REGISTER_DECLARE (ccextractor);
+
 G_END_DECLS
 #endif /* __GST_CCEXTRACTOR_H__ */
diff --git a/ext/closedcaption/gstceaccoverlay.c b/ext/closedcaption/gstceaccoverlay.c
index e40d14dfef..4327648c43 100644
--- a/ext/closedcaption/gstceaccoverlay.c
+++ b/ext/closedcaption/gstceaccoverlay.c
@@ -195,6 +195,9 @@ gst_cea_cc_overlay_get_type (void)
   return type;
 }
 
+GST_ELEMENT_REGISTER_DEFINE (cc708overlay, "cc708overlay",
+    GST_RANK_PRIMARY, GST_TYPE_CEA_CC_OVERLAY);
+
 static void
 gst_base_cea_cc_overlay_base_init (gpointer g_class)
 {
diff --git a/ext/closedcaption/gstceaccoverlay.h b/ext/closedcaption/gstceaccoverlay.h
index a50401a8b9..641648b299 100644
--- a/ext/closedcaption/gstceaccoverlay.h
+++ b/ext/closedcaption/gstceaccoverlay.h
@@ -132,5 +132,7 @@ struct _GstCeaCcOverlayClass
 
 GType gst_cea_cc_overlay_get_type (void);
 
+GST_ELEMENT_REGISTER_DECLARE (cc708overlay);
+
 G_END_DECLS
 #endif /* __GST_CEA_CC_OVERLAY_H__ */
diff --git a/ext/closedcaption/gstclosedcaption.c b/ext/closedcaption/gstclosedcaption.c
index daab0af3bb..05910ac736 100644
--- a/ext/closedcaption/gstclosedcaption.c
+++ b/ext/closedcaption/gstclosedcaption.c
@@ -35,25 +35,14 @@
 static gboolean
 closedcaption_init (GstPlugin * plugin)
 {
-  gboolean ret;
+  gboolean ret = FALSE;
 
-  ret = gst_element_register (plugin, "cccombiner", GST_RANK_NONE,
-      GST_TYPE_CCCOMBINER);
-
-  ret &= gst_element_register (plugin, "ccconverter", GST_RANK_NONE,
-      GST_TYPE_CCCONVERTER);
-
-  ret &= gst_element_register (plugin, "ccextractor", GST_RANK_NONE,
-      GST_TYPE_CCEXTRACTOR);
-
-  ret &= gst_element_register (plugin, "line21decoder", GST_RANK_NONE,
-      GST_TYPE_LINE21DECODER);
-
-  ret &= gst_element_register (plugin, "cc708overlay", GST_RANK_PRIMARY,
-      GST_TYPE_CEA_CC_OVERLAY);
-
-  ret &= gst_element_register (plugin, "line21encoder", GST_RANK_NONE,
-      GST_TYPE_LINE21ENCODER);
+  ret |= GST_ELEMENT_REGISTER (cccombiner, plugin);
+  ret |= GST_ELEMENT_REGISTER (ccconverter, plugin);
+  ret |= GST_ELEMENT_REGISTER (ccextractor, plugin);
+  ret |= GST_ELEMENT_REGISTER (line21decoder, plugin);
+  ret |= GST_ELEMENT_REGISTER (cc708overlay, plugin);
+  ret |= GST_ELEMENT_REGISTER (line21encoder, plugin);
 
   return ret;
 }
diff --git a/ext/closedcaption/gstline21dec.c b/ext/closedcaption/gstline21dec.c
index a7f91d8932..631be73d82 100644
--- a/ext/closedcaption/gstline21dec.c
+++ b/ext/closedcaption/gstline21dec.c
@@ -49,8 +49,10 @@ static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS (CAPS));
 
-G_DEFINE_TYPE (GstLine21Decoder, gst_line_21_decoder, GST_TYPE_VIDEO_FILTER);
 #define parent_class gst_line_21_decoder_parent_class
+G_DEFINE_TYPE (GstLine21Decoder, gst_line_21_decoder, GST_TYPE_VIDEO_FILTER);
+GST_ELEMENT_REGISTER_DEFINE (line21decoder, "line21decoder",
+    GST_RANK_NONE, GST_TYPE_LINE21DECODER);
 
 static void gst_line_21_decoder_finalize (GObject * self);
 static gboolean gst_line_21_decoder_stop (GstBaseTransform * btrans);
diff --git a/ext/closedcaption/gstline21dec.h b/ext/closedcaption/gstline21dec.h
index 69c745e812..e576f25fe5 100644
--- a/ext/closedcaption/gstline21dec.h
+++ b/ext/closedcaption/gstline21dec.h
@@ -69,5 +69,7 @@ struct _GstLine21DecoderClass
 
 GType gst_line_21_decoder_get_type (void);
 
+GST_ELEMENT_REGISTER_DECLARE (line21decoder);
+
 G_END_DECLS
 #endif /* __GST_LINE21DECODER_H__ */
diff --git a/ext/closedcaption/gstline21enc.c b/ext/closedcaption/gstline21enc.c
index 6902bc05df..d956d333e7 100644
--- a/ext/closedcaption/gstline21enc.c
+++ b/ext/closedcaption/gstline21enc.c
@@ -60,6 +60,8 @@ static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
 
 G_DEFINE_TYPE (GstLine21Encoder, gst_line_21_encoder, GST_TYPE_VIDEO_FILTER);
 #define parent_class gst_line_21_encoder_parent_class
+GST_ELEMENT_REGISTER_DEFINE (line21encoder, "line21encoder",
+    GST_RANK_NONE, GST_TYPE_LINE21ENCODER);
 
 static gboolean gst_line_21_encoder_set_info (GstVideoFilter * filter,
     GstCaps * incaps, GstVideoInfo * in_info,
diff --git a/ext/closedcaption/gstline21enc.h b/ext/closedcaption/gstline21enc.h
index 325a61fbc1..6d10fe7bbc 100644
--- a/ext/closedcaption/gstline21enc.h
+++ b/ext/closedcaption/gstline21enc.h
@@ -59,5 +59,7 @@ struct _GstLine21EncoderClass
 
 GType gst_line_21_encoder_get_type (void);
 
+GST_ELEMENT_REGISTER_DECLARE (line21encoder);
+
 G_END_DECLS
 #endif /* __GST_LINE21ENCODER_H__ */