--- a/ipc/chromium/src/base/debug_util.h
+++ b/ipc/chromium/src/base/debug_util.h
@@ -4,17 +4,17 @@
 
 // This is a cross platform interface for helper functions related to debuggers.
 // You should use this to test if you're running under a debugger, and if you
 // would like to yield (breakpoint) into the debugger.
 
 #ifndef BASE_DEBUG_UTIL_H_
 #define BASE_DEBUG_UTIL_H_
 
-#include <iostream>
+#include <ostream>
 #include <vector>
 
 #include "base/basictypes.h"
 
 // A stacktrace can be helpful in debugging. For example, you can include a
 // stacktrace member in a object (probably around #ifndef NDEBUG) so that you
 // can later see where the given object was created from.
 class StackTrace {

--- a/ipc/chromium/src/base/debug_util_win.cc
+++ b/ipc/chromium/src/base/debug_util_win.cc
@@ -1,16 +1,17 @@
 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/debug_util.h"
 
 #include <windows.h>
 #include <dbghelp.h>
+#include <iostream>
 
 #include "base/basictypes.h"
 #include "base/lock.h"
 #include "base/logging.h"
 #include "base/singleton.h"
 
 namespace {
 

--- a/ipc/chromium/src/base/gfx/point.h
+++ b/ipc/chromium/src/base/gfx/point.h
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BASE_GFX_POINT_H__
 #define BASE_GFX_POINT_H__
 
 #include "build/build_config.h"
 
-#include <iostream>
+#include <ostream>
 
 #if defined(OS_WIN)
 typedef struct tagPOINT POINT;
 #elif defined(OS_MACOSX)
 #include <ApplicationServices/ApplicationServices.h>
 #endif
 
 namespace gfx {

--- a/ipc/chromium/src/base/gfx/rect.h
+++ b/ipc/chromium/src/base/gfx/rect.h
@@ -7,17 +7,17 @@
 // contained by the rectangle, but the coordinate (x + width, y) is not.
 // The class will happily let you create malformed rectangles (that is,
 // rectangles with negative width and/or height), but there will be assertions
 // in the operations (such as contain()) to complain in this case.
 
 #ifndef BASE_GFX_RECT_H__
 #define BASE_GFX_RECT_H__
 
-#include <iostream>
+#include <ostream>
 
 #include "base/gfx/point.h"
 #include "base/gfx/size.h"
 
 #if defined(OS_WIN)
 typedef struct tagRECT RECT;
 #elif defined(OS_LINUX)
 typedef struct _GdkRectangle GdkRectangle;

--- a/ipc/chromium/src/base/gfx/size.h
+++ b/ipc/chromium/src/base/gfx/size.h
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BASE_GFX_SIZE_H__
 #define BASE_GFX_SIZE_H__
 
 #include "build/build_config.h"
 
-#include <iostream>
+#include <ostream>
 
 #if defined(OS_WIN)
 typedef struct tagSIZE SIZE;
 #elif defined(OS_MACOSX)
 #include <ApplicationServices/ApplicationServices.h>
 #endif
 
 namespace gfx {

--- a/ipc/chromium/src/base/string_piece.cc
+++ b/ipc/chromium/src/base/string_piece.cc
@@ -1,15 +1,15 @@
 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 // Copied from strings/stringpiece.cc with modifications
 
 #include <algorithm>
-#include <iostream>
+#include <ostream>
 
 #include "base/string_piece.h"
 
 typedef StringPiece::size_type size_type;
 
 std::ostream& operator<<(std::ostream& o, const StringPiece& piece) {
   o.write(piece.data(), static_cast<std::streamsize>(piece.size()));
   return o;