diff --git a/utils/TableGen/LLVMCConfigurationEmitter.cpp b/utils/TableGen/LLVMCConfigurationEmitter.cpp
index 97dca8c6aa3..7a68d696f92 100644
--- a/utils/TableGen/LLVMCConfigurationEmitter.cpp
+++ b/utils/TableGen/LLVMCConfigurationEmitter.cpp
@@ -17,8 +17,6 @@
 #include "llvm/ADT/IntrusiveRefCntPtr.h"
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/StringSet.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/System/Path.h"
 
 #include <algorithm>
 #include <cassert>
@@ -29,8 +27,6 @@
 
 using namespace llvm;
 
-extern cl::opt<std::string> InputFilename;
-
 namespace {
 
 //===----------------------------------------------------------------------===//
@@ -2978,18 +2974,9 @@ void EmitHookDeclarations(const ToolDescriptions& ToolDescs,
   O << "}\n\n";
 }
 
-std::string GetPluginName() {
-  if (!InputFilename.empty()) {
-    return sys::Path(InputFilename).getBasename();
-  }
-
-  return "";
-}
-
 /// EmitRegisterPlugin - Emit code to register this plugin.
 void EmitRegisterPlugin(int Priority, raw_ostream& O) {
-  O << "struct Plugin" << GetPluginName()
-    << " : public llvmc::BasePlugin {\n\n";
+  O << "struct Plugin : public llvmc::BasePlugin {\n\n";
   O.indent(Indent1) << "int Priority() const { return "
                     << Priority << "; }\n\n";
   O.indent(Indent1) << "int PreprocessOptions() const\n";
@@ -3000,8 +2987,7 @@ void EmitRegisterPlugin(int Priority, raw_ostream& O) {
     << "int PopulateCompilationGraph(CompilationGraph& graph) const\n";
   O.indent(Indent1) << "{ return PopulateCompilationGraphLocal(graph); }\n"
                     << "};\n\n"
-                    << "static llvmc::RegisterPlugin<Plugin"
-                    << GetPluginName()<< "> RP;\n\n";
+                    << "static llvmc::RegisterPlugin<Plugin> RP;\n\n";
 }
 
 /// EmitIncludes - Emit necessary #include directives and some
diff --git a/utils/TableGen/TableGen.cpp b/utils/TableGen/TableGen.cpp
index cc784103e36..ebd163d265c 100644
--- a/utils/TableGen/TableGen.cpp
+++ b/utils/TableGen/TableGen.cpp
@@ -146,6 +146,9 @@ namespace {
   OutputFilename("o", cl::desc("Output filename"), cl::value_desc("filename"),
                  cl::init("-"));
 
+  cl::opt<std::string>
+  InputFilename(cl::Positional, cl::desc("<input file>"), cl::init("-"));
+
   cl::list<std::string>
   IncludeDirs("I", cl::desc("Directory of include files"),
               cl::value_desc("directory"), cl::Prefix);
@@ -158,9 +161,6 @@ namespace {
 
 
 // FIXME: Eliminate globals from tblgen.
-cl::opt<std::string>
-InputFilename(cl::Positional, cl::desc("<input file>"), cl::init("-"));
-
 RecordKeeper llvm::Records;
 
 static SourceMgr SrcMgr;