diff --git a/media/ffvpx/config_override.h b/media/ffvpx/config_override.h
index 8902e64ec255..5408abdd1ac5 100644
--- a/media/ffvpx/config_override.h
+++ b/media/ffvpx/config_override.h
@@ -20,7 +20,7 @@
 #undef CONFIG_VP9_VAAPI_HWACCEL
 #undef CONFIG_AV1_VAAPI_HWACCEL
 
-#if defined(MOZ_WAYLAND) && !defined(MOZ_FFVPX_AUDIOONLY)
+#if defined(MOZ_WIDGET_GTK) && !defined(MOZ_FFVPX_AUDIOONLY)
 #define CONFIG_VAAPI 1
 #define CONFIG_VAAPI_1 1
 #define CONFIG_VP8_VAAPI_HWACCEL 1
diff --git a/media/ffvpx/libavcodec/moz.build b/media/ffvpx/libavcodec/moz.build
index 61d9962a7126..5675c28234a1 100644
--- a/media/ffvpx/libavcodec/moz.build
+++ b/media/ffvpx/libavcodec/moz.build
@@ -113,7 +113,7 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
         'dav1d',
         'media_libdav1d_asm',
     ]
-    if CONFIG['MOZ_WAYLAND']:
+    if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
         LOCAL_INCLUDES += ['/media/mozva']
         SOURCES += [
             'vaapi_av1.c',
diff --git a/media/ffvpx/libavutil/moz.build b/media/ffvpx/libavutil/moz.build
index c9ba03fe3520..c89020ab0a3c 100644
--- a/media/ffvpx/libavutil/moz.build
+++ b/media/ffvpx/libavutil/moz.build
@@ -63,7 +63,7 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
         'timecode.c',
         'video_enc_params.c'
     ]
-    if CONFIG["MOZ_WAYLAND"]:
+    if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
         LOCAL_INCLUDES += ['/media/mozva']
         SOURCES += [
             'hwcontext_vaapi.c',