--- a/media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi
+++ b/media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi
@@ -61,16 +61,17 @@
           'target_name': 'video_capture_module_internal_impl',
           'type': 'static_library',
           'dependencies': [
             'video_capture_module',
             '<(webrtc_root)/common.gyp:webrtc_common',
           ],
 	  'cflags_mozilla': [
 	    '$(NSPR_CFLAGS)',
+	    '$(GONK_KERNEL_INCLUDES)',
           ],
           'conditions': [
            ['include_v4l2_video_capture==1', {
               'sources': [
                 'linux/device_info_linux.cc',
                 'linux/device_info_linux.h',
                 'linux/video_capture_linux.cc',
                 'linux/video_capture_linux.h',

--- a/old-configure.in
+++ b/old-configure.in
@@ -121,16 +121,18 @@ if test -n "$gonkdir"; then
         AC_SUBST(MOZ_OMX_DECODER)
         MOZ_OMX_ENCODER=1
         AC_SUBST(MOZ_OMX_ENCODER)
         AC_DEFINE(MOZ_OMX_ENCODER)
         MOZ_SECUREELEMENT=1
         ;;
     19)
         CPPFLAGS="-I$gonkdir/frameworks/native/include -I$gonkdir/frameworks/av/include -I$gonkdir/frameworks/av/include/media -I$gonkdir/frameworks/av/include/camera -I$gonkdir/frameworks/native/include/media/openmax -I$gonkdir/frameworks/av/media/libstagefright/include $CPPFLAGS"
+        GONK_KERNEL_INCLUDES="-I$gonkdir/bionic/libc/kernel/common -I$gonkdir/bionic/libc/kernel/arch-${CPU_ARCH}"
+        AC_SUBST(GONK_KERNEL_INCLUDES)
         MOZ_B2G_CAMERA=1
         MOZ_NFC=1
         MOZ_OMX_DECODER=1
         MOZ_OMX_ENCODER=1
         AC_DEFINE(MOZ_OMX_ENCODER)
         MOZ_AUDIO_OFFLOAD=1
         MOZ_SECUREELEMENT=1
         AC_SUBST(MOZ_AUDIO_OFFLOAD)