diff --git a/include/llvm/Pass.h b/include/llvm/Pass.h
index aab79b4f420..d2f717991fa 100644
--- a/include/llvm/Pass.h
+++ b/include/llvm/Pass.h
@@ -291,7 +291,7 @@ public:
 ///      other basic block in the function.
 ///   3. Optimizations conform to all of the constraints of FunctionPasses.
 ///
-class BasicBlockPass : public FunctionPass {
+class BasicBlockPass : public Pass {
 public:
   /// doInitialization - Virtual method overridden by subclasses to do
   /// any necessary per-module initialization.
diff --git a/include/llvm/Transforms/Scalar.h b/include/llvm/Transforms/Scalar.h
index 4b388874392..ea5692b206b 100644
--- a/include/llvm/Transforms/Scalar.h
+++ b/include/llvm/Transforms/Scalar.h
@@ -19,8 +19,8 @@
 
 namespace llvm {
 
-class ModulePass;
 class FunctionPass;
+class Pass;
 class GetElementPtrInst;
 class PassInfo;
 class TerminatorInst;
@@ -52,7 +52,7 @@ FunctionPass *createSCCPPass();
 // without modifying the CFG of the function.  It is a BasicBlockPass, so it
 // runs efficiently when queued next to other BasicBlockPass's.
 //
-FunctionPass *createDeadInstEliminationPass();
+Pass *createDeadInstEliminationPass();
 
 //===----------------------------------------------------------------------===//
 //
@@ -249,7 +249,7 @@ extern const PassInfo *LowerSelectID;
 //
 //   AU.addRequiredID(LowerAllocationsID);
 //
-FunctionPass *createLowerAllocationsPass(bool LowerMallocArgToInteger = false);
+Pass *createLowerAllocationsPass(bool LowerMallocArgToInteger = false);
 extern const PassInfo *LowerAllocationsID;
 
 //===----------------------------------------------------------------------===//
diff --git a/lib/Transforms/Scalar/DCE.cpp b/lib/Transforms/Scalar/DCE.cpp
index cf1a7fc877d..eb5721583ca 100644
--- a/lib/Transforms/Scalar/DCE.cpp
+++ b/lib/Transforms/Scalar/DCE.cpp
@@ -53,7 +53,7 @@ namespace {
   RegisterPass<DeadInstElimination> X("die", "Dead Instruction Elimination");
 }
 
-FunctionPass *llvm::createDeadInstEliminationPass() {
+Pass *llvm::createDeadInstEliminationPass() {
   return new DeadInstElimination();
 }
 
diff --git a/lib/Transforms/Utils/LowerAllocations.cpp b/lib/Transforms/Utils/LowerAllocations.cpp
index 00f89ffc3d2..0213daf38c7 100644
--- a/lib/Transforms/Utils/LowerAllocations.cpp
+++ b/lib/Transforms/Utils/LowerAllocations.cpp
@@ -73,7 +73,7 @@ namespace {
 // Publically exposed interface to pass...
 const PassInfo *llvm::LowerAllocationsID = X.getPassInfo();
 // createLowerAllocationsPass - Interface to this file...
-FunctionPass *llvm::createLowerAllocationsPass(bool LowerMallocArgToInteger) {
+Pass *llvm::createLowerAllocationsPass(bool LowerMallocArgToInteger) {
   return new LowerAllocations(LowerMallocArgToInteger);
 }