diff --git a/gst-libs/gst/vaapi/gstvaapidisplay_x11.c b/gst-libs/gst/vaapi/gstvaapidisplay_x11.c
index d215230fc6..3a2db88b8d 100644
--- a/gst-libs/gst/vaapi/gstvaapidisplay_x11.c
+++ b/gst-libs/gst/vaapi/gstvaapidisplay_x11.c
@@ -129,6 +129,8 @@ gst_vaapi_display_x11_get_display(GstVaapiDisplayX11 *display)
 {
     GstVaapiDisplayX11Private *priv = display->priv;
 
+    g_return_val_if_fail(GST_VAAPI_IS_DISPLAY_X11(display), NULL);
+
     return priv->display;
 }
 
@@ -138,6 +140,8 @@ gst_vaapi_display_x11_set_display(GstVaapiDisplayX11 *display,
 {
     GstVaapiDisplayX11Private *priv = display->priv;
 
+    g_return_if_fail(GST_VAAPI_IS_DISPLAY_X11(display));
+
     if (x11_display) {
         VADisplay va_display = vaGetDisplay(x11_display);
         if (va_display)
diff --git a/gst-libs/gst/vaapi/gstvaapidisplay_x11.h b/gst-libs/gst/vaapi/gstvaapidisplay_x11.h
index 8633a02186..bd7b22394d 100644
--- a/gst-libs/gst/vaapi/gstvaapidisplay_x11.h
+++ b/gst-libs/gst/vaapi/gstvaapidisplay_x11.h
@@ -21,7 +21,7 @@
 #ifndef GST_VAAPI_DISPLAY_X11_H
 #define GST_VAAPI_DISPLAY_X11_H
 
-#include "gstvaapidisplay.h"
+#include <gst/vaapi/gstvaapidisplay.h>
 #include <va/va_x11.h>
 
 G_BEGIN_DECLS