diff --git a/webrtc/base/base_tests.gyp b/webrtc/base/base_tests.gyp
index 8248cef9da..bc33028694 100644
--- a/webrtc/base/base_tests.gyp
+++ b/webrtc/base/base_tests.gyp
@@ -23,11 +23,19 @@
         'testechoserver.h',
         'testutils.h',
       ],
+      'defines': [
+        'GTEST_RELATIVE_PATH',
+      ],
       'dependencies': [
         'base.gyp:rtc_base',
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(webrtc_root)/test/test.gyp:field_trial',
       ],
+      'direct_dependent_settings': {
+        'defines': [
+          'GTEST_RELATIVE_PATH',
+        ],
+      },
       'export_dependent_settings': [
         '<(DEPTH)/testing/gtest.gyp:gtest',
       ],
diff --git a/webrtc/base/gunit.h b/webrtc/base/gunit.h
index 986d4dcb62..1a6c36374e 100644
--- a/webrtc/base/gunit.h
+++ b/webrtc/base/gunit.h
@@ -13,7 +13,11 @@
 
 #include "webrtc/base/logging.h"
 #include "webrtc/base/thread.h"
+#if defined(GTEST_RELATIVE_PATH)
 #include "testing/gtest/include/gtest/gtest.h"
+#else
+#include "testing/base/public/gunit.h"
+#endif
 
 // Wait until "ex" is true, or "timeout" expires.
 #define WAIT(ex, timeout)                                                     \
diff --git a/webrtc/base/gunit_prod.h b/webrtc/base/gunit_prod.h
index 9850ed85d6..dc39bbd0eb 100644
--- a/webrtc/base/gunit_prod.h
+++ b/webrtc/base/gunit_prod.h
@@ -15,7 +15,10 @@
 // Android doesn't use gtest at all, so anything that relies on gtest should
 // check this define first.
 #define NO_GTEST
-#include "testing/gtest/include/gtest/gtest_prod.h"
+#elif defined (GTEST_RELATIVE_PATH)
+#include "gtest/gtest_prod.h"
+#else
+#include "testing/base/gunit_prod.h"
 #endif
 
 #endif  // WEBRTC_BASE_GUNIT_PROD_H_
diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi
index 1409e0b1d3..5335cc8b16 100644
--- a/webrtc/build/common.gypi
+++ b/webrtc/build/common.gypi
@@ -64,6 +64,7 @@
     'webrtc_vp9_dir%': '<(webrtc_vp9_dir)',
     'include_ilbc%': '<(include_ilbc)',
     'include_opus%': '<(include_opus)',
+    'rtc_relative_path%': 1,
     'external_libraries%': '0',
     'json_root%': '<(DEPTH)/third_party/jsoncpp/source/include/',
     # openssl needs to be defined or gyp will complain. Is is only used when
@@ -237,6 +238,9 @@
            '<!@(pkg-config --cflags dbus-glib-1)',
          ],
       }],
+      ['rtc_relative_path==1', {
+        'defines': ['EXPAT_RELATIVE_PATH',],
+      }],
       ['os_posix==1', {
         'configurations': {
           'Debug_Base': {
diff --git a/webrtc/libjingle/xmllite/xmlbuilder.h b/webrtc/libjingle/xmllite/xmlbuilder.h
index abb3433fa6..08bb5ec166 100644
--- a/webrtc/libjingle/xmllite/xmlbuilder.h
+++ b/webrtc/libjingle/xmllite/xmlbuilder.h
@@ -17,7 +17,11 @@
 #include "webrtc/libjingle/xmllite/xmlparser.h"
 #include "webrtc/base/scoped_ptr.h"
 
+#ifdef EXPAT_RELATIVE_PATH
 #include "expat.h"
+#else
+#include "third_party/expat/v2_0_1/Source/lib/expat.h"
+#endif  // EXPAT_RELATIVE_PATH
 
 namespace buzz {
 
diff --git a/webrtc/libjingle/xmllite/xmlparser.h b/webrtc/libjingle/xmllite/xmlparser.h
index 00d562ec21..131c585e4d 100644
--- a/webrtc/libjingle/xmllite/xmlparser.h
+++ b/webrtc/libjingle/xmllite/xmlparser.h
@@ -14,7 +14,11 @@
 #include <string>
 
 #include "webrtc/libjingle/xmllite/xmlnsstack.h"
+#ifdef EXPAT_RELATIVE_PATH
 #include "expat.h"
+#else
+#include "third_party/expat/v2_0_1/Source/lib/expat.h"
+#endif  // EXPAT_RELATIVE_PATH
 
 struct XML_ParserStruct;
 typedef struct XML_ParserStruct* XML_Parser;
diff --git a/webrtc/libjingle/xmpp/xmppstanzaparser.cc b/webrtc/libjingle/xmpp/xmppstanzaparser.cc
index 87398bcbba..035bb0b6f1 100644
--- a/webrtc/libjingle/xmpp/xmppstanzaparser.cc
+++ b/webrtc/libjingle/xmpp/xmppstanzaparser.cc
@@ -13,7 +13,11 @@
 #include "webrtc/libjingle/xmllite/xmlelement.h"
 #include "webrtc/libjingle/xmpp/constants.h"
 #include "webrtc/base/common.h"
+#ifdef EXPAT_RELATIVE_PATH
 #include "expat.h"
+#else
+#include "third_party/expat/v2_0_1/Source/lib/expat.h"
+#endif
 
 namespace buzz {
 
diff --git a/webrtc/webrtc_tests.gypi b/webrtc/webrtc_tests.gypi
index b194121850..8c3512a7c8 100644
--- a/webrtc/webrtc_tests.gypi
+++ b/webrtc/webrtc_tests.gypi
@@ -269,6 +269,9 @@
         'base/socketaddress_unittest.cc',
         'base/virtualsocket_unittest.cc',
       ],
+      'defines': [
+        'GTEST_RELATIVE_PATH',
+      ],
       'dependencies': [
         '<(DEPTH)/testing/gtest.gyp:gtest',
         'base/base.gyp:rtc_base',