Merge "iwyu: //aos/mutex/..."
diff --git a/aos/mutex/mutex.cc b/aos/mutex/mutex.cc
index 5c5dcbe..30a9534 100644
--- a/aos/mutex/mutex.cc
+++ b/aos/mutex/mutex.cc
@@ -1,13 +1,7 @@
#include "aos/mutex/mutex.h"
-#include <cinttypes>
-#include <cstdio>
-#include <cstring>
-
#include "glog/logging.h"
-#include "aos/type_traits/type_traits.h"
-
namespace aos {
// Lock and Unlock use the return values of mutex_lock/mutex_unlock
diff --git a/aos/mutex/mutex.h b/aos/mutex/mutex.h
index 869f429..dfc212a 100644
--- a/aos/mutex/mutex.h
+++ b/aos/mutex/mutex.h
@@ -1,6 +1,8 @@
#ifndef AOS_MUTEX_H_
#define AOS_MUTEX_H_
+#include <ostream>
+
#include "glog/logging.h"
#include "aos/ipc_lib/aos_sync.h"
@@ -8,9 +10,6 @@
#include "aos/type_traits/type_traits.h"
namespace aos {
-
-class Condition;
-
// An abstraction of a mutex that is easy to implement for environments other
// than Linux too.
// If there are multiple threads or processes contending for the mutex,
diff --git a/aos/mutex/mutex_test.cc b/aos/mutex/mutex_test.cc
index 8d10b26..9f8efbf 100644
--- a/aos/mutex/mutex_test.cc
+++ b/aos/mutex/mutex_test.cc
@@ -1,20 +1,17 @@
#include "aos/mutex/mutex.h"
-#include <pthread.h>
-#include <sched.h>
-
#include <chrono>
-#include <cmath>
+#include <memory>
+#include <new>
#include <thread>
#include "gtest/gtest.h"
#include "aos/die.h"
-#include "aos/ipc_lib/aos_sync.h"
#include "aos/ipc_lib/core_lib.h"
+#include "aos/logging/implementations.h"
#include "aos/testing/test_logging.h"
#include "aos/testing/test_shm.h"
-#include "aos/time/time.h"
#include "aos/util/death_test_log_implementation.h"
namespace aos::testing {