diff --git a/lib/Transforms/ObjCARC/ObjCARC.cpp b/lib/Transforms/ObjCARC/ObjCARC.cpp
index dceb567d10e..b86dff17fc2 100644
--- a/lib/Transforms/ObjCARC/ObjCARC.cpp
+++ b/lib/Transforms/ObjCARC/ObjCARC.cpp
@@ -14,15 +14,14 @@
 //===----------------------------------------------------------------------===//
 
 #include "ObjCARC.h"
-
-#include "llvm-c/Initialization.h"
-#include "llvm/Analysis/Passes.h"
-#include "llvm/Analysis/Verifier.h"
-#include "llvm/IR/DataLayout.h"
+#include "llvm-c/Core.h"
 #include "llvm/InitializePasses.h"
-#include "llvm/PassManager.h"
 #include "llvm/Support/CommandLine.h"
 
+namespace llvm {
+  class PassRegistry;
+}
+
 using namespace llvm;
 using namespace llvm::objcarc;
 
diff --git a/lib/Transforms/ObjCARC/ObjCARCAPElim.cpp b/lib/Transforms/ObjCARC/ObjCARCAPElim.cpp
index c849bcd6860..b8c51c2b03e 100644
--- a/lib/Transforms/ObjCARC/ObjCARCAPElim.cpp
+++ b/lib/Transforms/ObjCARC/ObjCARCAPElim.cpp
@@ -176,4 +176,3 @@ bool ObjCARCAPElim::runOnModule(Module &M) {
 
   return Changed;
 }
-
diff --git a/lib/Transforms/ObjCARC/ObjCARCAliasAnalysis.cpp b/lib/Transforms/ObjCARC/ObjCARCAliasAnalysis.cpp
index be30112e02b..9747ce015a3 100644
--- a/lib/Transforms/ObjCARC/ObjCARCAliasAnalysis.cpp
+++ b/lib/Transforms/ObjCARC/ObjCARCAliasAnalysis.cpp
@@ -21,8 +21,18 @@
 //===----------------------------------------------------------------------===//
 
 #define DEBUG_TYPE "objc-arc-aa"
+
 #include "ObjCARC.h"
 #include "ObjCARCAliasAnalysis.h"
+#include "llvm/IR/Instruction.h"
+#include "llvm/InitializePasses.h"
+#include "llvm/PassAnalysisSupport.h"
+#include "llvm/PassSupport.h"
+
+namespace llvm {
+  class Function;
+  class Value;
+}
 
 #include "llvm/IR/Instruction.h"
 #include "llvm/InitializePasses.h"
@@ -161,4 +171,3 @@ ObjCARCAliasAnalysis::getModRefInfo(ImmutableCallSite CS1,
   // and OnlyAccessesArgumentPointees calls or other well-behaved calls.
   return AliasAnalysis::getModRefInfo(CS1, CS2);
 }
-
diff --git a/lib/Transforms/ObjCARC/ObjCARCExpand.cpp b/lib/Transforms/ObjCARC/ObjCARCExpand.cpp
index ffc54050d0b..633f9884842 100644
--- a/lib/Transforms/ObjCARC/ObjCARCExpand.cpp
+++ b/lib/Transforms/ObjCARC/ObjCARCExpand.cpp
@@ -24,8 +24,27 @@
 //===----------------------------------------------------------------------===//
 
 #define DEBUG_TYPE "objc-arc-expand"
+
 #include "ObjCARC.h"
 
+#include "llvm/ADT/StringRef.h"
+#include "llvm/IR/Function.h"
+#include "llvm/IR/Instruction.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Value.h"
+#include "llvm/Pass.h"
+#include "llvm/PassAnalysisSupport.h"
+#include "llvm/PassRegistry.h"
+#include "llvm/PassSupport.h"
+#include "llvm/Support/Casting.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/Support/InstIterator.h"
+#include "llvm/Support/raw_ostream.h"
+
+namespace llvm {
+  class Module;
+}
+
 using namespace llvm;
 using namespace llvm::objcarc;
 
@@ -108,4 +127,3 @@ bool ObjCARCExpand::runOnFunction(Function &F) {
 
   return Changed;
 }
-