diff --git a/clang-tools-extra/include-fixer/SymbolIndexManager.h b/clang-tools-extra/include-fixer/SymbolIndexManager.h
index e1e52879dd5e..feb5de3bd43a 100644
--- a/clang-tools-extra/include-fixer/SymbolIndexManager.h
+++ b/clang-tools-extra/include-fixer/SymbolIndexManager.h
@@ -13,8 +13,19 @@
 #include "SymbolIndex.h"
 #include "find-all-symbols/SymbolInfo.h"
 #include "llvm/ADT/StringRef.h"
+
+#ifdef _MSC_VER
+// Disable warnings from ppltasks.h transitively included by <future>.
+#pragma warning(push)
+#pragma warning(disable:4530)
+#endif
+
 #include <future>
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 namespace clang {
 namespace include_fixer {
 
diff --git a/clang-tools-extra/include-fixer/plugin/CMakeLists.txt b/clang-tools-extra/include-fixer/plugin/CMakeLists.txt
index fb05e84485e2..2799fd4af69a 100644
--- a/clang-tools-extra/include-fixer/plugin/CMakeLists.txt
+++ b/clang-tools-extra/include-fixer/plugin/CMakeLists.txt
@@ -9,4 +9,5 @@ add_clang_library(clangIncludeFixerPlugin
   clangParse
   clangSema
   clangTooling
+  ${PTHREAD_LIB}
   )