diff --git a/all.gyp b/all.gyp
index bd8ee1301..a399a7872 100644
--- a/all.gyp
+++ b/all.gyp
@@ -8,7 +8,7 @@
 
 {
   'variables': {
-    'libjingle_root%': '<(DEPTH)',
+    'talk_root%': '<(DEPTH)/talk',
   },
   'targets': [
     {
@@ -17,9 +17,9 @@
       'dependencies': [
         'third_party/openmax_dl/dl/dl.gyp:*',
         'webrtc/webrtc.gyp:*',
-        '<(libjingle_root)/talk/libjingle.gyp:*',
-        '<(libjingle_root)/talk/libjingle_examples.gyp:*',
-        '<(libjingle_root)/talk/libjingle_tests.gyp:*',
+        '<(talk_root)/libjingle.gyp:*',
+        '<(talk_root)/libjingle_examples.gyp:*',
+        '<(talk_root)/libjingle_tests.gyp:*',
       ],
       'conditions': [
         ['OS=="android"', {
diff --git a/talk/build/common.gypi b/talk/build/common.gypi
index 8261c2085..85d2f5871 100644
--- a/talk/build/common.gypi
+++ b/talk/build/common.gypi
@@ -30,8 +30,8 @@
 {
   'variables': {
     'webrtc_root%': '<(DEPTH)/webrtc',
-    # TODO(ronghuawu): Chromium build will need a different libjingle_root.
-    'libjingle_root%': '<(DEPTH)',
+    # TODO(ronghuawu): Chromium build will need a different talk_root.
+    'talk_root%': '<(DEPTH)/talk',
     # TODO(ronghuawu): For now, disable the Chrome plugins, which causes a
     # flood of chromium-style warnings.
     'clang_use_chrome_plugins%': 0,
@@ -46,7 +46,7 @@
   },
   'target_defaults': {
     'include_dirs': [
-      '<(libjingle_root)',
+      '<(talk_root)/..',
       '<(DEPTH)',
       '../../third_party',
       '../../third_party/webrtc',