diff --git a/gst-libs/gst/vaapi/gstvaapicodec_objects.h b/gst-libs/gst/vaapi/gstvaapicodec_objects.h
index 8fb0c15ccb..f1e846d0f0 100644
--- a/gst-libs/gst/vaapi/gstvaapicodec_objects.h
+++ b/gst-libs/gst/vaapi/gstvaapicodec_objects.h
@@ -110,7 +110,7 @@ struct _GstVaapiCodecObjectClass {
 };
 
 GType
-gst_vaapi_codec_object_get_type(void)
+gst_vaapi_codec_object_get_type(void) G_GNUC_CONST
     attribute_hidden;
 
 GstVaapiCodecObject *
@@ -185,7 +185,7 @@ struct _GstVaapiIqMatrixClass {
 };
 
 GType
-gst_vaapi_iq_matrix_get_type(void)
+gst_vaapi_iq_matrix_get_type(void) G_GNUC_CONST
     attribute_hidden;
 
 GstVaapiIqMatrix *
@@ -251,7 +251,7 @@ struct _GstVaapiBitPlaneClass {
 };
 
 GType
-gst_vaapi_bitplane_get_type(void)
+gst_vaapi_bitplane_get_type(void) G_GNUC_CONST
     attribute_hidden;
 
 GstVaapiBitPlane *
@@ -314,7 +314,7 @@ struct _GstVaapiHuffmanTableClass {
 };
 
 GType
-gst_vaapi_huffman_table_get_type(void)
+gst_vaapi_huffman_table_get_type(void) G_GNUC_CONST
     attribute_hidden;
 
 GstVaapiHuffmanTable *
diff --git a/gst-libs/gst/vaapi/gstvaapicontext.h b/gst-libs/gst/vaapi/gstvaapicontext.h
index 78f9b28289..1187c400d1 100644
--- a/gst-libs/gst/vaapi/gstvaapicontext.h
+++ b/gst-libs/gst/vaapi/gstvaapicontext.h
@@ -82,7 +82,7 @@ struct _GstVaapiContextClass {
 };
 
 GType
