diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp
index d8972277d4..330ea82a20 100644
--- a/webrtc/base/base.gyp
+++ b/webrtc/base/base.gyp
@@ -453,7 +453,7 @@
           },
         }, {
           'conditions': [
-            ['external_libraries==0', {
+            ['build_json==1', {
               'dependencies': [
                 '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
               ],
@@ -465,7 +465,7 @@
                 # When defined changes the include path for json.h to where it
                 # is expected to be when building json outside of the standalone
                 # build.
-                'WEBRTC_EXTERNAL',
+                'WEBRTC_EXTERNAL_JSON',
               ],
             }],
           ],
@@ -489,7 +489,7 @@
             ],
           },
           'conditions': [
-            ['external_libraries==0', {
+            ['build_ssl==1', {
               'dependencies': [
                 '<(DEPTH)/third_party/openssl/openssl.gyp:openssl',
               ],
@@ -556,7 +556,7 @@
             },
           },
            'conditions': [
-            ['external_libraries==0', {
+            ['build_ssl==1', {
               'dependencies': [
                 '<(DEPTH)/net/third_party/nss/ssl.gyp:libssl',
               ]
@@ -724,7 +724,7 @@
         }],
         ['OS == "mac" or OS == "ios" or OS == "win"', {
           'conditions': [
-            ['external_libraries==0', {
+            ['build_ssl==1', {
               'dependencies': [
                 '<(DEPTH)/net/third_party/nss/ssl.gyp:libssl',
                 '<(DEPTH)/third_party/nss/nss.gyp:nspr',
@@ -739,7 +739,7 @@
         }],
         ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
           'conditions': [
-            ['external_libraries==0', {
+            ['build_ssl==1', {
               'dependencies': [
                 '<(DEPTH)/build/linux/system.gyp:ssl',
               ],
diff --git a/webrtc/base/json.h b/webrtc/base/json.h
index a8f76be17c..9d45ded97d 100644
--- a/webrtc/base/json.h
+++ b/webrtc/base/json.h
@@ -14,7 +14,7 @@
 #include <string>
 #include <vector>
 
-#if !defined(WEBRTC_EXTERNAL)
+#if !defined(WEBRTC_EXTERNAL_JSON)
 #include "json/json.h"
 #else
 #include "third_party/jsoncpp/json.h"
diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi
index 5625c33255..cbc398e400 100644
--- a/webrtc/build/common.gypi
+++ b/webrtc/build/common.gypi
@@ -91,9 +91,11 @@
     'enable_protobuf%': 1,
 
     # Disable these to not build components which can be externally provided.
+    'build_json%': 1,
     'build_libjpeg%': 1,
     'build_libyuv%': 1,
     'build_libvpx%': 1,
+    'build_ssl%': 1,
 
     # Disable by default
     'have_dbus_glib%': 0,