diff --git a/tools/analyze/AnalysisWrappers.cpp b/tools/analyze/AnalysisWrappers.cpp
index 7cd0ba0723e..a0520d4a4ac 100644
--- a/tools/analyze/AnalysisWrappers.cpp
+++ b/tools/analyze/AnalysisWrappers.cpp
@@ -19,29 +19,10 @@
 
 #include "llvm/Module.h"
 #include "llvm/Pass.h"
-#include "llvm/Analysis/InstForest.h"
 #include "llvm/Support/CallSite.h"
 #include <iostream>
-
 using namespace llvm;
 
-namespace {
-  struct InstForestHelper : public FunctionPass {
-    Function *F;
-    virtual bool runOnFunction(Function &Func) { F = &Func; return false; }
-
-    void print(std::ostream &OS) const {
-      std::cout << InstForest<char>(F);
-    }
-    
-    virtual void getAnalysisUsage(AnalysisUsage &AU) const {
-      AU.setPreservesAll();
-    }
-  };
-
-  RegisterAnalysis<InstForestHelper> P1("instforest", "InstForest Printer");
-}
-
 namespace {
   /// ExternalFunctionsPassedConstants - This pass prints out call sites to
   /// external functions that are called with constant arguments.  This can be
diff --git a/tools/opt/AnalysisWrappers.cpp b/tools/opt/AnalysisWrappers.cpp
index 7cd0ba0723e..a0520d4a4ac 100644
--- a/tools/opt/AnalysisWrappers.cpp
+++ b/tools/opt/AnalysisWrappers.cpp
@@ -19,29 +19,10 @@
 
 #include "llvm/Module.h"
 #include "llvm/Pass.h"
-#include "llvm/Analysis/InstForest.h"
 #include "llvm/Support/CallSite.h"
 #include <iostream>
-
 using namespace llvm;
 
-namespace {
-  struct InstForestHelper : public FunctionPass {
-    Function *F;
-    virtual bool runOnFunction(Function &Func) { F = &Func; return false; }
-
-    void print(std::ostream &OS) const {
-      std::cout << InstForest<char>(F);
-    }
-    
-    virtual void getAnalysisUsage(AnalysisUsage &AU) const {
-      AU.setPreservesAll();
-    }
-  };
-
-  RegisterAnalysis<InstForestHelper> P1("instforest", "InstForest Printer");
-}
-
 namespace {
   /// ExternalFunctionsPassedConstants - This pass prints out call sites to
   /// external functions that are called with constant arguments.  This can be