diff --git a/ext/shout2/gstshout2.c b/ext/shout2/gstshout2.c
index adfaccf7a5..0ffc8d4fa8 100644
--- a/ext/shout2/gstshout2.c
+++ b/ext/shout2/gstshout2.c
@@ -220,8 +220,7 @@ gst_shout2send_class_init (GstShout2sendClass * klass)
   /* signals */
   gst_shout2send_signals[SIGNAL_CONNECTION_PROBLEM] =
       g_signal_new ("connection-problem", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_CLEANUP, G_STRUCT_OFFSET (GstShout2sendClass,
-          connection_problem), NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_INT);
+      G_SIGNAL_RUN_CLEANUP, 0, NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_INT);
 
   gstbasesink_class->start = GST_DEBUG_FUNCPTR (gst_shout2send_start);
   gstbasesink_class->stop = GST_DEBUG_FUNCPTR (gst_shout2send_stop);
diff --git a/ext/shout2/gstshout2.h b/ext/shout2/gstshout2.h
index 408716692d..92a97a7399 100644
--- a/ext/shout2/gstshout2.h
+++ b/ext/shout2/gstshout2.h
@@ -35,8 +35,10 @@ typedef enum {
 } GstShout2SendProtocol;
 
 
-/* Definition of structure storing data for this element. */
-typedef struct _GstShout2send GstShout2send;
+#define GST_TYPE_SHOUT2SEND (gst_shout2send_get_type())
+G_DECLARE_FINAL_TYPE (GstShout2send, gst_shout2send, GST, SHOUT2SEND,
+    GstBaseSink)
+
 struct _GstShout2send {
   GstBaseSink parent;
 
@@ -72,33 +74,6 @@ struct _GstShout2send {
   GstTagList* tags;
 };
 
-
-
-/* Standard definition defining a class for this element. */
-typedef struct _GstShout2sendClass GstShout2sendClass;
-struct _GstShout2sendClass {
-  GstBaseSinkClass parent_class;
-
-  /* signal callbacks */
-  void (*connection_problem) (GstElement *element,guint errno);
-};
-
-/* Standard macros for defining types for this element.  */
-#define GST_TYPE_SHOUT2SEND \
-  (gst_shout2send_get_type())
-#define GST_SHOUT2SEND(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SHOUT2SEND,GstShout2send))
-#define GST_SHOUT2SEND_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SHOUT2SEND,GstShout2sendClass))
-#define GST_IS_SHOUT2SEND(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SHOUT2SEND))
-#define GST_IS_SHOUT2SEND_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SHOUT2SEND))
-
-/* Standard function returning type information. */
-GType gst_shout2send_get_type(void);
-
-
 G_END_DECLS
 
 #endif /* __GST_SHOUT2SEND_H__ */