diff --git a/all.gyp b/all.gyp
index 27cc650038..f7e397dca2 100644
--- a/all.gyp
+++ b/all.gyp
@@ -7,16 +7,18 @@
 # be found in the AUTHORS file in the root of the source tree.
 
 {
-  'includes': ['talk/build/common.gypi'],
+  'variables': {
+    'libjingle_root%': '<(DEPTH)',
+  },
   'targets': [
     {
       'target_name': 'All',
       'type': 'none',
       'dependencies': [
         'webrtc/webrtc.gyp:*',
-        'talk/libjingle.gyp:*',
-        'talk/libjingle_examples.gyp:*',
-        'talk/libjingle_tests.gyp:*',
+        '<(libjingle_root)/talk/libjingle.gyp:*',
+        '<(libjingle_root)/talk/libjingle_examples.gyp:*',
+        '<(libjingle_root)/talk/libjingle_tests.gyp:*',
       ],
       'conditions': [
         ['OS=="android"', {
diff --git a/talk/build/common.gypi b/talk/build/common.gypi
index 4c762d1ddf..c81297482b 100644
--- a/talk/build/common.gypi
+++ b/talk/build/common.gypi
@@ -46,7 +46,8 @@
   },
   'target_defaults': {
     'include_dirs': [
-      '../..',
+      '<(libjingle_root)',
+      '<(DEPTH)',
       '../../third_party',
       '../../third_party/webrtc',
       '../../webrtc',