diff --git a/clang/include/clang/Driver/Job.h b/clang/include/clang/Driver/Job.h
index c4e6a3118541..7b91e4e9e487 100644
--- a/clang/include/clang/Driver/Job.h
+++ b/clang/include/clang/Driver/Job.h
@@ -24,6 +24,9 @@ class Action;
 class Command;
 class Tool;
 
+// Users of this class will use clang::driver::ArgStringList.
+typedef llvm::opt::ArgStringList ArgStringList;
+
 class Job {
 public:
   enum JobClass {
@@ -65,11 +68,11 @@ class Command : public Job {
 
   /// The list of program arguments (not including the implicit first
   /// argument, which will be the executable).
-  llvm::opt::ArgStringList Arguments;
+  ArgStringList Arguments;
 
 public:
   Command(const Action &_Source, const Tool &_Creator, const char *_Executable,
-          const llvm::opt::ArgStringList &_Arguments);
+          const ArgStringList &_Arguments);
 
   virtual void Print(llvm::raw_ostream &OS, const char *Terminator,
                      bool Quote, bool CrashReport = false) const;
@@ -83,7 +86,7 @@ public:
   /// getCreator - Return the Tool which caused the creation of this job.
   const Tool &getCreator() const { return Creator; }
 
-  const llvm::opt::ArgStringList &getArguments() const { return Arguments; }
+  const ArgStringList &getArguments() const { return Arguments; }
 
   static bool classof(const Job *J) {
     return J->getKind() == CommandClass;
diff --git a/clang/lib/Driver/Job.cpp b/clang/lib/Driver/Job.cpp
index 43518ad8f970..4e4c664c8f72 100644
--- a/clang/lib/Driver/Job.cpp
+++ b/clang/lib/Driver/Job.cpp
@@ -15,7 +15,6 @@
 #include "llvm/Support/raw_ostream.h"
 #include <cassert>
 using namespace clang::driver;
-using llvm::opt::ArgStringList;
 using llvm::raw_ostream;
 using llvm::StringRef;