5 files changed, 10 insertions, 7 deletions
diff --git a/net/tools/flip_server/balsa_frame.cc b/net/tools/flip_server/balsa_frame.cc
index 90631ce..9b8173e 100644
--- a/net/tools/flip_server/balsa_frame.cc
+++ b/net/tools/flip_server/balsa_frame.cc
@@ -9,7 +9,6 @@
 #include <strings.h>
 
 #include <limits>
-#include <iostream>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/net/tools/flip_server/balsa_headers.cc b/net/tools/flip_server/balsa_headers.cc
index 56a83a2..b58fb03 100644
--- a/net/tools/flip_server/balsa_headers.cc
+++ b/net/tools/flip_server/balsa_headers.cc
@@ -71,6 +71,12 @@ namespace net {
 
 const size_t BalsaBuffer::kDefaultBlocksize;
 
+std::ostream& BalsaHeaders::iterator_base::operator<<(std::ostream& os,
+                                                      const iterator_base& it) {
+   os << "[" << it.headers_ << ", " << it.idx_ << "]";
+   return os;
+ }
+
 void BalsaHeaders::Clear() {
   balsa_buffer_.Clear();
   transfer_encoding_is_chunked_ = false;
diff --git a/net/tools/flip_server/balsa_headers.h b/net/tools/flip_server/balsa_headers.h
index 4f530c7..24e7940 100644
--- a/net/tools/flip_server/balsa_headers.h
+++ b/net/tools/flip_server/balsa_headers.h
@@ -6,7 +6,7 @@
 #define NET_TOOLS_FLIP_SERVER_BALSA_HEADERS_H_
 
 #include <algorithm>
-#include <iostream>
+#include <iosfwd>
 #include <iterator>
 #include <string>
 #include <utility>
@@ -470,10 +470,7 @@ class BalsaHeaders {
     // operator<< work for the classes it sees.  It would be better if there
     // was an additional traits-like system for the gUnit output... but oh
     // well.
-    friend std::ostream& operator<<(std::ostream& os, const iterator_base& it) {
-      os << "[" << it.headers_ << ", " << it.idx_ << "]";
-      return os;
-    }
+    std::ostream& operator<<(std::ostream& os, const iterator_base& it);
 
    protected:
     iterator_base(const BalsaHeaders* headers, HeaderLines::size_type index) :
diff --git a/net/tools/flip_server/create_listener.cc b/net/tools/flip_server/create_listener.cc
index 7ea5efa..3538261 100644
--- a/net/tools/flip_server/create_listener.cc
+++ b/net/tools/flip_server/create_listener.cc
@@ -10,6 +10,7 @@
 #include <sys/socket.h>  // for getaddrinfo and getnameinfo
 #include <sys/types.h>   // "
 #include <unistd.h>      // for exit()
+#include <ostream>
 
 #include "net/tools/flip_server/create_listener.h"
 
diff --git a/net/tools/flip_server/create_listener.h b/net/tools/flip_server/create_listener.h
index 06979d9..32758ee 100644
--- a/net/tools/flip_server/create_listener.h
+++ b/net/tools/flip_server/create_listener.h
@@ -5,7 +5,7 @@
 #ifndef NET_TOOLS_FLIP_SERVER_CREATE_LISTENER_H__
 #define NET_TOOLS_FLIP_SERVER_CREATE_LISTENER_H__
 
-#include <iostream>
+#include <iosfwd>
 #include <string>
 
 namespace net {