diff --git a/gen/asmstmt.cpp b/gen/asmstmt.cpp
index 08b3d228..ff84e495 100644
--- a/gen/asmstmt.cpp
+++ b/gen/asmstmt.cpp
@@ -14,7 +14,6 @@
 
 #include <cassert>
 #include <deque>
-#include <iostream>
 #include <cstring>
 
 //#include "d-lang.h"
@@ -260,7 +259,7 @@ AsmStatement::toIR(IRState * irs)
 	    break;
 	case Arg_FrameRelative:
 // FIXME
-std::cout << "asm fixme Arg_FrameRelative" << std::endl;
+llvm::cout << "asm fixme Arg_FrameRelative" << std::endl;
 assert(0);
 /*	    if (arg->expr->op == TOKvar)
 		arg_val = ((VarExp *) arg->expr)->var->toSymbol()->Stree;
@@ -278,7 +277,7 @@ assert(0);
 	    break;*/
 	case Arg_LocalSize:
 // FIXME
-std::cout << "asm fixme Arg_LocalSize" << std::endl;
+llvm::cout << "asm fixme Arg_LocalSize" << std::endl;
 assert(0);
 /*	    var_frame_offset = cfun->x_frame_offset;
 	    if (var_frame_offset < 0)
@@ -711,7 +710,7 @@ void AsmBlockStatement::toIR(IRState* p)
         Logger::cout() << "Arguments:" << '\n';
         Logger::indent();
         for (std::vector<LLValue*>::iterator b = args.begin(), i = b, e = args.end(); i != e; ++i) {
-            std::ostream& cout = Logger::cout();
+            llvm::OStream cout = Logger::cout();
             cout << '$' << (i - b) << " ==> " << **i;
             if (llvm::isa<LLConstant>(*i))
                 cout << '\n';
diff --git a/gen/dwarftypes.cpp b/gen/dwarftypes.cpp
index 3954d6de..ba55a278 100644
--- a/gen/dwarftypes.cpp
+++ b/gen/dwarftypes.cpp
@@ -16,7 +16,6 @@
 #include <llvm/Analysis/Verifier.h>
 #include <llvm/Assembly/PrintModulePass.h>
 #include <algorithm>
-#include <iostream>
 
 void RegisterDwarfSymbols(llvm::Module* mod) {
   using namespace llvm;
diff --git a/gen/linker.cpp b/gen/linker.cpp
index d0e9cca6..ce39ec9f 100644
--- a/gen/linker.cpp
+++ b/gen/linker.cpp
@@ -333,7 +333,7 @@ int linkObjToExecutable(const char* argv0)
 
     Logger::println("Linking with: ");
     std::vector<const char*>::const_iterator I = args.begin(), E = args.end(); 
-    std::ostream& logstr = Logger::cout();
+    llvm::OStream logstr = Logger::cout();
     for (; I != E; ++I)
         if (*I)
             logstr << "'" << *I << "'" << " ";
diff --git a/gen/llvmhelpers.cpp b/gen/llvmhelpers.cpp
index 76a325ad..daa127f1 100644
--- a/gen/llvmhelpers.cpp
+++ b/gen/llvmhelpers.cpp
@@ -546,7 +546,7 @@ DValue* DtoNullValue(Type* type)
     }
 
     // unknown
-    std::cout << "unsupported: null value for " << type->toChars() << '\n';
+    llvm::cout << "unsupported: null value for " << type->toChars() << '\n';
     assert(0);
     return 0;
 
diff --git a/gen/logger.cpp b/gen/logger.cpp
index 6a5e982e..fa69157f 100644
--- a/gen/logger.cpp
+++ b/gen/logger.cpp
@@ -2,7 +2,6 @@
 #include <cstdarg>
 #include <cstdio>
 #include <cstdlib>
-#include <iostream>
 #include <fstream>
 #include <string>
 
@@ -14,7 +13,6 @@
 namespace Logger
 {
     static std::string indent_str;
-    static std::ofstream null_out("/dev/null");
 
     llvm::cl::opt<bool> _enabled("vv",
         llvm::cl::desc("Very verbose"),
@@ -33,12 +31,12 @@ namespace Logger
             indent_str.resize(indent_str.size()-2);
         }
     }
-    std::ostream& cout()
+    llvm::OStream cout()
     {
         if (_enabled)
-            return std::cout << indent_str;
+            return llvm::cout << indent_str;
         else
-            return null_out;
+            return 0;
     }
     void println(const char* fmt,...)
     {
diff --git a/gen/logger.h b/gen/logger.h
index 54e29990..ef5db19c 100644
--- a/gen/logger.h
+++ b/gen/logger.h
@@ -1,7 +1,7 @@
 #ifndef _llvmd_gen_logger_h_
 #define _llvmd_gen_logger_h_
 
-#include <iostream>
+#include "llvm/Support/Streams.h"
 
 struct Loc;
 
@@ -9,7 +9,7 @@ namespace Logger
 {
     void indent();
     void undent();
-    std::ostream& cout();
+    llvm::OStream cout();
     void println(const char* fmt, ...);
     void print(const char* fmt, ...);
     void enable();
diff --git a/gen/statements.cpp b/gen/statements.cpp
index dc4fa3d1..ec27238a 100644
--- a/gen/statements.cpp
+++ b/gen/statements.cpp
@@ -3,7 +3,6 @@
 #include <stdio.h>
 #include <math.h>
 #include <fstream>
-#include <iostream>
 
 #include "gen/llvm.h"
 #include "llvm/InlineAsm.h"
diff --git a/gen/toir.cpp b/gen/toir.cpp
index cab13b71..421128b3 100644
--- a/gen/toir.cpp
+++ b/gen/toir.cpp
@@ -9,7 +9,6 @@
 #include <stdio.h>
 #include <math.h>
 #include <fstream>
-#include <iostream>
 
 #include "gen/llvm.h"
 
diff --git a/gen/tollvm.cpp b/gen/tollvm.cpp
index c992363a..f7d3d892 100644
--- a/gen/tollvm.cpp
+++ b/gen/tollvm.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
 
 #include "gen/llvm.h"
 
diff --git a/gen/toobj.cpp b/gen/toobj.cpp
index 603cea53..acbddd23 100644
--- a/gen/toobj.cpp
+++ b/gen/toobj.cpp
@@ -8,7 +8,6 @@
 // See the included readme.txt for details.
 
 #include <cstddef>
-#include <iostream>
 #include <fstream>
 
 #include "gen/llvm.h"
@@ -344,13 +343,15 @@ void assemble(const llvm::sys::Path& asmpath, const llvm::sys::Path& objpath)
         Args.push_back(args[i].c_str());
     Args.push_back(0);
 
-    Logger::println("Assembling with: ");
-    std::vector<const char*>::const_iterator I = Args.begin(), E = Args.end(); 
-    std::ostream& logstr = Logger::cout();
-    for (; I != E; ++I)
-        if (*I)
-            logstr << "'" << *I << "'" << " ";
-    logstr << "\n" << std::flush;
+    if (Logger::enabled()) {
+        Logger::println("Assembling with: ");
+        std::vector<const char*>::const_iterator I = Args.begin(), E = Args.end();
+        std::ostream& logstr = *Logger::cout().stream();
+        for (; I != E; ++I)
+            if (*I)
+                logstr << "'" << *I << "'" << " ";
+        logstr << "\n" << std::flush;
+    }
 
     // Run the compiler to assembly the program.
     std::string ErrMsg;