diff --git a/lib/Transforms/ExprTypeConvert.cpp b/lib/Transforms/ExprTypeConvert.cpp
index 518a5489275..e2f1029004b 100644
--- a/lib/Transforms/ExprTypeConvert.cpp
+++ b/lib/Transforms/ExprTypeConvert.cpp
@@ -22,8 +22,7 @@
 #include "Support/STLExtras.h"
 #include "Support/Debug.h"
 #include <algorithm>
-
-namespace llvm {
+using namespace llvm;
 
 static bool OperandConvertibleToType(User *U, Value *V, const Type *Ty,
                                      ValueTypeCache &ConvertedTypes,
@@ -142,7 +141,7 @@ static Instruction *ConvertMallocToType(MallocInst *MI, const Type *Ty,
 
 
 // ExpressionConvertibleToType - Return true if it is possible
-bool ExpressionConvertibleToType(Value *V, const Type *Ty,
+bool llvm::ExpressionConvertibleToType(Value *V, const Type *Ty,
                                  ValueTypeCache &CTMap, const TargetData &TD) {
   // Expression type must be holdable in a register.
   if (!Ty->isFirstClassType())
@@ -330,8 +329,8 @@ bool ExpressionConvertibleToType(Value *V, const Type *Ty,
 }
 
 
-Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC,
-                               const TargetData &TD) {
+Value *llvm::ConvertExpressionToType(Value *V, const Type *Ty, 
+                                     ValueMapCache &VMC, const TargetData &TD) {
   if (V->getType() == Ty) return V;  // Already where we need to be?
 
   ValueMapCache::ExprMapTy::iterator VMCI = VMC.ExprMap.find(V);
@@ -564,9 +563,9 @@ Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC,
 
 
 // ValueConvertibleToType - Return true if it is possible
-bool ValueConvertibleToType(Value *V, const Type *Ty,
-                             ValueTypeCache &ConvertedTypes,
-                            const TargetData &TD) {
+bool llvm::ValueConvertibleToType(Value *V, const Type *Ty,
+                                  ValueTypeCache &ConvertedTypes,
+                                  const TargetData &TD) {
   ValueTypeCache::iterator I = ConvertedTypes.find(V);
   if (I != ConvertedTypes.end()) return I->second == Ty;
   ConvertedTypes[V] = Ty;
@@ -894,8 +893,8 @@ static bool OperandConvertibleToType(User *U, Value *V, const Type *Ty,
 }
 
 
-void ConvertValueToNewType(Value *V, Value *NewVal, ValueMapCache &VMC,
-                           const TargetData &TD) {
+void llvm::ConvertValueToNewType(Value *V, Value *NewVal, ValueMapCache &VMC,
+                                 const TargetData &TD) {
   ValueHandle VH(VMC, V);
 
   unsigned NumUses = V->use_size();
@@ -1302,4 +1301,3 @@ ValueHandle::~ValueHandle() {
   }
 }
 
-} // End llvm namespace
diff --git a/lib/Transforms/LevelRaise.cpp b/lib/Transforms/LevelRaise.cpp
index 3dcb501bbb7..d76beee56f9 100644
--- a/lib/Transforms/LevelRaise.cpp
+++ b/lib/Transforms/LevelRaise.cpp
@@ -20,15 +20,13 @@
 #include "llvm/iMemory.h"
 #include "llvm/Pass.h"
 #include "llvm/ConstantHandling.h"
-#include "llvm/Analysis/Expressions.h"
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
 #include "Support/CommandLine.h"
 #include "Support/Debug.h"
 #include "Support/Statistic.h"
 #include "Support/STLExtras.h"
 #include <algorithm>
-
-namespace llvm {
+using namespace llvm;
 
 // StartInst - This enables the -raise-start-inst=foo option to cause the level
 // raising pass to start at instruction "foo", which is immensely useful for
@@ -87,7 +85,7 @@ namespace {
 }
 
 
-Pass *createRaisePointerReferencesPass() {
+Pass *llvm::createRaisePointerReferencesPass() {
   return new RPR();
 }
 
@@ -614,4 +612,3 @@ bool RPR::runOnFunction(Function &F) {
   return Changed;
 }
 
-} // End llvm namespace