Cleanup: Remove unneeded forward declarations from remoting.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/8536002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109593 0039d316-1c4b-4281-b951-d872f2087c98

37 files changed, 41 insertions, 135 deletions

diff --git a/remoting/base/encoder_row_based.h b/remoting/base/encoder_row_based.h
index a34a2b6..5d8a877 100644
--- a/remoting/base/encoder_row_based.h
+++ b/remoting/base/encoder_row_based.h
@@ -12,7 +12,6 @@
 namespace remoting {
 
 class Compressor;
-class UpdateStreamPacket;
 
 // EncoderRowBased implements an Encoder using zlib or verbatim
 // compression. Zlib-based encoder must be created using
diff --git a/remoting/client/chromoting_client.h b/remoting/client/chromoting_client.h
index fe48057..a0bea89 100644
--- a/remoting/client/chromoting_client.h
+++ b/remoting/client/chromoting_client.h
@@ -25,11 +25,6 @@ class MessageLoop;
 
 namespace remoting {
 
-namespace protocol {
-class LocalLoginStatus;
-class NotifyResolutionRequest;
-}  // namespace protocol
-
 class ClientContext;
 class InputHandler;
 class RectangleUpdateDecoder;
diff --git a/remoting/client/chromoting_view.h b/remoting/client/chromoting_view.h
index 1f1a769..17b24e3 100644
--- a/remoting/client/chromoting_view.h
+++ b/remoting/client/chromoting_view.h
@@ -11,12 +11,6 @@
 #include "media/base/video_frame.h"
 #include "remoting/protocol/connection_to_host.h"
 
-class MessageLoop;
-
-namespace base {
-class WaitableEvent;
-}  // namespace base
-
 namespace remoting {
 
 static const uint32 kCreatedColor = 0xffccccff;
diff --git a/remoting/client/frame_consumer.h b/remoting/client/frame_consumer.h
index 187b3d5..65b0c64 100644
--- a/remoting/client/frame_consumer.h
+++ b/remoting/client/frame_consumer.h
@@ -7,8 +7,6 @@
 
 #include "remoting/base/decoder.h"  // For UpdatedRects
 
-class Task;
-
 namespace remoting {
 
 class FrameConsumer {
diff --git a/remoting/client/plugin/chromoting_instance.h b/remoting/client/plugin/chromoting_instance.h
index 8369b93..427d420 100644
--- a/remoting/client/plugin/chromoting_instance.h
+++ b/remoting/client/plugin/chromoting_instance.h
@@ -23,10 +23,6 @@
 #include "remoting/client/plugin/pepper_plugin_thread_delegate.h"
 #include "remoting/protocol/connection_to_host.h"
 
-namespace base {
-class Thread;
-}  // namespace base
-
 namespace pp {
 class InputEvent;
 class Module;
@@ -42,17 +38,12 @@ class ChromotingClient;
 class ChromotingStats;
 class ClientContext;
 class InputHandler;
-class JingleThread;
 class PepperView;
 class PepperViewProxy;
 class RectangleUpdateDecoder;
 
 struct ClientConfig;
 
-namespace protocol {
-class HostConnection;
-}  // namespace protocol
-
 class ChromotingInstance : public pp::InstancePrivate {
  public:
   // The mimetype for which this plugin is registered.
@@ -110,6 +101,7 @@ class ChromotingInstance : public pp::InstancePrivate {
   // base/logging.h.
   static bool LogToUI(int severity, const char* file, int line,
                       size_t message_start, const std::string& str);
+
  private:
   FRIEND_TEST_ALL_PREFIXES(ChromotingInstanceTest, TestCaseSetup);
 
diff --git a/remoting/client/plugin/pepper_view_proxy.h b/remoting/client/plugin/pepper_view_proxy.h
index be55233..b76da59 100644
--- a/remoting/client/plugin/pepper_view_proxy.h
+++ b/remoting/client/plugin/pepper_view_proxy.h
@@ -26,7 +26,6 @@ class MessageLoopProxy;
 namespace remoting {
 
 class ChromotingInstance;
-class ClientContext;
 
 class PepperViewProxy : public base::RefCountedThreadSafe<PepperViewProxy>,
                         public ChromotingView,
diff --git a/remoting/client/rectangle_update_decoder.h b/remoting/client/rectangle_update_decoder.h
index 1a61856..fd5b2c2 100644
--- a/remoting/client/rectangle_update_decoder.h
+++ b/remoting/client/rectangle_update_decoder.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_RECTANGLE_UPDATE_DECODER_H
-#define REMOTING_CLIENT_RECTANGLE_UPDATE_DECODER_H
+#ifndef REMOTING_CLIENT_RECTANGLE_UPDATE_DECODER_H_
+#define REMOTING_CLIENT_RECTANGLE_UPDATE_DECODER_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/task.h"
@@ -15,7 +15,6 @@ class MessageLoop;
 namespace remoting {
 
 class FrameConsumer;
-class VideoPacketFormat;
 class VideoPacket;
 
 namespace protocol {
@@ -95,4 +94,4 @@ class RectangleUpdateDecoder :
 
 }  // namespace remoting
 
-#endif  // REMOTING_CLIENT_RECTANGLE_UPDATE_DECODER_H
+#endif  // REMOTING_CLIENT_RECTANGLE_UPDATE_DECODER_H_
diff --git a/remoting/host/chromoting_host.h b/remoting/host/chromoting_host.h
index 7d6f227..c5651cc 100644
--- a/remoting/host/chromoting_host.h
+++ b/remoting/host/chromoting_host.h
@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CHROMOTING_HOST_H_
-#define REMOTING_CHROMOTING_HOST_H_
+#ifndef REMOTING_HOST_CHROMOTING_HOST_H_
+#define REMOTING_HOST_CHROMOTING_HOST_H_
 
 #include <string>
+#include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread.h"
@@ -21,12 +22,9 @@
 #include "remoting/protocol/session_manager.h"
 #include "remoting/protocol/connection_to_client.h"
 
-class Task;
-
 namespace remoting {
 
 namespace protocol {
-class HostStub;
 class InputStub;
 class SessionConfig;
 class CandidateSessionConfig;
diff --git a/remoting/host/chromoting_host_context.h b/remoting/host/chromoting_host_context.h
index d2ab3e6..ded84b9 100644
--- a/remoting/host/chromoting_host_context.h
+++ b/remoting/host/chromoting_host_context.h
@@ -13,12 +13,6 @@
 #include "base/threading/thread.h"
 #include "remoting/jingle_glue/jingle_thread.h"
 
-class Task;
-
-namespace tracked_objects {
-class Location;
-}
-
 namespace remoting {
 
 // A class that manages threads and running context for the chromoting host
@@ -26,7 +20,7 @@ namespace remoting {
 class ChromotingHostContext {
  public:
   // Create a context.
-  ChromotingHostContext(base::MessageLoopProxy* ui_message_loop);
+  explicit ChromotingHostContext(base::MessageLoopProxy* ui_message_loop);
   virtual ~ChromotingHostContext();
 
   // TODO(ajwong): Move the Start/Stop methods out of this class. Then
diff --git a/remoting/host/disconnect_window_mac.h b/remoting/host/disconnect_window_mac.h
index 206d016..8014b4e 100644
--- a/remoting/host/disconnect_window_mac.h
+++ b/remoting/host/disconnect_window_mac.h
@@ -6,7 +6,6 @@
 
 namespace remoting {
 class ChromotingHost;
-class DisconnectWindowMac;
 }
 
 // Controller for the disconnect window which allows the host user to
diff --git a/remoting/host/host_config.h b/remoting/host/host_config.h
index 00490b0..bca937d 100644
--- a/remoting/host/host_config.h
+++ b/remoting/host/host_config.h
@@ -9,8 +9,6 @@
 
 #include "base/memory/ref_counted.h"
 
-class Task;
-
 namespace remoting {
 
 // Following constants define names for configuration parameters.
@@ -34,8 +32,8 @@ extern const char kPrivateKeyConfigPath[];
 // HostConfig interace provides read-only access to host configuration.
 class HostConfig : public base::RefCountedThreadSafe<HostConfig> {
  public:
-  HostConfig() { };
-  virtual ~HostConfig() { }
+  HostConfig() {}
+  virtual ~HostConfig() {}
 
   virtual bool GetString(const std::string& path, std::string* out_value) = 0;
   virtual bool GetBoolean(const std::string& path, bool* out_value) = 0;
@@ -46,7 +44,7 @@ class HostConfig : public base::RefCountedThreadSafe<HostConfig> {
 // MutableHostConfig extends HostConfig for mutability.
 class MutableHostConfig : public HostConfig {
  public:
-  MutableHostConfig() { };
+  MutableHostConfig() {}
 
   // SetString() updates specified config value. Save() must be called to save
   // the changes on the disk.
diff --git a/remoting/host/host_status_observer.h b/remoting/host/host_status_observer.h
index ccd03a2..ea47a69 100644
--- a/remoting/host/host_status_observer.h
+++ b/remoting/host/host_status_observer.h
@@ -2,18 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_HOST_STATUS_OBSERVER_H_
-#define REMOTING_HOST_STATUS_OBSERVER_H_
+#ifndef REMOTING_HOST_HOST_STATUS_OBSERVER_H_
+#define REMOTING_HOST_HOST_STATUS_OBSERVER_H_
 
 #include <string>
 
 namespace remoting {
 class SignalStrategy;
 
-namespace protocol {
-class ConnectionToClient;
-}
-
 // Interface for host status observer. All methods are invoked on the
 // network thread.
 class HostStatusObserver {
@@ -41,4 +37,4 @@ class HostStatusObserver {
 
 }  // namespace remoting
 
-#endif  // REMOTING_HOST_STATUS_OBSERVER_H_
+#endif  // REMOTING_HOST_HOST_STATUS_OBSERVER_H_
diff --git a/remoting/host/in_memory_host_config.h b/remoting/host/in_memory_host_config.h
index 1d3f8a6..e96fdb4 100644
--- a/remoting/host/in_memory_host_config.h
+++ b/remoting/host/in_memory_host_config.h
@@ -12,8 +12,6 @@
 #include "base/synchronization/lock.h"
 #include "remoting/host/host_config.h"
 
-class Task;
-
 namespace base {
 class DictionaryValue;
 }
diff --git a/remoting/host/json_host_config.h b/remoting/host/json_host_config.h
index efcf28a..e55975e 100644
--- a/remoting/host/json_host_config.h
+++ b/remoting/host/json_host_config.h
@@ -12,8 +12,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "remoting/host/in_memory_host_config.h"
 
-class Task;
-
 namespace base {
 class MessageLoopProxy;
 }  // namespace base
diff --git a/remoting/host/plugin/host_script_object.h b/remoting/host/plugin/host_script_object.h
index da387ce..3769cb9 100644
--- a/remoting/host/plugin/host_script_object.h
+++ b/remoting/host/plugin/host_script_object.h
@@ -26,10 +26,6 @@
 #include "third_party/npapi/bindings/npfunctions.h"
 #include "third_party/npapi/bindings/npruntime.h"
 
-namespace tracked_objects {
-class Location;
-}  // namespace tracked_objects
-
 namespace remoting {
 
 class ChromotingHost;
diff --git a/remoting/host/register_support_host_request.h b/remoting/host/register_support_host_request.h
index e7aee28..0297daba 100644
--- a/remoting/host/register_support_host_request.h
+++ b/remoting/host/register_support_host_request.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_HOST_SUPPORT_HOST_REGISTER_QUERY_H_
-#define REMOTING_HOST_SUPPORT_HOST_REGISTER_QUERY_H_
+#ifndef REMOTING_HOST_REGISTER_SUPPORT_HOST_REQUEST_H_
+#define REMOTING_HOST_REGISTER_SUPPORT_HOST_REQUEST_H_
 
 #include <string>
 
@@ -28,7 +28,6 @@ namespace remoting {
 
 class IqRequest;
 class IqSender;
-class MutableHostConfig;
 
 // RegisterSupportHostRequest sends support host registeration request
 // to the Chromoting Bot. It listens to the status of the host using
@@ -87,4 +86,4 @@ class RegisterSupportHostRequest : public HostStatusObserver {
 
 }  // namespace remoting
 
-#endif  // REMOTING_HOST_SUPPORT_HOST_REGISTER_QUERY_H_
+#endif  // REMOTING_HOST_REGISTER_SUPPORT_HOST_REQUEST_H_
diff --git a/remoting/host/support_access_verifier.h b/remoting/host/support_access_verifier.h
index b01f93f..b6b7c7a 100644
--- a/remoting/host/support_access_verifier.h
+++ b/remoting/host/support_access_verifier.h
@@ -13,8 +13,6 @@
 
 namespace remoting {
 
-class HostConfig;
-
 // SupportAccessVerifier is used in Me2Mom scenario to verify that the
 // client knows the host secret.
 class SupportAccessVerifier : public AccessVerifier {
diff --git a/remoting/jingle_glue/jingle_thread.h b/remoting/jingle_glue/jingle_thread.h
index 80924a21..aa69153 100644
--- a/remoting/jingle_glue/jingle_thread.h
+++ b/remoting/jingle_glue/jingle_thread.h
@@ -16,10 +16,6 @@ namespace base {
 class MessageLoopProxy;
 }  // namespace base
 
-namespace buzz {
-class XmppClient;
-}  // namespace buzz
-
 namespace remoting {
 
 class TaskPump : public talk_base::MessageHandler,
@@ -37,7 +33,7 @@ class TaskPump : public talk_base::MessageHandler,
 
 class JingleThreadMessageLoop : public MessageLoop {
  public:
-  JingleThreadMessageLoop(talk_base::Thread* thread);
+  explicit JingleThreadMessageLoop(talk_base::Thread* thread);
   virtual ~JingleThreadMessageLoop();
 
  private:
diff --git a/remoting/jingle_glue/xmpp_proxy.h b/remoting/jingle_glue/xmpp_proxy.h
index de2436a..34bb974 100644
--- a/remoting/jingle_glue/xmpp_proxy.h
+++ b/remoting/jingle_glue/xmpp_proxy.h
@@ -19,8 +19,6 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 
-class MessageLoop;
-
 namespace remoting {
 
 class XmppProxy : public base::RefCountedThreadSafe<XmppProxy> {
@@ -54,4 +52,4 @@ class XmppProxy : public base::RefCountedThreadSafe<XmppProxy> {
 
 }  // namespace remoting
 
-#endif // REMOTING_JINGLE_GLUE_XMPP_PROXY_H_
+#endif  // REMOTING_JINGLE_GLUE_XMPP_PROXY_H_
diff --git a/remoting/protocol/buffered_socket_writer.h b/remoting/protocol/buffered_socket_writer.h
index 4fd7f79..5aa083f 100644
--- a/remoting/protocol/buffered_socket_writer.h
+++ b/remoting/protocol/buffered_socket_writer.h
@@ -13,8 +13,6 @@
 #include "net/base/io_buffer.h"
 #include "net/socket/socket.h"
 
-class Task;
-
 namespace base {
 class MessageLoopProxy;
 }  // namespace base
@@ -108,7 +106,7 @@ class BufferedSocketWriterBase
 
 class BufferedSocketWriter : public BufferedSocketWriterBase {
  public:
-  BufferedSocketWriter(base::MessageLoopProxy* message_loop);
+  explicit BufferedSocketWriter(base::MessageLoopProxy* message_loop);
   virtual ~BufferedSocketWriter();
 
  protected:
@@ -122,7 +120,7 @@ class BufferedSocketWriter : public BufferedSocketWriterBase {
 
 class BufferedDatagramWriter : public BufferedSocketWriterBase {
  public:
-  BufferedDatagramWriter(base::MessageLoopProxy* message_loop);
+  explicit BufferedDatagramWriter(base::MessageLoopProxy* message_loop);
   virtual ~BufferedDatagramWriter();
 
  protected:
diff --git a/remoting/protocol/client_control_sender.h b/remoting/protocol/client_control_sender.h
index b26e995..f563e89 100644
--- a/remoting/protocol/client_control_sender.h
+++ b/remoting/protocol/client_control_sender.h
@@ -9,16 +9,14 @@
 //
 // This class can be used on any thread.
 
-#ifndef REMOTING_PROTOCOL_CLIENT_STUB_IMPL_H_
-#define REMOTING_PROTOCOL_CLIENT_STUB_IMPL_H_
+#ifndef REMOTING_PROTOCOL_CLIENT_CONTROL_SENDER_H_
+#define REMOTING_PROTOCOL_CLIENT_CONTROL_SENDER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "remoting/protocol/client_stub.h"
 
-class Task;
-
 namespace base {
 class MessageLoopProxy;
 }  // namespace base
@@ -56,4 +54,4 @@ class ClientControlSender : public ClientStub {
 }  // namespace protocol
 }  // namespace remoting
 
-#endif  // REMOTING_PROTOCOL_CLIENT_STUB_IMPL_H_
+#endif  // REMOTING_PROTOCOL_CLIENT_CONTROL_SENDER_H_
diff --git a/remoting/protocol/client_message_dispatcher.h b/remoting/protocol/client_message_dispatcher.h
index 47227af..cbc9405 100644
--- a/remoting/protocol/client_message_dispatcher.h
+++ b/remoting/protocol/client_message_dispatcher.h
@@ -11,8 +11,6 @@
 
 namespace remoting {
 
-class EventMessage;
-
 namespace protocol {
 
 class ClientStub;
diff --git a/remoting/protocol/connection_to_host.h b/remoting/protocol/connection_to_host.h
index c7cc0d0..dcca294 100644
--- a/remoting/protocol/connection_to_host.h
+++ b/remoting/protocol/connection_to_host.h
@@ -26,14 +26,12 @@ class Instance;
 
 namespace remoting {
 
-class JingleThread;
 class XmppProxy;
 class VideoPacket;
 
 namespace protocol {
 
 class ClientMessageDispatcher;
-class ClientControlSender;
 class ClientStub;
 class HostControlSender;
 class HostStub;
diff --git a/remoting/protocol/host_message_dispatcher.h b/remoting/protocol/host_message_dispatcher.h
index 0b95e46..a1b941b 100644
--- a/remoting/protocol/host_message_dispatcher.h
+++ b/remoting/protocol/host_message_dispatcher.h
@@ -10,10 +10,6 @@
 #include "base/task.h"
 #include "remoting/protocol/message_reader.h"
 
-namespace base {
-class MessageLoopProxy;
-}  // namespace base
-
 namespace remoting {
 namespace protocol {
 
diff --git a/remoting/protocol/host_stub.h b/remoting/protocol/host_stub.h
index 9d4b796..a52429a 100644
--- a/remoting/protocol/host_stub.h
+++ b/remoting/protocol/host_stub.h
@@ -11,15 +11,13 @@
 
 #include "base/basictypes.h"
 
-class Task;
-
 namespace remoting {
 namespace protocol {
 
 class HostStub {
  public:
-  HostStub() {};
-  virtual ~HostStub() {};
+  HostStub() {}
+  virtual ~HostStub() {}
 
   // Currently we don't use the control channel for anything. Add new
   // message handlers here when necessary.
diff --git a/remoting/protocol/input_stub.h b/remoting/protocol/input_stub.h
index 5db53ee..b7ec67e 100644
--- a/remoting/protocol/input_stub.h
+++ b/remoting/protocol/input_stub.h
@@ -10,8 +10,6 @@
 
 #include "base/basictypes.h"
 
-class Task;
-
 namespace remoting {
 namespace protocol {
 
@@ -20,8 +18,8 @@ class MouseEvent;
 
 class InputStub {
  public:
-  InputStub() {};
-  virtual ~InputStub() {};
+  InputStub() {}
+  virtual ~InputStub() {}
 
   virtual void InjectKeyEvent(const KeyEvent& event) = 0;
   virtual void InjectMouseEvent(const MouseEvent& event) = 0;
diff --git a/remoting/protocol/jingle_datagram_connector.h b/remoting/protocol/jingle_datagram_connector.h
index dafdb0d..bbd7e944 100644
--- a/remoting/protocol/jingle_datagram_connector.h
+++ b/remoting/protocol/jingle_datagram_connector.h
@@ -5,14 +5,12 @@
 #ifndef REMOTING_PROTOCOL_JINGLE_DATAGRAM_CONNECTOR_H_
 #define REMOTING_PROTOCOL_JINGLE_DATAGRAM_CONNECTOR_H_
 
+#include <string>
+
 #include "net/base/completion_callback.h"
 #include "remoting/protocol/jingle_channel_connector.h"
 #include "remoting/protocol/session.h"
 
-namespace cricket {
-class TransportChannel;
-}  // namespace cricket
-
 namespace jingle_glue {
 class TransportChannelSocketAdapter;
 }  // namespace jingle_glue
diff --git a/remoting/protocol/jingle_stream_connector.h b/remoting/protocol/jingle_stream_connector.h
index d443ffd..8aec6fb 100644
--- a/remoting/protocol/jingle_stream_connector.h
+++ b/remoting/protocol/jingle_stream_connector.h
@@ -5,6 +5,8 @@
 #ifndef REMOTING_PROTOCOL_JINGLE_STREAM_CONNECTOR_H_
 #define REMOTING_PROTOCOL_JINGLE_STREAM_CONNECTOR_H_
 
+#include <string>
+
 #include "base/memory/scoped_ptr.h"
 #include "net/base/completion_callback.h"
 #include "remoting/protocol/channel_authenticator.h"
@@ -15,10 +17,6 @@ namespace cricket {
 class TransportChannel;
 }  // namespace cricket
 
-namespace jingle_glue {
-class TransportChannelSocketAdapter;
-}  // namespace jingle_glue
-
 namespace net {
 class CertVerifier;
 class StreamSocket;
diff --git a/remoting/protocol/pepper_session.h b/remoting/protocol/pepper_session.h
index 861ff8d..d44112a 100644
--- a/remoting/protocol/pepper_session.h
+++ b/remoting/protocol/pepper_session.h
@@ -5,6 +5,7 @@
 #ifndef REMOTING_PROTOCOL_PEPPER_SESSION_H_
 #define REMOTING_PROTOCOL_PEPPER_SESSION_H_
 
+#include <list>
 #include <map>
 #include <string>
 
@@ -17,17 +18,10 @@
 #include "remoting/protocol/session_config.h"
 
 namespace net {
-class CertVerifier;
-class ClientSocketFactory;
 class Socket;
 class StreamSocket;
-class X509Certificate;
 }  // namespace net
 
-namespace pp {
-class Instance;
-}  // namespace pp
-
 namespace remoting {
 
 class IqRequest;
@@ -36,7 +30,6 @@ namespace protocol {
 
 class PepperChannel;
 class PepperSessionManager;
-class SocketWrapper;
 
 // Implements the protocol::Session interface using the Pepper P2P
 // Transport API. Created by PepperSessionManager for incoming and
@@ -75,7 +68,7 @@ class PepperSession : public Session {
 
   typedef std::map<std::string, PepperChannel*> ChannelsMap;
 
-  PepperSession(PepperSessionManager* session_manager);
+  explicit PepperSession(PepperSessionManager* session_manager);
 
   // Start cs connection by sending session-initiate message.
   void StartConnection(const std::string& peer_jid,
diff --git a/remoting/protocol/pepper_stream_channel.h b/remoting/protocol/pepper_stream_channel.h
index d0f7bb2..4041a68 100644
--- a/remoting/protocol/pepper_stream_channel.h
+++ b/remoting/protocol/pepper_stream_channel.h
@@ -5,6 +5,8 @@
 #ifndef REMOTING_PROTOCOL_PEPPER_STREAM_CHANNEL_H_
 #define REMOTING_PROTOCOL_PEPPER_STREAM_CHANNEL_H_
 
+#include <string>
+
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/completion_callback.h"
@@ -17,7 +19,6 @@ namespace net {
 class CertVerifier;
 class StreamSocket;
 class SSLClientSocket;
-class SSLServerSocket;
 }  // namespace net
 
 namespace remoting {
diff --git a/remoting/protocol/pepper_transport_socket_adapter.h b/remoting/protocol/pepper_transport_socket_adapter.h
index d7e49c9..881d612 100644
--- a/remoting/protocol/pepper_transport_socket_adapter.h
+++ b/remoting/protocol/pepper_transport_socket_adapter.h
@@ -16,7 +16,6 @@
 #include "ppapi/cpp/completion_callback.h"
 
 namespace pp {
-class Instance;
 class Transport_Dev;
 }  // namespace pp
 
diff --git a/remoting/protocol/protocol_mock_objects.h b/remoting/protocol/protocol_mock_objects.h
index 9a3f50d..3a06c1d 100644
--- a/remoting/protocol/protocol_mock_objects.h
+++ b/remoting/protocol/protocol_mock_objects.h
@@ -5,6 +5,8 @@
 #ifndef REMOTING_PROTOCOL_PROTOCOL_MOCK_OBJECTS_H_
 #define REMOTING_PROTOCOL_PROTOCOL_MOCK_OBJECTS_H_
 
+#include <string>
+
 #include "remoting/proto/internal.pb.h"
 #include "remoting/protocol/client_stub.h"
 #include "remoting/protocol/connection_to_client.h"
@@ -17,8 +19,6 @@
 namespace remoting {
 namespace protocol {
 
-class ChromotocolConnection;
-
 class MockConnectionToClient : public ConnectionToClient {
  public:
   MockConnectionToClient(Session* session,
diff --git a/remoting/protocol/rtcp_writer.h b/remoting/protocol/rtcp_writer.h
index 7ae49dd..ff7d9cd 100644
--- a/remoting/protocol/rtcp_writer.h
+++ b/remoting/protocol/rtcp_writer.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -13,8 +13,6 @@ class MessageLoopProxy;
 
 namespace remoting {
 
-class CompoundBuffer;
-
 namespace protocol {
 
 class BufferedDatagramWriter;
@@ -22,7 +20,7 @@ struct RtcpReceiverReport;
 
 class RtcpWriter {
  public:
-  RtcpWriter(base::MessageLoopProxy* message_loop);
+  explicit RtcpWriter(base::MessageLoopProxy* message_loop);
   virtual ~RtcpWriter();
 
   // Initializes the writer. Must be called on the thread the socket
diff --git a/remoting/protocol/session.h b/remoting/protocol/session.h
index 432b948..e0a91a0 100644
--- a/remoting/protocol/session.h
+++ b/remoting/protocol/session.h
@@ -12,8 +12,6 @@
 #include "remoting/protocol/buffered_socket_writer.h"
 #include "remoting/protocol/session_config.h"
 
-class Task;
-
 namespace net {
 class Socket;
 class StreamSocket;
diff --git a/remoting/protocol/session_manager.h b/remoting/protocol/session_manager.h
index 65f6649..f36abd2 100644
--- a/remoting/protocol/session_manager.h
+++ b/remoting/protocol/session_manager.h
@@ -52,8 +52,6 @@
 #include "base/threading/non_thread_safe.h"
 #include "remoting/protocol/session.h"
 
-class Task;
-
 namespace crypto {
 class RSAPrivateKey;
 }  // namespace base
diff --git a/remoting/protocol/util.h b/remoting/protocol/util.h
index 802e65c..a40a9aa 100644
--- a/remoting/protocol/util.h
+++ b/remoting/protocol/util.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -11,8 +11,6 @@
 #include "net/base/io_buffer.h"
 #include "third_party/protobuf/src/google/protobuf/message_lite.h"
 
-class Task;
-
 namespace remoting {
 namespace protocol {
 
diff --git a/remoting/protocol/video_reader.h b/remoting/protocol/video_reader.h
index ada9c30..a7860eb 100644
--- a/remoting/protocol/video_reader.h
+++ b/remoting/protocol/video_reader.h
@@ -17,9 +17,6 @@ class MessageLoopProxy;
 }  // namespace base
 
 namespace remoting {
-
-class ChromotocolConnection;
-
 namespace protocol {
 
 class Session;