diff --git a/src/build/common.gypi b/src/build/common.gypi
index 38e097deb..7621f9afd 100644
--- a/src/build/common.gypi
+++ b/src/build/common.gypi
@@ -103,6 +103,8 @@
     'conditions': [
       ['build_with_chromium==1', {
         'defines': [
+          # Changes settings for Chromium build.
+          'WEBRTC_CHROMIUM_BUILD',
           # This turns off tracing in webrtc to reduce the noise from
           # the Chrome memory bots. Down the line we will enable WebRTC
           # tracing for Chromium and remove this.
diff --git a/src/modules/media_file/source/media_file_utility.cc b/src/modules/media_file/source/media_file_utility.cc
index 07f47e07f..135b7051b 100644
--- a/src/modules/media_file/source/media_file_utility.cc
+++ b/src/modules/media_file/source/media_file_utility.cc
@@ -1493,7 +1493,10 @@ WebRtc_Word32 ModuleFileUtility::InitCompressedReading(
         start,
         stop);
 
+#if defined(WEBRTC_CODEC_GSMAMR) || defined(WEBRTC_CODEC_GSMAMRWB) || \
+    defined(WEBRTC_CODEC_ILBC)
     WebRtc_Word16 read_len = 0;
+#endif
     _codecId = kCodecNoCodec;
     _playoutPositionMs = 0;
     _reading = false;
diff --git a/webrtc.gyp b/webrtc.gyp
index b94f4b7ea..60e8a91c8 100644
--- a/webrtc.gyp
+++ b/webrtc.gyp
@@ -26,11 +26,5 @@
     },
   ],
   'conditions': [
-    ['build_with_chromium==1', {
-      # Exclude components in engine_configuration.h.
-      'defines': [
-        'WEBRTC_CHROMIUM_BUILD',
-      ],
-    }, ],  # build_with_chromium=1
   ],  # conditions
 }