-gst_vaapi_context_get_type(void);
+gst_vaapi_context_get_type(void) G_GNUC_CONST;
 
 GstVaapiContext *
 gst_vaapi_context_new(
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder.h b/gst-libs/gst/vaapi/gstvaapidecoder.h
index 910dfc5fb1..f365b931a8 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder.h
+++ b/gst-libs/gst/vaapi/gstvaapidecoder.h
@@ -115,7 +115,7 @@ struct _GstVaapiDecoderClass {
 };
 
 GType
-gst_vaapi_decoder_get_type(void);
+gst_vaapi_decoder_get_type(void) G_GNUC_CONST;
 
 GstCaps *
 gst_vaapi_decoder_get_caps(GstVaapiDecoder *decoder);
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_dpb.h b/gst-libs/gst/vaapi/gstvaapidecoder_dpb.h
index 1a199b8949..db43811e20 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_dpb.h
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_dpb.h
@@ -92,7 +92,7 @@ struct _GstVaapiDpbClass {
 };
 
 GType
-gst_vaapi_dpb_get_type(void)
+gst_vaapi_dpb_get_type(void) G_GNUC_CONST
     attribute_hidden;
 
 void
@@ -171,7 +171,7 @@ struct _GstVaapiDpbMpeg2Class {
 };
 
 GType
-gst_vaapi_dpb_mpeg2_get_type(void)
+gst_vaapi_dpb_mpeg2_get_type(void) G_GNUC_CONST
     attribute_hidden;
 
 GstVaapiDpb *
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_ffmpeg.h b/gst-libs/gst/vaapi/gstvaapidecoder_ffmpeg.h
index 746d16d1e0..01e667f394 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_ffmpeg.h
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_ffmpeg.h
@@ -77,7 +77,7 @@ struct _GstVaapiDecoderFfmpegClass {
 };
 
 GType
-gst_vaapi_decoder_ffmpeg_get_type(void);
+gst_vaapi_decoder_ffmpeg_get_type(void) G_GNUC_CONST;
 
 GstVaapiDecoder *
 gst_vaapi_decoder_ffmpeg_new(GstVaapiDisplay *display, GstCaps *caps);
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_h264.h b/gst-libs/gst/vaapi/gstvaapidecoder_h264.h
index 5ba47763d4..79a08f174a 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_h264.h
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_h264.h
@@ -77,7 +77,7 @@ struct _GstVaapiDecoderH264Class {
 };
 
 GType
-gst_vaapi_decoder_h264_get_type(void);
+gst_vaapi_decoder_h264_get_type(void) G_GNUC_CONST;
 
 GstVaapiDecoder *
 gst_vaapi_decoder_h264_new(GstVaapiDisplay *display, GstCaps *caps);
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_jpeg.h b/gst-libs/gst/vaapi/gstvaapidecoder_jpeg.h
index 68dab506fa..cd3b975d67 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_jpeg.h
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_jpeg.h
@@ -77,7 +77,7 @@ struct _GstVaapiDecoderJpegClass {
 };
 
 GType
-gst_vaapi_decoder_jpeg_get_type(void);
+gst_vaapi_decoder_jpeg_get_type(void) G_GNUC_CONST;
 
 GstVaapiDecoder *
 gst_vaapi_decoder_jpeg_new(GstVaapiDisplay *display, GstCaps *caps);
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_mpeg2.h b/gst-libs/gst/vaapi/gstvaapidecoder_mpeg2.h
index 98368331e0..e438c39654 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_mpeg2.h
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_mpeg2.h
@@ -78,7 +78,7 @@ struct _GstVaapiDecoderMpeg2Class {
 };
 
 GType
-gst_vaapi_decoder_mpeg2_get_type(void);
+gst_vaapi_decoder_mpeg2_get_type(void) G_GNUC_CONST;
 
 GstVaapiDecoder *
 gst_vaapi_decoder_mpeg2_new(GstVaapiDisplay *display, GstCaps *caps);
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_mpeg4.h b/gst-libs/gst/vaapi/gstvaapidecoder_mpeg4.h
index 753c60d377..4c877bbae8 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_mpeg4.h
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_mpeg4.h
@@ -78,7 +78,7 @@ struct _GstVaapiDecoderMpeg4Class {
 };
 
 GType
-gst_vaapi_decoder_mpeg4_get_type(void);
+gst_vaapi_decoder_mpeg4_get_type(void) G_GNUC_CONST;
 
 GstVaapiDecoder *
 gst_vaapi_decoder_mpeg4_new(GstVaapiDisplay *display, GstCaps *caps);
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_objects.h b/gst-libs/gst/vaapi/gstvaapidecoder_objects.h
index 56a6fde37a..0e33f07624 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_objects.h
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_objects.h
@@ -164,7 +164,7 @@ struct _GstVaapiPictureClass {
 };
 
 GType
-gst_vaapi_picture_get_type(void)
+gst_vaapi_picture_get_type(void) G_GNUC_CONST
     attribute_hidden;
 
 GstVaapiPicture *
@@ -263,7 +263,7 @@ struct _GstVaapiSliceClass {
 };
 
 GType
-gst_vaapi_slice_get_type(void)
+gst_vaapi_slice_get_type(void) G_GNUC_CONST
     attribute_hidden;
 
 GstVaapiSlice *
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_vc1.h b/gst-libs/gst/vaapi/gstvaapidecoder_vc1.h
index f443a4997f..1bed6067c9 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_vc1.h
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_vc1.h
@@ -78,7 +78,7 @@ struct _GstVaapiDecoderVC1Class {
 };
 
 GType
-gst_vaapi_decoder_vc1_get_type(void);
+gst_vaapi_decoder_vc1_get_type(void) G_GNUC_CONST;
 
 GstVaapiDecoder *
 gst_vaapi_decoder_vc1_new(GstVaapiDisplay *display, GstCaps *caps);
diff --git a/gst-libs/gst/vaapi/gstvaapidisplay.h b/gst-libs/gst/vaapi/gstvaapidisplay.h
index 33d7a234e6..7be56cae43 100644
--- a/gst-libs/gst/vaapi/gstvaapidisplay.h
+++ b/gst-libs/gst/vaapi/gstvaapidisplay.h
@@ -122,7 +122,7 @@ struct _GstVaapiDisplayClass {
 };
 
 GType
-gst_vaapi_display_get_type(void);
+gst_vaapi_display_get_type(void) G_GNUC_CONST;
 
 GstVaapiDisplay *
 gst_vaapi_display_new_with_display(VADisplay va_display);
diff --git a/gst-libs/gst/vaapi/gstvaapidisplay_glx.h b/gst-libs/gst/vaapi/gstvaapidisplay_glx.h
index b7135a6800..6f115e5096 100644
--- a/gst-libs/gst/vaapi/gstvaapidisplay_glx.h
+++ b/gst-libs/gst/vaapi/gstvaapidisplay_glx.h
@@ -77,7 +77,7 @@ struct _GstVaapiDisplayGLXClass {
 };
 
 GType
-gst_vaapi_display_glx_get_type(void);
+gst_vaapi_display_glx_get_type(void) G_GNUC_CONST;
 
 GstVaapiDisplay *
 gst_vaapi_display_glx_new(const gchar *display_name);
diff --git a/gst-libs/gst/vaapi/gstvaapidisplay_x11.h b/gst-libs/gst/vaapi/gstvaapidisplay_x11.h
index ab6d0ec4c4..a651dd6705 100644
--- a/gst-libs/gst/vaapi/gstvaapidisplay_x11.h
+++ b/gst-libs/gst/vaapi/gstvaapidisplay_x11.h
@@ -84,7 +84,7 @@ struct _GstVaapiDisplayX11Class {
 };
 
 GType
-gst_vaapi_display_x11_get_type(void);
+gst_vaapi_display_x11_get_type(void) G_GNUC_CONST;
 
 GstVaapiDisplay *
 gst_vaapi_display_x11_new(const gchar *display_name);
diff --git a/gst-libs/gst/vaapi/gstvaapiimage.h b/gst-libs/gst/vaapi/gstvaapiimage.h
index 3178b68ba4..d0c3cf3053 100644
--- a/gst-libs/gst/vaapi/gstvaapiimage.h
+++ b/gst-libs/gst/vaapi/gstvaapiimage.h
@@ -121,7 +121,7 @@ struct _GstVaapiImageRaw {
 };
 
 GType
-gst_vaapi_image_get_type(void);
+gst_vaapi_image_get_type(void) G_GNUC_CONST;
 
 GstVaapiImage *
 gst_vaapi_image_new(
diff --git a/gst-libs/gst/vaapi/gstvaapiimagepool.h b/gst-libs/gst/vaapi/gstvaapiimagepool.h
index 139a8505e2..2478c470b4 100644
--- a/gst-libs/gst/vaapi/gstvaapiimagepool.h
+++ b/gst-libs/gst/vaapi/gstvaapiimagepool.h
@@ -78,7 +78,7 @@ struct _GstVaapiImagePoolClass {
 };
 
 GType
-gst_vaapi_image_pool_get_type(void);
+gst_vaapi_image_pool_get_type(void) G_GNUC_CONST;
 
 GstVaapiVideoPool *
 gst_vaapi_image_pool_new(GstVaapiDisplay *display, GstCaps *caps);
diff --git a/gst-libs/gst/vaapi/gstvaapiobject.h b/gst-libs/gst/vaapi/gstvaapiobject.h
index fbb4aef76e..913cac8690 100644
--- a/gst-libs/gst/vaapi/gstvaapiobject.h
+++ b/gst-libs/gst/vaapi/gstvaapiobject.h
@@ -82,7 +82,7 @@ struct _GstVaapiObjectClass {
 };
 
 GType
-gst_vaapi_object_get_type(void);
+gst_vaapi_object_get_type(void) G_GNUC_CONST;
 
 GstVaapiDisplay *
 gst_vaapi_object_get_display(GstVaapiObject *object);
diff --git a/gst-libs/gst/vaapi/gstvaapiparamspecs.h b/gst-libs/gst/vaapi/gstvaapiparamspecs.h
index b22416e9d0..5b201496ff 100644
--- a/gst-libs/gst/vaapi/gstvaapiparamspecs.h
+++ b/gst-libs/gst/vaapi/gstvaapiparamspecs.h
@@ -55,7 +55,7 @@ struct _GstVaapiParamSpecID {
                                 GstVaapiParamSpecID))
 
 GType
-gst_vaapi_param_spec_id_get_type(void);
+gst_vaapi_param_spec_id_get_type(void) G_GNUC_CONST;
 
 GParamSpec *
 gst_vaapi_param_spec_id(
diff --git a/gst-libs/gst/vaapi/gstvaapisubpicture.h b/gst-libs/gst/vaapi/gstvaapisubpicture.h
index 7a0dd96a84..e7a6dbfdca 100644
--- a/gst-libs/gst/vaapi/gstvaapisubpicture.h
+++ b/gst-libs/gst/vaapi/gstvaapisubpicture.h
@@ -81,7 +81,7 @@ struct _GstVaapiSubpictureClass {
 };
 
 GType
-gst_vaapi_subpicture_get_type(void);
+gst_vaapi_subpicture_get_type(void) G_GNUC_CONST;
 
 GstVaapiSubpicture *
 gst_vaapi_subpicture_new(GstVaapiImage *image);
diff --git a/gst-libs/gst/vaapi/gstvaapisurface.h b/gst-libs/gst/vaapi/gstvaapisurface.h
index 9057290b49..9f51caa3fa 100644
--- a/gst-libs/gst/vaapi/gstvaapisurface.h
+++ b/gst-libs/gst/vaapi/gstvaapisurface.h
@@ -168,7 +168,7 @@ struct _GstVaapiSurfaceClass {
 };
 
 GType
-gst_vaapi_surface_get_type(void);
+gst_vaapi_surface_get_type(void) G_GNUC_CONST;
 
 GstVaapiSurface *
 gst_vaapi_surface_new(
diff --git a/gst-libs/gst/vaapi/gstvaapisurfacepool.h b/gst-libs/gst/vaapi/gstvaapisurfacepool.h
index 1a7c30a535..2bb661c884 100644
--- a/gst-libs/gst/vaapi/gstvaapisurfacepool.h
+++ b/gst-libs/gst/vaapi/gstvaapisurfacepool.h
@@ -78,7 +78,7 @@ struct _GstVaapiSurfacePoolClass {
 };
 
 GType
-gst_vaapi_surface_pool_get_type(void);
+gst_vaapi_surface_pool_get_type(void) G_GNUC_CONST;
 
 GstVaapiVideoPool *
 gst_vaapi_surface_pool_new(GstVaapiDisplay *display, GstCaps *caps);
diff --git a/gst-libs/gst/vaapi/gstvaapisurfaceproxy.h b/gst-libs/gst/vaapi/gstvaapisurfaceproxy.h
index b32458c76b..35e38f7c0b 100644
--- a/gst-libs/gst/vaapi/gstvaapisurfaceproxy.h
+++ b/gst-libs/gst/vaapi/gstvaapisurfaceproxy.h
@@ -117,7 +117,7 @@ struct _GstVaapiSurfaceProxyClass {
 };
 
 GType
-gst_vaapi_surface_proxy_get_type(void);
+gst_vaapi_surface_proxy_get_type(void) G_GNUC_CONST;
 
 GstVaapiSurfaceProxy *
 gst_vaapi_surface_proxy_new(GstVaapiContext *context, GstVaapiSurface *surface);
diff --git a/gst-libs/gst/vaapi/gstvaapitexture.h b/gst-libs/gst/vaapi/gstvaapitexture.h
index 1b67a5b1b5..4f8f3ce379 100644
--- a/gst-libs/gst/vaapi/gstvaapitexture.h
+++ b/gst-libs/gst/vaapi/gstvaapitexture.h
@@ -81,7 +81,7 @@ struct _GstVaapiTextureClass {
 };
 
 GType
-gst_vaapi_texture_get_type(void);
+gst_vaapi_texture_get_type(void) G_GNUC_CONST;
 
 GstVaapiTexture *
 gst_vaapi_texture_new(
diff --git a/gst-libs/gst/vaapi/gstvaapivalue.h b/gst-libs/gst/vaapi/gstvaapivalue.h
index a3834d2d98..a5a52bec28 100644
--- a/gst-libs/gst/vaapi/gstvaapivalue.h
+++ b/gst-libs/gst/vaapi/gstvaapivalue.h
@@ -45,7 +45,7 @@ G_BEGIN_DECLS
 #define GST_VAAPI_VALUE_HOLDS_ID(x) (G_VALUE_HOLDS((x), GST_VAAPI_TYPE_ID))
 
 GType
-gst_vaapi_id_get_type(void);
+gst_vaapi_id_get_type(void) G_GNUC_CONST;
 
 GstVaapiID
 gst_vaapi_value_get_id(const GValue *value);
diff --git a/gst-libs/gst/vaapi/gstvaapivideobuffer.h b/gst-libs/gst/vaapi/gstvaapivideobuffer.h
index 520191c4d7..04c5ba4f5f 100644
--- a/gst-libs/gst/vaapi/gstvaapivideobuffer.h
+++ b/gst-libs/gst/vaapi/gstvaapivideobuffer.h
@@ -83,7 +83,7 @@ struct _GstVaapiVideoBufferClass {
 };
 
 GType
-gst_vaapi_video_buffer_get_type(void);
+gst_vaapi_video_buffer_get_type(void) G_GNUC_CONST;
 
 GstBuffer *
 gst_vaapi_video_buffer_new(GstVaapiDisplay *display);
diff --git a/gst-libs/gst/vaapi/gstvaapivideobuffer_glx.h b/gst-libs/gst/vaapi/gstvaapivideobuffer_glx.h
index 48bf084173..af0a05c000 100644
--- a/gst-libs/gst/vaapi/gstvaapivideobuffer_glx.h
+++ b/gst-libs/gst/vaapi/gstvaapivideobuffer_glx.h
@@ -78,7 +78,7 @@ struct _GstVaapiVideoBufferGLXClass {
     GstVaapiVideoBufferClass parent_class;
 };
 
-GType      gst_vaapi_video_buffer_glx_get_type        (void);
+GType      gst_vaapi_video_buffer_glx_get_type        (void) G_GNUC_CONST;
 GstBuffer *gst_vaapi_video_buffer_glx_new             (GstVaapiDisplayGLX * display);
 GstBuffer *gst_vaapi_video_buffer_glx_new_from_pool   (GstVaapiVideoPool * pool);
 GstBuffer *gst_vaapi_video_buffer_glx_new_from_buffer (GstBuffer * buffer);
diff --git a/gst-libs/gst/vaapi/gstvaapivideoconverter_glx.h b/gst-libs/gst/vaapi/gstvaapivideoconverter_glx.h
index 012bb13761..0215444d49 100644
--- a/gst-libs/gst/vaapi/gstvaapivideoconverter_glx.h
+++ b/gst-libs/gst/vaapi/gstvaapivideoconverter_glx.h
@@ -61,7 +61,7 @@ struct _GstVaapiVideoConverterGLXClass {
     GObjectClass parent_class;
 };
 
-GType                 gst_vaapi_video_converter_glx_get_type (void);
+GType                 gst_vaapi_video_converter_glx_get_type (void) G_GNUC_CONST;
 
 GstSurfaceConverter  *gst_vaapi_video_converter_glx_new      (GstSurfaceBuffer *buffer,
                                                               const gchar      *type,
diff --git a/gst-libs/gst/vaapi/gstvaapivideopool.h b/gst-libs/gst/vaapi/gstvaapivideopool.h
index 12266178ec..f2fdb5e5cd 100644
--- a/gst-libs/gst/vaapi/gstvaapivideopool.h
+++ b/gst-libs/gst/vaapi/gstvaapivideopool.h
@@ -86,7 +86,7 @@ struct _GstVaapiVideoPoolClass {
 };
 
 GType
-gst_vaapi_video_pool_get_type(void);
+gst_vaapi_video_pool_get_type(void) G_GNUC_CONST;
 
 GstVaapiDisplay *
 gst_vaapi_video_pool_get_display(GstVaapiVideoPool *pool);
diff --git a/gst-libs/gst/vaapi/gstvaapivideosink.h b/gst-libs/gst/vaapi/gstvaapivideosink.h
index e9a17b4e9c..f33ba49717 100644
--- a/gst-libs/gst/vaapi/gstvaapivideosink.h
+++ b/gst-libs/gst/vaapi/gstvaapivideosink.h
@@ -61,7 +61,7 @@ struct _GstVaapiVideoSinkInterface {
 };
 
 GType
-gst_vaapi_video_sink_get_type(void);
+gst_vaapi_video_sink_get_type(void) G_GNUC_CONST;
 
 GstVaapiDisplay *
 gst_vaapi_video_sink_get_display(GstVaapiVideoSink *sink);
diff --git a/gst-libs/gst/vaapi/gstvaapiwindow.h b/gst-libs/gst/vaapi/gstvaapiwindow.h
index f5b6ee0ea6..5fdaf812f6 100644
--- a/gst-libs/gst/vaapi/gstvaapiwindow.h
+++ b/gst-libs/gst/vaapi/gstvaapiwindow.h
@@ -104,7 +104,7 @@ struct _GstVaapiWindowClass {
 };
 
 GType
-gst_vaapi_window_get_type(void);
+gst_vaapi_window_get_type(void) G_GNUC_CONST;
 
 GstVaapiDisplay *
 gst_vaapi_window_get_display(GstVaapiWindow *window);
diff --git a/gst-libs/gst/vaapi/gstvaapiwindow_glx.h b/gst-libs/gst/vaapi/gstvaapiwindow_glx.h
index 96b7f4e6b4..55473557c9 100644
--- a/gst-libs/gst/vaapi/gstvaapiwindow_glx.h
+++ b/gst-libs/gst/vaapi/gstvaapiwindow_glx.h
@@ -80,7 +80,7 @@ struct _GstVaapiWindowGLXClass {
 };
 
 GType
-gst_vaapi_window_glx_get_type(void);
+gst_vaapi_window_glx_get_type(void) G_GNUC_CONST;
 
 GstVaapiWindow *
 gst_vaapi_window_glx_new(GstVaapiDisplay *display, guint width, guint height);
diff --git a/gst-libs/gst/vaapi/gstvaapiwindow_x11.h b/gst-libs/gst/vaapi/gstvaapiwindow_x11.h
index 9488703eef..f1f22d4780 100644
--- a/gst-libs/gst/vaapi/gstvaapiwindow_x11.h
+++ b/gst-libs/gst/vaapi/gstvaapiwindow_x11.h
@@ -95,7 +95,7 @@ struct _GstVaapiWindowX11Class {
 };
 
 GType
-gst_vaapi_window_x11_get_type(void);
+gst_vaapi_window_x11_get_type(void) G_GNUC_CONST;
 
 GstVaapiWindow *
 gst_vaapi_window_x11_new(GstVaapiDisplay *display, guint width, guint height);