8 files changed, 11 insertions, 5 deletions
diff --git a/remoting/base/codec_test.cc b/remoting/base/codec_test.cc
index dcc165e..891d4df 100644
--- a/remoting/base/codec_test.cc
+++ b/remoting/base/codec_test.cc
@@ -2,9 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <deque>
 #include <stdlib.h>
 
+#include <deque>
+
+#include "base/task.h"
 #include "gfx/rect.h"
 #include "media/base/video_frame.h"
 #include "remoting/base/codec_test.h"
@@ -153,7 +155,7 @@ class EncoderMessageTester {
 
 class DecoderTester {
  public:
-  DecoderTester(Decoder* decoder)
+  explicit DecoderTester(Decoder* decoder)
       : strict_(false),
         decoder_(decoder),
         decode_done_(false) {
diff --git a/remoting/base/decoder.h b/remoting/base/decoder.h
index bcb5a54..2412a7e 100644
--- a/remoting/base/decoder.h
+++ b/remoting/base/decoder.h
@@ -7,12 +7,13 @@
 
 #include <vector>
 
-#include "base/task.h"
 #include "base/scoped_ptr.h"
 #include "gfx/rect.h"
 #include "media/base/video_frame.h"
 #include "remoting/proto/video.pb.h"
 
+class Task;
+
 namespace remoting {
 
 typedef std::vector<gfx::Rect> UpdatedRects;
diff --git a/remoting/base/decoder_row_based.cc b/remoting/base/decoder_row_based.cc
index 8e34e1d..880cacf 100644
--- a/remoting/base/decoder_row_based.cc
+++ b/remoting/base/decoder_row_based.cc
@@ -4,6 +4,7 @@
 
 #include "remoting/base/decoder_row_based.h"
 
+#include "base/logging.h"
 #include "remoting/base/decompressor.h"
 #include "remoting/base/decompressor_zlib.h"
 #include "remoting/base/decompressor_verbatim.h"
diff --git a/remoting/base/decoder_vp8.cc b/remoting/base/decoder_vp8.cc
index 516e9f4..8f0ce16 100644
--- a/remoting/base/decoder_vp8.cc
+++ b/remoting/base/decoder_vp8.cc
@@ -4,6 +4,7 @@
 
 #include "remoting/base/decoder_vp8.h"
 
+#include "base/logging.h"
 #include "media/base/media.h"
 #include "media/base/yuv_convert.h"
 #include "remoting/base/util.h"
diff --git a/remoting/host/capturer.h b/remoting/host/capturer.h
index 548b685..08fb077 100644
--- a/remoting/host/capturer.h
+++ b/remoting/host/capturer.h
@@ -8,7 +8,6 @@
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/lock.h"
-#include "base/task.h"
 #include "remoting/base/capture_data.h"
 #include "remoting/base/types.h"
 
diff --git a/remoting/host/capturer_linux.cc b/remoting/host/capturer_linux.cc
index 70c956d..4bd188a 100644
--- a/remoting/host/capturer_linux.cc
+++ b/remoting/host/capturer_linux.cc
@@ -10,6 +10,7 @@
 
 #include <set>
 
+#include "base/logging.h"
 #include "remoting/base/types.h"
 
 namespace remoting {
diff --git a/remoting/host/capturer_mac.cc b/remoting/host/capturer_mac.cc
index 9cd0e75..4d947fc 100644
--- a/remoting/host/capturer_mac.cc
+++ b/remoting/host/capturer_mac.cc
@@ -8,6 +8,8 @@
 
 #include <OpenGL/CGLMacro.h>
 
+#include "base/logging.h"
+
 namespace remoting {
 
 CapturerMac::CapturerMac(MessageLoop* message_loop)
diff --git a/remoting/host/session_manager_unittest.cc b/remoting/host/session_manager_unittest.cc
index 967d778..63d1116 100644
--- a/remoting/host/session_manager_unittest.cc
+++ b/remoting/host/session_manager_unittest.cc
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "base/message_loop.h"
-#include "base/task.h"
 #include "remoting/base/mock_objects.h"
 #include "remoting/host/mock_objects.h"
 #include "remoting/host/session_manager.h"