diff --git a/lib/Analysis/IPA/FindUnsafePointerTypes.cpp b/lib/Analysis/IPA/FindUnsafePointerTypes.cpp
index 25fcc8dfdf1..52a83a1dfd5 100644
--- a/lib/Analysis/IPA/FindUnsafePointerTypes.cpp
+++ b/lib/Analysis/IPA/FindUnsafePointerTypes.cpp
@@ -25,12 +25,11 @@
 
 #include "llvm/Analysis/FindUnsafePointerTypes.h"
 #include "llvm/Assembly/CachedWriter.h"
-#include "llvm/Type.h"
+#include "llvm/DerivedTypes.h"
 #include "llvm/Module.h"
 #include "llvm/Support/InstIterator.h"
 #include "Support/CommandLine.h"
-
-namespace llvm {
+using namespace llvm;
 
 static RegisterAnalysis<FindUnsafePointerTypes>
 X("unsafepointertypes", "Find Unsafe Pointer Types");
@@ -72,7 +71,7 @@ bool FindUnsafePointerTypes::run(Module &Mod) {
           if (PrintFailures) {
             CachedWriter CW(F->getParent(), std::cerr);
             std::cerr << "FindUnsafePointerTypes: Type '";
-            CW << ITy;
+            CW << *ITy;
             std::cerr << "' marked unsafe in '" << F->getName() << "' by:\n";
             CW << *I;
           }
@@ -101,8 +100,7 @@ void FindUnsafePointerTypes::print(std::ostream &o, const Module *M) const {
          E = getUnsafeTypes().end(); I != E; ++I, ++Counter) {
     
     o << " #" << Counter << ". ";
-    CW << (Type*)*I << "\n";
+    CW << **I << "\n";
   }
 }
 
-} // End llvm namespace
diff --git a/lib/Analysis/IPA/FindUsedTypes.cpp b/lib/Analysis/IPA/FindUsedTypes.cpp
index c50e3ecaaad..a8527772fab 100644
--- a/lib/Analysis/IPA/FindUsedTypes.cpp
+++ b/lib/Analysis/IPA/FindUsedTypes.cpp
@@ -98,9 +98,9 @@ void FindUsedTypes::print(std::ostream &o, const Module *M) const {
     CachedWriter CW(M, o);
     for (std::set<const Type *>::const_iterator I = UsedTypes.begin(),
            E = UsedTypes.end(); I != E; ++I)
-      CW << "  " << *I << "\n";
+      CW << "  " << **I << "\n";
   } else
     for (std::set<const Type *>::const_iterator I = UsedTypes.begin(),
            E = UsedTypes.end(); I != E; ++I)
-      o << "  " << *I << "\n";
+      o << "  " << **I << "\n";
 }
diff --git a/lib/Analysis/Interval.cpp b/lib/Analysis/Interval.cpp
index 8f0bdfa0034..8f93cc6edc4 100644
--- a/lib/Analysis/Interval.cpp
+++ b/lib/Analysis/Interval.cpp
@@ -41,14 +41,17 @@ void Interval::print(std::ostream &o) const {
        << "Interval Contents:\n";
   
   // Print out all of the basic blocks in the interval...
-  std::copy(Nodes.begin(), Nodes.end(), 
-            std::ostream_iterator<BasicBlock*>(o, "\n"));
+  for (std::vector<BasicBlock*>::const_iterator I = Nodes.begin(),
+         E = Nodes.end(); I != E; ++I)
+    o << **I << "\n";
 
   o << "Interval Predecessors:\n";
-  std::copy(Predecessors.begin(), Predecessors.end(), 
-            std::ostream_iterator<BasicBlock*>(o, "\n"));
-  
+  for (std::vector<BasicBlock*>::const_iterator I = Predecessors.begin(),
+         E = Predecessors.end(); I != E; ++I)
+    o << **I << "\n";
+
   o << "Interval Successors:\n";
-  std::copy(Successors.begin(), Successors.end(), 
-            std::ostream_iterator<BasicBlock*>(o, "\n"));
+  for (std::vector<BasicBlock*>::const_iterator I = Successors.begin(),
+         E = Successors.end(); I != E; ++I)
+    o << **I << "\n";
 }