5 files changed, 20 insertions, 5 deletions
diff --git a/include/clang/Driver/Compilation.h b/include/clang/Driver/Compilation.h
index d4792e898a..22012a6a6c 100644
--- a/include/clang/Driver/Compilation.h
+++ b/include/clang/Driver/Compilation.h
@@ -11,6 +11,7 @@
 #define CLANG_DRIVER_COMPILATION_H_
 
 namespace clang {
+namespace driver {
 
 /// Compilation - A set of tasks to perform for a single driver
 /// invocation.
@@ -24,6 +25,7 @@ public:
   int Execute() const;
 };
 
+} // end namespace driver
 } // end namespace clang
 
 #endif
diff --git a/include/clang/Driver/Driver.h b/include/clang/Driver/Driver.h
index 62bcd43294..dc8c6c3d5d 100644
--- a/include/clang/Driver/Driver.h
+++ b/include/clang/Driver/Driver.h
@@ -11,20 +11,27 @@
 #define CLANG_DRIVER_DRIVER_H_
 
 namespace clang {
+namespace driver {
   class Compilation;
+  class OptTable;
 
 /// Driver - Encapsulate logic for constructing compilation processes
 /// from a set of gcc-driver-like command line arguments.
 class Driver {
+  OptTable *Opts;
+
 public:
   Driver();
   ~Driver();
 
+  const OptTable &getOpts() const { return *Opts; }
+
   /// BuildCompilation - Construct a compilation object for a command
   /// line argument vector.
   Compilation *BuildCompilation(int argc, const char **argv);
 };
 
+} // end namespace driver
 } // end namespace clang
 
 #endif
diff --git a/lib/Driver/Compilation.cpp b/lib/Driver/Compilation.cpp
index 7f3454bcd8..a636e2dbac 100644
--- a/lib/Driver/Compilation.cpp
+++ b/lib/Driver/Compilation.cpp
@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/Driver/Compilation.h"
-using namespace clang;
+using namespace clang::driver;
 
 Compilation::Compilation() {
 }
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index f464acf8eb..d3c959499a 100644
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -7,14 +7,20 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Driver/Compilation.h"
 #include "clang/Driver/Driver.h"
-using namespace clang;
 
-Driver::Driver() {
+#include "clang/Driver/Arg.h"
+#include "clang/Driver/ArgList.h"
+#include "clang/Driver/Compilation.h"
+#include "clang/Driver/Options.h"
+using namespace clang::driver;
+
+Driver::Driver() : Opts(new OptTable()) {
+  
 }
 
 Driver::~Driver() {
+  delete Opts;
 }
 
 Compilation *Driver::BuildCompilation(int argc, const char **argv) {
diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp
index ac739bf492..31990a8f2a 100644
--- a/tools/driver/driver.cpp
+++ b/tools/driver/driver.cpp
@@ -19,7 +19,7 @@
 
 #include "llvm/ADT/OwningPtr.h"
 #include "llvm/System/Signals.h"
-using namespace clang;
+using namespace clang::driver;
 
 int main(int argc, const char **argv) {
   llvm::sys::PrintStackTraceOnErrorSignal();