Move stuff out of the Optimizations directories into the appropriate Transforms

directories.  Eliminate the opt namespace.

llvm-svn: 1520

1 files changed, 2 insertions, 4 deletions

diff --git a/llvm/lib/Transforms/Scalar/InstructionCombining.cpp b/llvm/lib/Transforms/Scalar/InstructionCombining.cpp
index 795418f939b..25590661b77 100644
--- a/llvm/lib/Transforms/Scalar/InstructionCombining.cpp
+++ b/llvm/lib/Transforms/Scalar/InstructionCombining.cpp
@@ -15,12 +15,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Transforms/Scalar/InstructionCombining.h"
-#include "../TransformInternals.h"
-#include "llvm/Optimizations/ConstantHandling.h"
+#include "llvm/Transforms/Scalar/ConstantHandling.h"
 #include "llvm/Method.h"
 #include "llvm/iMemory.h"
-
-using namespace opt;
+#include "../TransformInternals.h"
 
 static Instruction *CombineBinOp(BinaryOperator *I) {
   bool Changed = false;