Index: COFF/Writer.cpp
===================================================================
--- COFF/Writer.cpp
+++ COFF/Writer.cpp
@@ -26,7 +26,6 @@
 #include "llvm/Support/FileOutputBuffer.h"
 #include "llvm/Support/Parallel.h"
 #include "llvm/Support/RandomNumberGenerator.h"
-#include "llvm/Support/raw_ostream.h"
 #include <algorithm>
 #include <cstdio>
 #include <map>
Index: ELF/InputSection.cpp
===================================================================
--- ELF/InputSection.cpp
+++ ELF/InputSection.cpp
@@ -194,7 +194,7 @@
 }
 
 // Uncompress section contents. Note that this function is called
-// from parallel_for_each, so it must be thread-safe.
+// from parallelForEach, so it must be thread-safe.
 void InputSectionBase::uncompress() {
   Decompressor Dec = check(Decompressor::create(Name, toStringRef(Data),
                                                 Config->IsLE, Config->Is64));
@@ -920,7 +920,7 @@
 // that need to be linked. This is responsible to split section contents
 // into small chunks for further processing.
 //
-// Note that this function is called from parallel_for_each. This must be
+// Note that this function is called from parallelForEach. This must be
 // thread-safe (i.e. no memory allocation from the pools).
 void MergeInputSection::splitIntoPieces() {
   ArrayRef<uint8_t> Data = this->Data;
Index: ELF/Threads.h
===================================================================
--- ELF/Threads.h
+++ ELF/Threads.h
@@ -30,7 +30,7 @@
 //  - We have tens of millions of small strings when constructing a
 //    mergeable string section.
 //
-// For the cases such as the former, we can just use parallel_for_each
+// For the cases such as the former, we can just use parallelForEach
 // instead of std::for_each (or a plain for loop). Because tasks are
 // completely independent from each other, we can run them in parallel
 // without any coordination between them. That's very easy to understand
Index: ELF/Writer.cpp
===================================================================
--- ELF/Writer.cpp
+++ ELF/Writer.cpp
@@ -23,7 +23,6 @@
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/Support/FileOutputBuffer.h"
-#include "llvm/Support/raw_ostream.h"
 #include <climits>
 
 using namespace llvm;