diff --git a/tools/bugpoint/BugDriver.h b/tools/bugpoint/BugDriver.h
index c3c847f..e259dd9 100644
--- a/tools/bugpoint/BugDriver.h
+++ b/tools/bugpoint/BugDriver.h
@@ -17,9 +17,12 @@
 #define BUGDRIVER_H
 
 #include "llvm/ADT/DenseMap.h"
+#include "llvm/Support/CommandLine.h"
 #include <vector>
 #include <string>
 
+extern llvm::cl::opt<bool> StripDebug;
+
 namespace llvm {
 
 class Value;
@@ -172,9 +175,7 @@
   void compileProgram(Module *M, std::string *Error);
 
   /// executeProgram - This method runs "Program", capturing the output of the
-  /// program to a file.  The recommended filename will be filled in with the
-  /// name of the file with the captured output.  If there is a problem with
-  /// the code generator (e.g., llc crashes), this will throw an exception.
+  /// program to a file.  A recommended filename may be optionally specified.
   ///
   std::string executeProgram(std::string OutputFilename,
                              std::string Bitcode,
diff --git a/tools/bugpoint/Makefile b/tools/bugpoint/Makefile
index b821b6c..5d287ef1 100644
--- a/tools/bugpoint/Makefile
+++ b/tools/bugpoint/Makefile
@@ -12,6 +12,5 @@
 
 LINK_COMPONENTS := asmparser instrumentation scalaropts ipo \
                    linker bitreader bitwriter
-REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common