diff --git a/gst-libs/gst/video/gstsurfacebuffer.h b/gst-libs/gst/video/gstsurfacebuffer.h
index 1b9bc2544e..6ce6605721 100644
--- a/gst-libs/gst/video/gstsurfacebuffer.h
+++ b/gst-libs/gst/video/gstsurfacebuffer.h
@@ -49,7 +49,6 @@ G_BEGIN_DECLS
  */
 #define GST_VIDEO_CAPS_SURFACE "video/x-surface"
 
-typedef struct _GstSurfaceBuffer GstSurfaceBuffer;
 typedef struct _GstSurfaceBufferClass GstSurfaceBufferClass;
 
 /**
diff --git a/gst-libs/gst/video/gstsurfaceconverter.h b/gst-libs/gst/video/gstsurfaceconverter.h
index 2a87557b81..c8fdcc804f 100644
--- a/gst-libs/gst/video/gstsurfaceconverter.h
+++ b/gst-libs/gst/video/gstsurfaceconverter.h
@@ -32,12 +32,14 @@
 
 G_BEGIN_DECLS
 
+/* Forward declaration from gstsurfacebuffer.h */
+typedef struct _GstSurfaceBuffer GstSurfaceBuffer;
+
 #define GST_TYPE_SURFACE_CONVERTER             (gst_surface_converter_get_type ())
 #define GST_SURFACE_CONVERTER(obj)             (GST_IMPLEMENTS_INTERFACE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_SURFACE_CONVERTER, GstSurfaceConverter))
 #define GST_IS_SURFACE_CONVERTER(obj)          (GST_IMPLEMENTS_INTERFACE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_SURFACE_CONVERTER))
 #define GST_SURFACE_CONVERTER_GET_IFACE(inst)  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_SURFACE_CONVERTER, GstSurfaceConverterInterface))
 
-typedef struct _GstSurfaceBuffer GstSurfaceBuffer;
 typedef struct _GstSurfaceConverter GstSurfaceConverter;
 typedef struct _GstSurfaceConverterInterface GstSurfaceConverterInterface;