diff --git a/BUILD.gn b/BUILD.gn
index 64e79b191ff6..3be755d4a7f9 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -38,7 +38,6 @@ group("root") {
     "//content",
     "//crypto",
     "//extensions/common/api:extensions_api",
-    "//dbus",
     "//device/usb",
     "//gin",
     "//gpu",
@@ -104,6 +103,7 @@ group("root") {
 
   if (is_linux) {
     deps += [
+      "//dbus",
       "//third_party/fontconfig",
       "//third_party/freetype2",
     ]
@@ -131,7 +131,6 @@ group("root") {
     deps -= [
       "//cc",
       "//content",
-      "//dbus",
       "//extensions/common/api:extensions_api",
       "//pdf",  # Not compiled on Android in GYP yet, either.
       "//ppapi:ppapi_c",
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 31eccc43b6eb..89089da35f23 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -245,7 +245,10 @@ source_set("browser") {
   if (use_x11) {
     configs += [ "//build/config/linux:x11" ]
   } else {
-    sources -= [ "renderer_host/web_input_event_aurax11.cc" ]
+    sources -= [
+      "power_save_blocker_x11.cc",
+      "renderer_host/web_input_event_aurax11.cc",
+    ]
   }
 
   if (use_pango) {
@@ -339,6 +342,12 @@ source_set("browser") {
     sources += rebase_path(
       content_browser_gypi_values.compositor_browser_sources,
       ".", "//content")
+    if (!use_x11) {
+      sources -= [
+        "compositor/software_output_device_x11.cc",
+        "compositor/software_output_device_x11.h",
+      ]
+    }
     deps += [ "//ui/compositor" ]
   }
 
diff --git a/content/ppapi_plugin/BUILD.gn b/content/ppapi_plugin/BUILD.gn
index b39141c83cf8..fae7d1af8518 100644
--- a/content/ppapi_plugin/BUILD.gn
+++ b/content/ppapi_plugin/BUILD.gn
@@ -23,6 +23,7 @@ source_set("ppapi_plugin") {
     "//content:export",
     "//mojo/public/interfaces/service_provider",
     "//ppapi:ppapi_ipc",
+    "//skia",
     "//third_party/icu",
     #"//third_party/WebKit/public:blink",  TODO(GYP)
     # TODO(GYP) remove this when blink is enabled:
diff --git a/courgette/BUILD.gn b/courgette/BUILD.gn
index b4bbd2b8f711..efbab04dc3cf 100644
--- a/courgette/BUILD.gn
+++ b/courgette/BUILD.gn
@@ -107,7 +107,7 @@ test("courgette_unittests") {
 
   if (is_win) {
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-    cflags += [ "/wd4267" ]
+    cflags = [ "/wd4267" ]
   }
 
   deps = [
diff --git a/third_party/yasm/BUILD.gn b/third_party/yasm/BUILD.gn
index 1693e3f7a730..4ac36d1d2ab5 100644
--- a/third_party/yasm/BUILD.gn
+++ b/third_party/yasm/BUILD.gn
@@ -47,7 +47,9 @@ if (current_toolchain == host_toolchain) {
       "source/config/$os/libyasm-stdint.h",
     ]
     defines = [ "HAVE_CONFIG_H" ]
-    cflags = [ "-std=gnu99" ]
+    if (is_posix) {
+      cflags = [ "-std=gnu99" ]
+    }
   }
 
   executable("genmacro") {
@@ -122,7 +124,9 @@ if (current_toolchain == host_toolchain) {
                  "//build/config/compiler:no_chromium_code" ]
 
     # re2c is missing CLOSEVOP from one switch.
-    cflags = [ "-Wno-switch" ]
+    if (is_posix) {
+      cflags = [ "-Wno-switch" ]
+    }
   }
 
   executable("yasm") {
@@ -218,9 +222,13 @@ if (current_toolchain == host_toolchain) {
     # directory, but the gen_x86_insn.py script does not make this easy.
     include_dirs = [ yasm_gen_include_dir ]
 
-    cflags = [ "-ansi", "-pedantic" ]
-    if (is_clang) {
-      cflags += [ "-Wno-incompatible-pointer-types" ]
+    if (is_win) {
+      cflags = [ "/wd4267" ]  # size_t to int conversion.
+    } else {
+      cflags = [ "-ansi", "-pedantic" ]
+      if (is_clang) {
+        cflags += [ "-Wno-incompatible-pointer-types" ]
+      }
     }
 
     # TODO(ajwong): This should take most of the generated output as
@@ -230,6 +238,7 @@ if (current_toolchain == host_toolchain) {
       ":compile_gperf_for_include",
       ":compile_nasm_macros",
       ":compile_nasm_version",
+      ":compile_re2c_lc3b",
       ":compile_win64_gas",
       ":compile_win64_nasm",
       ":compile_re2c",
diff --git a/tools/gn/secondary/third_party/angle/BUILD.gn b/tools/gn/secondary/third_party/angle/BUILD.gn
index bf151d1433b2..1dbe942e7e29 100644
--- a/tools/gn/secondary/third_party/angle/BUILD.gn
+++ b/tools/gn/secondary/third_party/angle/BUILD.gn
@@ -325,6 +325,8 @@ if (is_win) {
       "src/libGLESv2/Float16ToFloat32.cpp",
       "src/libGLESv2/Framebuffer.cpp",
       "src/libGLESv2/Framebuffer.h",
+      "src/libGLESv2/FramebufferAttachment.cpp",
+      "src/libGLESv2/FramebufferAttachment.h",
       "src/libGLESv2/HandleAllocator.cpp",
       "src/libGLESv2/HandleAllocator.h",
       "src/libGLESv2/Program.cpp",
diff --git a/tools/gn/secondary/third_party/nss/BUILD.gn b/tools/gn/secondary/third_party/nss/BUILD.gn
index a0c167458558..b1145fd40e07 100644
--- a/tools/gn/secondary/third_party/nss/BUILD.gn
+++ b/tools/gn/secondary/third_party/nss/BUILD.gn
@@ -581,6 +581,7 @@ if (is_linux) {
       "nss/lib/freebl/dsa.c",
       "nss/lib/freebl/ec.c",
       "nss/lib/freebl/ec.h",
+      "nss/lib/freebl/ecdecode.c",
       "nss/lib/freebl/ecl/ec2.h",
       "nss/lib/freebl/ecl/ecl-curve.h",
       "nss/lib/freebl/ecl/ecl-exp.h",
@@ -722,7 +723,6 @@ if (is_linux) {
       "nss/lib/smime/cmsreclist.h",
       "nss/lib/smime/cmst.h",
       "nss/lib/smime/smime.h",
-      "nss/lib/softoken/ecdecode.c",
       "nss/lib/softoken/fipsaudt.c",
       "nss/lib/softoken/fipstest.c",
       "nss/lib/softoken/fipstokn.c",