diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi
index 1afb8f695b..6ec0f1c942 100644
--- a/webrtc/build/common.gypi
+++ b/webrtc/build/common.gypi
@@ -263,31 +263,8 @@
       ['build_with_chromium==1', {
         'defines': [
           # Changes settings for Chromium build.
-          # TODO(kjellander): Cleanup unused ones and move defines closer to the
-          # source when webrtc:4256 is completed.
-          'ENABLE_EXTERNAL_AUTH',
-          'EXPAT_RELATIVE_PATH',
-          'FEATURE_ENABLE_SSL',
-          'GTEST_RELATIVE_PATH',
-          'HAVE_OPENSSL_SSL_H',
-          'HAVE_SCTP',
-          'HAVE_SRTP',
-          'HAVE_WEBRTC_VIDEO',
-          'HAVE_WEBRTC_VOICE',
-          'LOGGING_INSIDE_WEBRTC',
-          'NO_MAIN_THREAD_WRAPPING',
-          'NO_SOUND_SYSTEM',
-          'SRTP_RELATIVE_PATH',
-          'SSL_USE_OPENSSL',
-          'USE_WEBRTC_DEV_BRANCH',
           'WEBRTC_CHROMIUM_BUILD',
-        ],
-        'conditions': [
-          ['OS=="win" and target_arch=="ia32"', {
-            'defines': [
-              '_USE_32BIT_TIME_T',
-            ],
-          }],
+          'LOGGING_INSIDE_WEBRTC',
         ],
         'include_dirs': [
           # Include the top-level directory when building in Chrome, so we can
@@ -462,21 +439,6 @@
            }],
          ],
       }],
-      ['chromeos==1', {
-        'defines': [
-          'CHROMEOS',
-        ],
-      }],
-      ['os_bsd==1', {
-        'defines': [
-          'BSD',
-        ],
-      }],
-      ['OS=="openbsd"', {
-        'defines': [
-          'OPENBSD',
-        ],
-      }],
       ['include_internal_audio_device==1', {
         'defines': [
           'WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE',
@@ -494,14 +456,6 @@
         ['build_with_chromium==1', {
           'defines': [
             # Changes settings for Chromium build.
-            # TODO(kjellander): Cleanup unused ones and move defines closer to
-            # the source when webrtc:4256 is completed.
-            'FEATURE_ENABLE_SSL',
-            'FEATURE_ENABLE_VOICEMAIL',
-            'EXPAT_RELATIVE_PATH',
-            'GTEST_RELATIVE_PATH',
-            'NO_MAIN_THREAD_WRAPPING',
-            'NO_SOUND_SYSTEM',
             'WEBRTC_CHROMIUM_BUILD',
           ],
           'include_dirs': [
@@ -529,7 +483,6 @@
         ['OS=="win"', {
           'defines': [
             'WEBRTC_WIN',
-            '_CRT_SECURE_NO_WARNINGS',  # Suppres warnings about _vsnprinf
           ],
         }],
         ['OS=="linux"', {
@@ -550,21 +503,6 @@
             'WEBRTC_POSIX',
           ],
         }],
-        ['chromeos==1', {
-          'defines': [
-            'CHROMEOS',
-          ],
-        }],
-        ['os_bsd==1', {
-          'defines': [
-            'BSD',
-          ],
-        }],
-        ['OS=="openbsd"', {
-          'defines': [
-            'OPENBSD',
-          ],
-        }],
       ],
     },
   }, # target_defaults
diff --git a/webrtc/media/media.gyp b/webrtc/media/media.gyp
index 9994cfc2b3..621af832e8 100644
--- a/webrtc/media/media.gyp
+++ b/webrtc/media/media.gyp
@@ -81,6 +81,7 @@
         'engine/webrtccommon.h',
         'engine/webrtcmediaengine.cc',
         'engine/webrtcmediaengine.h',
+        'engine/webrtcmediaengine.cc',
         'engine/webrtcvideocapturer.cc',
         'engine/webrtcvideocapturer.h',
         'engine/webrtcvideocapturerfactory.h',