9 files changed, 5 insertions, 10 deletions
diff --git a/base/condition_variable_posix.cc b/base/condition_variable_posix.cc
index 9555be7..5d9ccb4 100644
--- a/base/condition_variable_posix.cc
+++ b/base/condition_variable_posix.cc
@@ -8,7 +8,6 @@
 #include <sys/time.h>
 
 #include "base/lock.h"
-#include "base/lock_impl.h"
 #include "base/logging.h"
 #include "base/time.h"
 
diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc
index 0d8ccbb..e0a1a55 100644
--- a/base/file_util_posix.cc
+++ b/base/file_util_posix.cc
@@ -33,7 +33,6 @@
 #include "base/basictypes.h"
 #include "base/eintr_wrapper.h"
 #include "base/file_path.h"
-#include "base/lock.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/singleton.h"
@@ -864,4 +863,4 @@ bool CopyFile(const FilePath& from_path, const FilePath& to_path) {
 }
 #endif  // defined(OS_MACOSX)
 
-} // namespace file_util
+}  // namespace file_util
diff --git a/base/lock.h b/base/lock.h
index 0ae4861..ba34964 100644
--- a/base/lock.h
+++ b/base/lock.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "base/lock_impl.h"
+#include "base/platform_thread.h"
 
 // A convenient wrapper for an OS specific critical section.  The only real
 // intelligence in this class is in debug mode for the support for the
diff --git a/base/lock_impl.h b/base/lock_impl.h
index 9a6a1a0..6066495 100644
--- a/base/lock_impl.h
+++ b/base/lock_impl.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -15,7 +15,6 @@
 #endif
 
 #include "base/basictypes.h"
-#include "base/platform_thread.h"
 
 // This class implements the underlying platform-specific spin-lock mechanism
 // used for the Lock class.  Most users should not use LockImpl directly, but
diff --git a/base/message_pump_win.h b/base/message_pump_win.h
index d57fe1d..ea7dd39 100644
--- a/base/message_pump_win.h
+++ b/base/message_pump_win.h
@@ -11,7 +11,6 @@
 #include <list>
 
 #include "base/basictypes.h"
-#include "base/lock.h"
 #include "base/message_pump.h"
 #include "base/observer_list.h"
 #include "base/scoped_handle.h"
diff --git a/base/simple_thread_unittest.cc b/base/simple_thread_unittest.cc
index 85995c2..208290a 100644
--- a/base/simple_thread_unittest.cc
+++ b/base/simple_thread_unittest.cc
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "base/atomic_sequence_num.h"
-#include "base/lock.h"
 #include "base/simple_thread.h"
 #include "base/string_number_conversions.h"
 #include "base/waitable_event.h"
diff --git a/base/singleton.h b/base/singleton.h
index 7caa8ee..8435c43 100644
--- a/base/singleton.h
+++ b/base/singleton.h
@@ -8,6 +8,7 @@
 
 #include "base/at_exit.h"
 #include "base/atomicops.h"
+#include "base/platform_thread.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
 #include "base/thread_restrictions.h"
 
diff --git a/base/thread_unittest.cc b/base/thread_unittest.cc
index 1651a6a..6b72b83 100644
--- a/base/thread_unittest.cc
+++ b/base/thread_unittest.cc
@@ -6,7 +6,6 @@
 
 #include <vector>
 
-#include "base/lock.h"
 #include "base/message_loop.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/base/tracked_objects.h b/base/tracked_objects.h
index 87912c0..8590a8c 100644
--- a/base/tracked_objects.h
+++ b/base/tracked_objects.h
@@ -11,7 +11,6 @@
 #include <vector>
 
 #include "base/lock.h"
-#include "base/task.h"
 #include "base/thread_local_storage.h"
 #include "base/tracked.h"