diff --git a/llvm/tools/llvm-extract/llvm-extract.cpp b/llvm/tools/llvm-extract/llvm-extract.cpp
index 932f19e..b26fd9c 100644
--- a/llvm/tools/llvm-extract/llvm-extract.cpp
+++ b/llvm/tools/llvm-extract/llvm-extract.cpp
@@ -64,7 +64,7 @@
     }
 
     // Figure out which function we should extract
-    Function *F = M.get()->getNamedFunction(ExtractFunc);
+    Function *F = M.get()->getFunction(ExtractFunc);
     if (F == 0) {
       cerr << argv[0] << ": program doesn't contain function named '"
            << ExtractFunc << "'!\n";
@@ -80,6 +80,7 @@
     if (!DeleteFn)
       Passes.add(createGlobalDCEPass());           // Delete unreachable globals
     Passes.add(createDeadTypeEliminationPass());   // Remove dead types...
+    Passes.add(createStripDeadPrototypesPass());   // Remove dead func decls
 
     std::ostream *Out = 0;