2 files changed, 10 insertions, 4 deletions
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) {