6 files changed, 29 insertions, 6 deletions
diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc
index bf42584..6245920 100644
--- a/net/http/http_cache.cc
+++ b/net/http/http_cache.cc
@@ -18,6 +18,7 @@
 #include "net/disk_cache/disk_cache.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_request_info.h"
+#include "net/http/http_response_headers.h"
 #include "net/http/http_response_info.h"
 #include "net/http/http_transaction.h"
 #include "net/http/http_util.h"
diff --git a/net/http/http_cache.h b/net/http/http_cache.h
index 63e5257..51991f5 100644
--- a/net/http/http_cache.h
+++ b/net/http/http_cache.h
@@ -15,7 +15,7 @@
 #define NET_HTTP_HTTP_CACHE_H_
 
 #include <list>
-#include <string>
+#include <set>
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index fb9489c..f7aeff6 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -23,6 +23,7 @@
 #include "net/http/http_chunked_decoder.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_request_info.h"
+#include "net/http/http_response_headers.h"
 #include "net/http/http_util.h"
 
 using base::Time;
diff --git a/net/http/http_response_info.cc b/net/http/http_response_info.cc
new file mode 100644
index 0000000..ad6ef87
--- /dev/null
+++ b/net/http/http_response_info.cc
@@ -0,0 +1,17 @@
+// Copyright (c) 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 "net/http/http_response_info.h"
+
+#include "net/http/http_response_headers.h"
+
+namespace net {
+
+HttpResponseInfo::HttpResponseInfo() {
+}
+
+HttpResponseInfo::~HttpResponseInfo() {
+}
+
+}  // namespace net
diff --git a/net/http/http_response_info.h b/net/http/http_response_info.h
index 5563ada..671a390 100644
--- a/net/http/http_response_info.h
+++ b/net/http/http_response_info.h
@@ -2,19 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_HTTP_HTTP_RESPONSE_INFO_H__
-#define NET_HTTP_HTTP_RESPONSE_INFO_H__
+#ifndef NET_HTTP_HTTP_RESPONSE_INFO_H_
+#define NET_HTTP_HTTP_RESPONSE_INFO_H_
 
 #include "base/time.h"
 #include "net/base/auth.h"
 #include "net/base/ssl_info.h"
-#include "net/http/http_response_headers.h"
 #include "net/http/http_vary_data.h"
 
 namespace net {
 
+class HttpResponseHeaders;
+
 class HttpResponseInfo {
  public:
+  HttpResponseInfo();
+  ~HttpResponseInfo();
+
   // The following is only defined if the request_time memmber is set.
   // If this response was resurrected from cache, then this bool is set, and
   // request_time may corresponds to a time "far" in the past.  Note that
@@ -48,5 +52,4 @@ class HttpResponseInfo {
 
 }  // namespace net
 
-#endif  // NET_HTTP_HTTP_RESPONSE_INFO_H__
-
+#endif  // NET_HTTP_HTTP_RESPONSE_INFO_H_
diff --git a/net/http/http_transaction_unittest.h b/net/http/http_transaction_unittest.h
index 9ef6bf8..e530423 100644
--- a/net/http/http_transaction_unittest.h
+++ b/net/http/http_transaction_unittest.h
@@ -20,6 +20,7 @@
 #include "net/disk_cache/disk_cache.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_request_info.h"
+#include "net/http/http_response_headers.h"
 #include "net/http/http_response_info.h"
 
 //-----------------------------------------------------------------------------