diff --git a/gst-libs/gst/tag/gsttagmux.c b/gst-libs/gst/tag/gsttagmux.c
index 35ec89fe4b..5224e6c159 100644
--- a/gst-libs/gst/tag/gsttagmux.c
+++ b/gst-libs/gst/tag/gsttagmux.c
@@ -25,7 +25,8 @@
 #include <string.h>
 #include <gst/gsttagsetter.h>
 #include <gst/tag/tag.h>
-#include "gsttaglib.h"
+
+#include "gsttaglibmux.h"
 
 GST_DEBUG_CATEGORY_STATIC (gst_tag_lib_mux_debug);
 #define GST_CAT_DEFAULT gst_tag_lib_mux_debug
diff --git a/gst-libs/gst/tag/gsttagmux.h b/gst-libs/gst/tag/gsttagmux.h
index 5b91a93e70..26c9de7b39 100644
--- a/gst-libs/gst/tag/gsttagmux.h
+++ b/gst-libs/gst/tag/gsttagmux.h
@@ -18,8 +18,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef GST_TAG_LIB_H
-#define GST_TAG_LIB_H
+#ifndef GST_TAG_LIB_MUX_H
+#define GST_TAG_LIB_MUX_H
 
 #include <gst/gst.h>
 
@@ -29,7 +29,7 @@ typedef struct _GstTagLibMux GstTagLibMux;
 typedef struct _GstTagLibMuxClass GstTagLibMuxClass;
 
 /* Definition of structure storing data for this element. */
-typedef struct _GstTagLibMux {
+struct _GstTagLibMux {
   GstElement    element;
 
   GstPad       *srcpad;
@@ -42,7 +42,7 @@ typedef struct _GstTagLibMux {
 };
 
 /* Standard definition defining a class for this element. */
-typedef struct _GstTagLibMuxClass {
+struct _GstTagLibMuxClass {
   GstElementClass parent_class;
 
   /* vfuncs */