7 files changed, 10 insertions, 23 deletions
diff --git a/absl/synchronization/blocking_counter.cc b/absl/synchronization/blocking_counter.cc
index 48e3650da246..7e68e960bc3a 100644
--- a/absl/synchronization/blocking_counter.cc
+++ b/absl/synchronization/blocking_counter.cc
@@ -14,6 +14,8 @@
 
 #include "absl/synchronization/blocking_counter.h"
 
+#include "absl/base/internal/raw_logging.h"
+
 namespace absl {
 
 // Return whether int *arg is zero.
diff --git a/absl/synchronization/blocking_counter_test.cc b/absl/synchronization/blocking_counter_test.cc
index b4b6677234e9..e8223f841a5f 100644
--- a/absl/synchronization/blocking_counter_test.cc
+++ b/absl/synchronization/blocking_counter_test.cc
@@ -14,13 +14,12 @@
 
 #include "absl/synchronization/blocking_counter.h"
 
-#include <functional>
-#include <memory>
 #include <thread>  // NOLINT(build/c++11)
 #include <vector>
 
 #include "gtest/gtest.h"
 #include "absl/time/clock.h"
+#include "absl/time/time.h"
 
 namespace absl {
 namespace {
diff --git a/absl/synchronization/internal/create_thread_identity.cc b/absl/synchronization/internal/create_thread_identity.cc
index 14976347b671..0134a4399b42 100644
--- a/absl/synchronization/internal/create_thread_identity.cc
+++ b/absl/synchronization/internal/create_thread_identity.cc
@@ -12,13 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <stdint.h>
+#include <new>
+
 // This file is a no-op if the required LowLevelAlloc support is missing.
 #include "absl/base/internal/low_level_alloc.h"
 #ifndef ABSL_LOW_LEVEL_ALLOC_MISSING
 
 #include <string.h>
-#include <atomic>
-#include <memory>
 
 #include "absl/base/internal/spinlock.h"
 #include "absl/base/internal/thread_identity.h"
diff --git a/absl/synchronization/internal/graphcycles_test.cc b/absl/synchronization/internal/graphcycles_test.cc
index 734f2770b26e..9a85b39074d7 100644
--- a/absl/synchronization/internal/graphcycles_test.cc
+++ b/absl/synchronization/internal/graphcycles_test.cc
@@ -12,22 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Copyright 2007 Google, Inc.
-// All rights reserved.
-
-// Author: Mike Burrows
-
-// A test for the GraphCycles interface.
-
-// This test is testing a component of //third_party/absl.  As written it
-// heavily uses logging, including VLOG, so this test can't ship with Abseil.
-// We're leaving it here until Abseil gets base/logging.h in a future release.
 #include "absl/synchronization/internal/graphcycles.h"
 
 #include <map>
 #include <random>
-#include <vector>
 #include <unordered_set>
+#include <utility>
+#include <vector>
 
 #include "gtest/gtest.h"
 #include "absl/base/internal/raw_logging.h"
diff --git a/absl/synchronization/internal/per_thread_sem_test.cc b/absl/synchronization/internal/per_thread_sem_test.cc
index 1d072a79e3d4..61296cfca502 100644
--- a/absl/synchronization/internal/per_thread_sem_test.cc
+++ b/absl/synchronization/internal/per_thread_sem_test.cc
@@ -22,13 +22,13 @@
 #include <string>
 #include <thread>              // NOLINT(build/c++11)
 
+#include "gtest/gtest.h"
 #include "absl/base/internal/cycleclock.h"
 #include "absl/base/internal/malloc_extension.h"
 #include "absl/base/internal/thread_identity.h"
 #include "absl/strings/str_cat.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
-#include "gtest/gtest.h"
 
 // In this test we explicitly avoid the use of synchronization
 // primitives which might use PerThreadSem, most notably absl::Mutex.
diff --git a/absl/synchronization/mutex.h b/absl/synchronization/mutex.h
index a417802677cc..8343c9c8961f 100644
--- a/absl/synchronization/mutex.h
+++ b/absl/synchronization/mutex.h
@@ -81,8 +81,8 @@
 
 namespace absl {
 
-struct SynchWaitParams;
 class Condition;
+struct SynchWaitParams;
 
 // -----------------------------------------------------------------------------
 // Mutex
diff --git a/absl/synchronization/mutex_test.cc b/absl/synchronization/mutex_test.cc
index 9cf34fce0271..cfe81096dc98 100644
--- a/absl/synchronization/mutex_test.cc
+++ b/absl/synchronization/mutex_test.cc
@@ -20,7 +20,6 @@
 
 #include <algorithm>
 #include <atomic>
-#include <cstdint>
 #include <cstdlib>
 #include <functional>
 #include <memory>
@@ -32,8 +31,6 @@
 #include "gtest/gtest.h"
 #include "absl/base/internal/raw_logging.h"
 #include "absl/base/internal/sysinfo.h"
-#include "absl/base/macros.h"
-#include "absl/base/thread_annotations.h"
 #include "absl/memory/memory.h"
 #include "absl/synchronization/internal/thread_pool.h"
 #include "absl/time/clock.h"
@@ -713,7 +710,6 @@ static void LockWhenTestWaitForIsCond(LockWhenTestStruct* s) {
 TEST(Mutex, LockWhen) {
   LockWhenTestStruct s;
 
-  // Don't use ThreadPool for this test. See b/65107115.
   std::thread t(LockWhenTestWaitForIsCond, &s);
   s.mu2.LockWhen(absl::Condition(&s.waiting));
   s.mu2.Unlock();
@@ -1041,8 +1037,6 @@ TEST(Mutex, DeadlockDetector) {
   m2.Unlock();
   m4.Unlock();
   m1.Unlock();
-  // Pre b/7636708 the thread local cache remembered that ID1 is assigned to m1.
-  // So, we had a cycle ID1=>ID1=>ID1.
 }
 
 // Bazel has a test "warning" file that programs can write to if the