diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py
index c6bbbd656..14b855474 100644
--- a/build/fbcode_builder/getdeps/builder.py
+++ b/build/fbcode_builder/getdeps/builder.py
@@ -486,6 +486,14 @@ if __name__ == "__main__":
         self.defines = defines or {}
         if extra_cmake_defines:
             self.defines.update(extra_cmake_defines)
+
+        try:
+            from .facebook.vcvarsall import extra_vc_cmake_defines
+        except ImportError:
+            pass
+        else:
+            self.defines.update(extra_vc_cmake_defines)
+
         self.loader = loader
         if build_opts.shared_libs:
             self.defines["BUILD_SHARED_LIBS"] = "ON"
diff --git a/build/fbcode_builder/manifests/boost b/build/fbcode_builder/manifests/boost
index 482757030..f544114e2 100644
--- a/build/fbcode_builder/manifests/boost
+++ b/build/fbcode_builder/manifests/boost
@@ -103,3 +103,6 @@ pch=off
 
 [b2.args.os=darwin]
 toolset=clang
+
+[b2.args.all(os=windows,fb=on)]
+toolset=msvc-14.2