diff --git a/gst/audioconvert/gstaudioconvert.c b/gst/audioconvert/gstaudioconvert.c
index 5af83cf6ac..d2f58c5280 100644
--- a/gst/audioconvert/gstaudioconvert.c
+++ b/gst/audioconvert/gstaudioconvert.c
@@ -110,7 +110,6 @@
 #include <string.h>
 
 #include "gstaudioconvert.h"
-#include "plugin.h"
 
 GST_DEBUG_CATEGORY (audio_convert_debug);
 GST_DEBUG_CATEGORY_STATIC (GST_CAT_PERFORMANCE);
diff --git a/gst/audioconvert/gstaudioconvert.h b/gst/audioconvert/gstaudioconvert.h
index 8befffd815..3853cfa71f 100644
--- a/gst/audioconvert/gstaudioconvert.h
+++ b/gst/audioconvert/gstaudioconvert.h
@@ -26,14 +26,9 @@
 #include <gst/base/gstbasetransform.h>
 #include <gst/audio/audio.h>
 
-#define GST_TYPE_AUDIO_CONVERT            (gst_audio_convert_get_type())
-#define GST_AUDIO_CONVERT(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_CONVERT,GstAudioConvert))
-#define GST_AUDIO_CONVERT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AUDIO_CONVERT,GstAudioConvertClass))
-#define GST_IS_AUDIO_CONVERT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_CONVERT))
-#define GST_IS_AUDIO_CONVERT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AUDIO_CONVERT))
-
-typedef struct _GstAudioConvert GstAudioConvert;
-typedef struct _GstAudioConvertClass GstAudioConvertClass;
+#define GST_TYPE_AUDIO_CONVERT (gst_audio_convert_get_type())
+G_DECLARE_FINAL_TYPE (GstAudioConvert, gst_audio_convert,
+    GST, AUDIO_CONVERT, GstBaseTransform)
 
 /**
  * GstAudioConvert:
@@ -55,9 +50,4 @@ struct _GstAudioConvert
   GstAudioConverter *convert;
 };
 
-struct _GstAudioConvertClass
-{
-  GstBaseTransformClass parent_class;
-};
-
 #endif /* __GST_AUDIO_CONVERT_H__ */
diff --git a/gst/audioconvert/plugin.c b/gst/audioconvert/plugin.c
index 08b516d07f..f9ed4c3aa4 100644
--- a/gst/audioconvert/plugin.c
+++ b/gst/audioconvert/plugin.c
@@ -23,13 +23,13 @@
 #include "config.h"
 #endif
 
-#include "plugin.h"
+#include "gstaudioconvert.h"
 
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
   if (!gst_element_register (plugin, "audioconvert",
-          GST_RANK_PRIMARY, gst_audio_convert_get_type ()))
+          GST_RANK_PRIMARY, GST_TYPE_AUDIO_CONVERT))
     return FALSE;
 
   return TRUE;
diff --git a/gst/audioconvert/plugin.h b/gst/audioconvert/plugin.h
deleted file mode 100644
index 6c18f6ddd1..0000000000
--- a/gst/audioconvert/plugin.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* GStreamer buffer-frames conversion plugin
- * Copyright (C) 2004 Andy Wingo <wingo at pobox.com>
- *
- * plugin.h: the stubs for the buffer-frames-convert plugin
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-
-#ifndef __GST_PLUGIN_AUDIO_CONVERT_H__
-#define __GST_PLUGIN_AUDIO_CONVERT_H__
-
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-GType gst_audio_convert_get_type (void);
-
-G_END_DECLS
-
-#endif /* __GST_PLUGIN_AUDIO_CONVERT_H__ */