diff --git a/BUILD.gn b/BUILD.gn
index 9cb8581adf92..6bf9a3ff4819 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -239,7 +239,6 @@ static_library("electron_lib") {
     "//ppapi/proxy",
     "//ppapi/shared_impl",
     "//printing",
-    "//services/device/wake_lock/power_save_blocker",  # TODO: this requires a visibility patch to chromium src
     "//skia",
     "//third_party/WebKit/public:blink",
     "//third_party/boringssl",
@@ -254,13 +253,19 @@ static_library("electron_lib") {
     "//v8",
   ]
 
+  # TODO: this requires a visibility patch to chromium src. it would be better
+  # to use the publicly-available API, which I think is mojo-based. Once
+  # electron switches to using the public API, we can remove this from the deps
+  # list and remove the visibility patch from chromium.
+  deps += [ "//services/device/wake_lock/power_save_blocker" ]
+
   include_dirs = [
     "chromium_src",
     ".",
     "$target_gen_dir",
 
     # TODO(nornagon): replace usage of SchemeRegistry by an actually exported
-    # API of blink, then delete this include dir.
+    # API of blink, then remove this from the include_dirs.
     "//third_party/WebKit/Source",
   ]
 
@@ -714,7 +719,6 @@ if (is_mac) {
       ]
 
       deps += [
-        # TODO: move non-windows specific deps into the non-windows-specific list
         "//third_party/breakpad:breakpad_handler",
         "//third_party/breakpad:breakpad_sender",
         "//ui/native_theme:native_theme_browser",
@@ -733,9 +737,11 @@ if (is_mac) {
       configs += [ "//build/config/win:windowed" ]
 
       ldflags = [
-        # TODO: these are for win7 compatibility, are there other things we need to do for that?
-        "/DELAYLOAD:API-MS-WIN-CORE-WINRT-L1-1-0.DLL",
-        "/DELAYLOAD:API-MS-WIN-CORE-WINRT-STRING-L1-1-0.DLL",
+        # Windows 7 doesn't have these DLLs.
+        # TODO: are there other DLLs we need to list here to be win7
+        # compatible?
+        "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
+        "/DELAYLOAD:api-ms-win-core-winrt-string-l1-1-0.dll",
       ]
     }
     if (is_linux) {
diff --git a/build/args/release.gn b/build/args/release.gn
index 99c4eca348c0..d363ebd458db 100644
--- a/build/args/release.gn
+++ b/build/args/release.gn
@@ -1,6 +1,5 @@
 import("all.gn")
 is_component_build = false
-is_component_ffmpeg = true
 is_official_build = true
 strip_debug_info = true
 
@@ -10,3 +9,9 @@ strip_debug_info = true
 # The initialization of the decoder depends on whether ffmpeg has
 # been built with H.264 support.
 rtc_use_h264 = proprietary_codecs
+
+# By default, Electron builds ffmpeg with proprietary codecs enabled. In order
+# to facilitate users who don't want to ship proprietary codecs in ffmpeg, or
+# who have an LGPL requirement to ship ffmpeg as a dynamically linked library,
+# we build ffmpeg as a shared library.
+is_component_ffmpeg = true