diff --git a/content/content_common.gypi b/content/content_common.gypi
index 0ea7159456e4a..1d8932014f93e 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -840,7 +840,7 @@
         },
       ],
     }],
-    ['chromeos==1', {
+    ['chromeos==1 or use_ozone==1', {
       'sources': [
         'common/gpu/media/accelerated_video_decoder.h',
         'common/gpu/media/h264_decoder.cc',
@@ -891,7 +891,7 @@
         'common/gpu/media/tegra_v4l2_device.h',
       ],
     }],
-    ['target_arch != "arm" and chromeos == 1', {
+    ['target_arch != "arm" and use_ozone == 1', {
       'dependencies': [
         '../media/media.gyp:media',
         '../third_party/libyuv/libyuv.gyp:libyuv',
@@ -902,18 +902,19 @@
         'common/gpu/media/vaapi_jpeg_decode_accelerator.h',
         'common/gpu/media/vaapi_jpeg_decoder.cc',
         'common/gpu/media/vaapi_jpeg_decoder.h',
-        'common/gpu/media/vaapi_picture.cc',
-        'common/gpu/media/vaapi_picture.h',
         'common/gpu/media/vaapi_video_decode_accelerator.cc',
         'common/gpu/media/vaapi_video_decode_accelerator.h',
-        'common/gpu/media/vaapi_video_encode_accelerator.cc',
-        'common/gpu/media/vaapi_video_encode_accelerator.h',
-        'common/gpu/media/vaapi_wrapper.cc',
-        'common/gpu/media/vaapi_wrapper.h',
+        '<(DEPTH)/ozone/media/vaapi_picture.cc',
+        '<(DEPTH)/ozone/media/vaapi_picture.h',
+        '<(DEPTH)/ozone/media/vaapi_picture_wayland.cc',
+        '<(DEPTH)/ozone/media/vaapi_picture_wayland.h',
+        '<(DEPTH)/ozone/media/vaapi_wrapper.cc',
+        '<(DEPTH)/ozone/media/vaapi_wrapper.h',
       ],
       'conditions': [
         ['use_x11 == 1', {
           'variables': {
+            'extra_header': 'common/gpu/media/va_stub_header.fragment',
             'sig_files': [
               'common/gpu/media/va.sigs',
               'common/gpu/media/va_x11.sigs',
@@ -924,21 +925,33 @@
             'common/gpu/media/vaapi_tfp_picture.h',
           ],
         }, {
-          'variables': {
-            'sig_files': [
-              'common/gpu/media/va.sigs',
-              'common/gpu/media/va_drm.sigs',
-            ],
-          },
-          'sources': [
-            'common/gpu/media/vaapi_drm_picture.cc',
-            'common/gpu/media/vaapi_drm_picture.h',
-          ],
+          'conditions': [
+            ['ozone_platform_wayland == 1', {
+              'variables': {
+                'extra_header': '../ozone/media/va_wayland_stub_header.fragment',
+                'sig_files': [
+                  'common/gpu/media/va.sigs',
+                  '../ozone/media/va_wayland.sigs',
+                ],
+              },
+            }, {
+              'variables': {
+                'extra_header': 'common/gpu/media/va_stub_header.fragment',
+                'sig_files': [
+                  'common/gpu/media/va.sigs',
+                  'common/gpu/media/va_drm.sigs',
+                ],
+              },
+              'sources': [
+                'common/gpu/media/vaapi_drm_picture.cc',
+                'common/gpu/media/vaapi_drm_picture.h',
+              ],
+            }],
+          ]
         }],
       ],
       'variables': {
         'generate_stubs_script': '../tools/generate_stubs/generate_stubs.py',
-        'extra_header': 'common/gpu/media/va_stub_header.fragment',
         'outfile_type': 'posix_stubs',
         'stubs_filename_root': 'va_stubs',
         'project_path': 'content/common/gpu/media',