diff --git a/config/system-headers b/config/system-headers
index b1fb866e0ba..e8509e1b324 100644
--- a/config/system-headers
+++ b/config/system-headers
@@ -1304,6 +1304,7 @@ QtSparql/qsparqlresult.h
 pixman.h
 #endif
 #if MOZ_NATIVE_LIBVPX==1
+vpx/svc_context.h
 vpx/vpx_codec.h
 vpx/vpx_decoder.h
 vpx/vpx_encoder.h
diff --git a/media/libvpx/sources.mozbuild b/media/libvpx/sources.mozbuild
index f68f8a3a983..4521bb381ad 100644
--- a/media/libvpx/sources.mozbuild
+++ b/media/libvpx/sources.mozbuild
@@ -93,7 +93,8 @@ files = {
           'vpx_dsp/x86/variance_avx2.c',
           'vpx_dsp/x86/variance_impl_avx2.c'],
  'ERROR_CONCEALMENT': ['vp8/decoder/error_concealment.c'],
- 'EXPORTS': ['vpx/vp8.h',
+ 'EXPORTS': ['vpx/svc_context.h',
+             'vpx/vp8.h',
              'vpx/vp8cx.h',
              'vpx/vp8dx.h',
              'vpx/vpx_codec.h',
diff --git a/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp9/vp9.gyp b/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp9/vp9.gyp
index 9e02cd6e8d8..5387b39d01a 100644
--- a/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp9/vp9.gyp
+++ b/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp9/vp9.gyp
@@ -26,7 +26,7 @@
           ],
         }, {
           'include_dirs': [
-            '../../../../../../../libvpx',
+            '$(MOZ_LIBVPX_CFLAGS)',
           ],
 	}],
         ['build_vp9==1', {