diff --git a/clang/include/clang/Driver/Job.h b/clang/include/clang/Driver/Job.h
index 161fda19b28b..905ddb934cec 100644
--- a/clang/include/clang/Driver/Job.h
+++ b/clang/include/clang/Driver/Job.h
@@ -24,6 +24,7 @@ class Action;
 class Command;
 class Tool;
 
+// Re-export this as clang::driver::ArgStringList.
 using llvm::opt::ArgStringList;
 
 class Job {
diff --git a/clang/lib/Driver/Job.cpp b/clang/lib/Driver/Job.cpp
index 0a783eb93b11..7df46d348c16 100644
--- a/clang/lib/Driver/Job.cpp
+++ b/clang/lib/Driver/Job.cpp
@@ -22,7 +22,7 @@ Job::~Job() {}
 
 Command::Command(const Action &_Source, const Tool &_Creator,
                  const char *_Executable,
-                 const llvm::opt::ArgStringList &_Arguments)
+                 const ArgStringList &_Arguments)
     : Job(CommandClass), Source(_Source), Creator(_Creator),
       Executable(_Executable), Arguments(_Arguments) {}
 
@@ -113,7 +113,7 @@ void Command::Print(raw_ostream &OS, const char *Terminator, bool Quote,
   OS << Terminator;
 }
 
-int Command::Execute(const llvm::StringRef **Redirects, std::string *ErrMsg,
+int Command::Execute(const StringRef **Redirects, std::string *ErrMsg,
                      bool *ExecutionFailed) const {
   SmallVector<const char*, 128> Argv;
   Argv.push_back(Executable);