diff --git a/include/llvm/Analysis/Verifier.h b/include/llvm/Analysis/Verifier.h
index 0742ad005ca..645f1fa3311 100644
--- a/include/llvm/Analysis/Verifier.h
+++ b/include/llvm/Analysis/Verifier.h
@@ -14,14 +14,14 @@
 #ifndef LLVM_ANALYSIS_VERIFIER_H
 #define LLVM_ANALYSIS_VERIFIER_H
 
-class Pass;
+class FunctionPass;
 class Module;
 class Function;
 
 // createVerifierPass - Check a module or function for validity.  If errors are
 // detected, error messages corresponding to the problem are printed to stderr.
 //
-Pass *createVerifierPass();
+FunctionPass *createVerifierPass();
 
 // verifyModule - Check a module for errors, printing messages on stderr.
 // Return true if the module is corrupt.  This should only be used for
diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp
index 2e43d88b85f..ace5775a0a7 100644
--- a/lib/VMCore/Verifier.cpp
+++ b/lib/VMCore/Verifier.cpp
@@ -557,7 +557,7 @@ void Verifier::visitIntrinsicFunctionCall(LLVMIntrinsic::ID ID, CallInst &CI) {
 //  Implement the public interfaces to this file...
 //===----------------------------------------------------------------------===//
 
-Pass *createVerifierPass() {
+FunctionPass *createVerifierPass() {
   return new Verifier();
 }
 
diff --git a/tools/extract/extract.cpp b/tools/extract/extract.cpp
index f3d165bf2fb..83592704713 100644
--- a/tools/extract/extract.cpp
+++ b/tools/extract/extract.cpp
@@ -8,6 +8,7 @@
 
 #include "llvm/Module.h"
 #include "llvm/PassManager.h"
+#include "llvm/Pass.h"
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/Bytecode/WriteBytecodePass.h"
 #include "llvm/Transforms/IPO.h"
diff --git a/tools/llvm-extract/llvm-extract.cpp b/tools/llvm-extract/llvm-extract.cpp
index f3d165bf2fb..83592704713 100644
--- a/tools/llvm-extract/llvm-extract.cpp
+++ b/tools/llvm-extract/llvm-extract.cpp
@@ -8,6 +8,7 @@
 
 #include "llvm/Module.h"
 #include "llvm/PassManager.h"
+#include "llvm/Pass.h"
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/Bytecode/WriteBytecodePass.h"
 #include "llvm/Transforms/IPO.h"