diff --git a/gst-libs/gst/vaapi/gstvaapiobject.h b/gst-libs/gst/vaapi/gstvaapiobject.h
index a9a977d1f1..ad9edc4c91 100644
--- a/gst-libs/gst/vaapi/gstvaapiobject.h
+++ b/gst-libs/gst/vaapi/gstvaapiobject.h
@@ -35,24 +35,6 @@ G_BEGIN_DECLS
 
 typedef struct _GstVaapiObject GstVaapiObject;
 
-/**
- * GST_VAAPI_OBJECT_DISPLAY:
- * @object: a #GstVaapiObject
- *
- * Macro that evaluates to the #GstVaapiDisplay the @object is bound to.
- */
-#define GST_VAAPI_OBJECT_DISPLAY(object) \
-  gst_vaapi_object_get_display (GST_VAAPI_OBJECT (object))
-
-/**
- * GST_VAAPI_OBJECT_ID:
- * @object: a #GstVaapiObject
- *
- * Macro that evaluates to the #GstVaapiID contained in @object.
- */
-#define GST_VAAPI_OBJECT_ID(object) \
-  gst_vaapi_object_get_id (GST_VAAPI_OBJECT (object))
-
 gpointer
 gst_vaapi_object_ref (gpointer object);
 
diff --git a/gst-libs/gst/vaapi/gstvaapiobject_priv.h b/gst-libs/gst/vaapi/gstvaapiobject_priv.h
index 3515595120..0eb494d472 100644
--- a/gst-libs/gst/vaapi/gstvaapiobject_priv.h
+++ b/gst-libs/gst/vaapi/gstvaapiobject_priv.h
@@ -71,7 +71,6 @@ G_PASTE(t_n,_class) (void)                                      \
  * Macro that evaluates to the #GstVaapiID contained in @object.
  * This is an internal macro that does not do any run-time type checks.
  */
-#undef  GST_VAAPI_OBJECT_ID
 #define GST_VAAPI_OBJECT_ID(object) \
   (GST_VAAPI_OBJECT (object)->object_id)
 
@@ -82,7 +81,6 @@ G_PASTE(t_n,_class) (void)                                      \
  * Macro that evaluates to the #GstVaapiDisplay the @object is bound to.
  * This is an internal macro that does not do any run-time type check.
  */
-#undef  GST_VAAPI_OBJECT_DISPLAY
 #define GST_VAAPI_OBJECT_DISPLAY(object) \
   (GST_VAAPI_OBJECT (object)->display)
 
diff --git a/gst/vaapi/gstvaapivideometa_texture.c b/gst/vaapi/gstvaapivideometa_texture.c
index b89f9ee80a..e3f5f1b541 100644
--- a/gst/vaapi/gstvaapivideometa_texture.c
+++ b/gst/vaapi/gstvaapivideometa_texture.c
@@ -178,7 +178,8 @@ gst_vaapi_texture_upload (GstVideoGLTextureUploadMeta * meta,
   GstVaapiSurfaceProxy *const proxy =
       gst_vaapi_video_meta_get_surface_proxy (vmeta);
   GstVaapiSurface *const surface = gst_vaapi_surface_proxy_get_surface (proxy);
-  GstVaapiDisplay *const dpy = GST_VAAPI_OBJECT_DISPLAY (surface);
+  GstVaapiDisplay *const dpy =
+      gst_vaapi_object_get_display (GST_VAAPI_OBJECT (surface));
   GstVaapiTexture *texture = NULL;
 
   if (!gst_vaapi_display_has_opengl (dpy))
@@ -186,7 +187,8 @@ gst_vaapi_texture_upload (GstVideoGLTextureUploadMeta * meta,
 
   if (meta_texture->texture
       /* Check whether VA display changed */
-      && GST_VAAPI_OBJECT_DISPLAY (meta_texture->texture) == dpy
+      && gst_vaapi_object_get_display
+      (GST_VAAPI_OBJECT (meta_texture->texture)) == dpy
       /* Check whether texture id changed */
       && (gst_vaapi_texture_get_id (meta_texture->texture) == texture_id[0])) {
     texture = meta_texture->texture;