diff --git a/BUILD.gn b/BUILD.gn
index 75b2055..770d3f2 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -19,7 +19,7 @@
   skia_use_libpng = true
   skia_use_libwebp = !is_fuchsia
   skia_use_mesa = false
-  skia_use_sfntly = !is_fuchsia
+  skia_use_sfntly = !is_fuchsia && !is_win  # TODO: icu on Windows, re-enable this.
   skia_use_vulkan = is_android && defined(ndk_api) && ndk_api >= 24
   skia_use_zlib = true
 
@@ -58,7 +58,10 @@
 # Skia public API, generally provided by :skia.
 config("skia_public") {
   include_dirs = skia_public_includes
-  defines = [ "SKIA_DLL" ]
+  defines = []
+  if (is_component_build) {
+    defines += [ "SKIA_DLL" ]
+  }
   if (is_fuchsia || is_linux) {
     defines += [ "SK_SAMPLES_FOR_X" ]
   }
@@ -535,6 +538,7 @@
 
   if (is_win) {
     sources += [
+      "src/fonts/SkFontMgr_indirect.cpp",
       "src/ports/SkDebug_win.cpp",
       "src/ports/SkFontHost_win.cpp",
       "src/ports/SkFontMgr_win_dw.cpp",
@@ -550,6 +554,7 @@
     ]
     sources -=
         [ get_path_info("src/utils/SkThreadUtils_pthread.cpp", "abspath") ]
+    libs += [ "User32.lib" ]  # For SkFontMgr_win_dw.cpp.
   } else {
     sources += [
       "src/ports/SkOSFile_posix.cpp",