[go: nahoru, domu]

Fix some IWYU errors in advance of removing some #includes.

Bug: 242216
Change-Id: Ia2b406e86e4989be41f9213e16f6c0bc04990aa1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3009974
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Commit-Queue: danakj <danakj@chromium.org>
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Reviewed-by: danakj <danakj@chromium.org>
Owners-Override: danakj <danakj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#898962}
diff --git a/android_webview/browser/cookie_manager.h b/android_webview/browser/cookie_manager.h
index e9b0dbd..02635639 100644
--- a/android_webview/browser/cookie_manager.h
+++ b/android_webview/browser/cookie_manager.h
@@ -10,6 +10,7 @@
 
 #include "base/android/scoped_java_ref.h"
 #include "base/containers/circular_deque.h"
+#include "base/files/file_path.h"
 #include "base/no_destructor.h"
 #include "base/thread_annotations.h"
 #include "base/threading/thread.h"
diff --git a/android_webview/nonembedded/component_updater/aw_component_update_service.cc b/android_webview/nonembedded/component_updater/aw_component_update_service.cc
index bdc6e8a..d823204 100644
--- a/android_webview/nonembedded/component_updater/aw_component_update_service.cc
+++ b/android_webview/nonembedded/component_updater/aw_component_update_service.cc
@@ -17,6 +17,7 @@
 #include "base/check.h"
 #include "base/command_line.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "base/time/time.h"
 #include "components/component_updater/component_installer.h"
 #include "components/component_updater/component_updater_service.h"
 #include "components/component_updater/component_updater_utils.h"
diff --git a/android_webview/nonembedded/component_updater/aw_component_update_service.h b/android_webview/nonembedded/component_updater/aw_component_update_service.h
index 2fb9309..9542814 100644
--- a/android_webview/nonembedded/component_updater/aw_component_update_service.h
+++ b/android_webview/nonembedded/component_updater/aw_component_update_service.h
@@ -21,8 +21,11 @@
 #include "components/update_client/update_client_errors.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
-namespace android_webview {
+namespace base {
+class TimeTicks;
+}
 
+namespace android_webview {
 using RegisterComponentsCallback =
     base::RepeatingCallback<bool(const update_client::CrxComponent&)>;
 
@@ -34,8 +37,8 @@
  public:
   static AwComponentUpdateService* GetInstance();
 
-  // Callback used for updating components, with an int that represents how many
-  // components were actually updated.
+  // Callback used for updating components, with an int that represents how
+  // many components were actually updated.
   using UpdateCallback = base::OnceCallback<void(int)>;
 
   void StartComponentUpdateService(UpdateCallback finished_callback);
@@ -80,10 +83,11 @@
   // A collection of every registered component.
   base::flat_map<std::string, update_client::CrxComponent> components_;
 
-  // Maintains the order in which components have been registered. The position
-  // of a component id in this sequence indicates the priority of the component.
-  // The sooner the component gets registered, the higher its priority, and
-  // the closer this component is to the beginning of the vector.
+  // Maintains the order in which components have been registered. The
+  // position of a component id in this sequence indicates the priority of the
+  // component. The sooner the component gets registered, the higher its
+  // priority, and the closer this component is to the beginning of the
+  // vector.
   std::vector<std::string> components_order_;
 
   void RecordComponentsUpdated(UpdateCallback on_finished,
diff --git a/ash/public/cpp/holding_space/holding_space_constants.h b/ash/public/cpp/holding_space/holding_space_constants.h
index 0386331..cd1611c 100644
--- a/ash/public/cpp/holding_space/holding_space_constants.h
+++ b/ash/public/cpp/holding_space/holding_space_constants.h
@@ -6,6 +6,7 @@
 #define ASH_PUBLIC_CPP_HOLDING_SPACE_HOLDING_SPACE_CONSTANTS_H_
 
 #include "ash/public/cpp/app_menu_constants.h"
+#include "base/time/time.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/size.h"
 
diff --git a/ash/public/cpp/shelf_config.h b/ash/public/cpp/shelf_config.h
index 0b2b8f3..be0d84e0 100644
--- a/ash/public/cpp/shelf_config.h
+++ b/ash/public/cpp/shelf_config.h
@@ -21,6 +21,10 @@
 #include "ui/display/display_observer.h"
 #include "ui/gfx/animation/tween.h"
 
+namespace base {
+class TimeDelta;
+}
+
 namespace session_manager {
 enum class SessionState;
 }  // namespace session_manager
diff --git a/ash/public/cpp/test/test_nearby_share_delegate.h b/ash/public/cpp/test/test_nearby_share_delegate.h
index fdb6067f..f1ba04a 100644
--- a/ash/public/cpp/test/test_nearby_share_delegate.h
+++ b/ash/public/cpp/test/test_nearby_share_delegate.h
@@ -9,10 +9,7 @@
 
 #include "ash/public/cpp/ash_public_export.h"
 #include "ash/public/cpp/nearby_share_delegate.h"
-
-namespace base {
-class TimeTicks;
-}  // namespace base
+#include "base/time/time.h"
 
 namespace ash {
 
diff --git a/ash/services/recording/recording_encoder_muxer.h b/ash/services/recording/recording_encoder_muxer.h
index 01f70e6..0c6db5ba 100644
--- a/ash/services/recording/recording_encoder_muxer.h
+++ b/ash/services/recording/recording_encoder_muxer.h
@@ -24,6 +24,10 @@
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "ui/gfx/geometry/size.h"
 
+namespace base {
+class FilePath;
+}
+
 namespace media {
 class VideoFrame;
 }  // namespace media
diff --git a/ash/wm/window_state.h b/ash/wm/window_state.h
index 5fa3098..49920f2 100644
--- a/ash/wm/window_state.h
+++ b/ash/wm/window_state.h
@@ -13,6 +13,7 @@
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
+#include "base/time/time.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/ui_base_types.h"
diff --git a/base/profiler/sample_metadata.h b/base/profiler/sample_metadata.h
index d909746..57a6db4 100644
--- a/base/profiler/sample_metadata.h
+++ b/base/profiler/sample_metadata.h
@@ -53,6 +53,8 @@
 
 namespace base {
 
+class TimeTicks;
+
 class BASE_EXPORT SampleMetadata {
  public:
   // Set the metadata value associated with |name|.
diff --git a/base/test/sequenced_task_runner_test_template.h b/base/test/sequenced_task_runner_test_template.h
index efde05b..ddff6273b 100644
--- a/base/test/sequenced_task_runner_test_template.h
+++ b/base/test/sequenced_task_runner_test_template.h
@@ -21,6 +21,7 @@
 #include "base/sequenced_task_runner.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
+#include "base/threading/platform_thread.h"
 #include "base/time/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/base/trace_event/trace_event.h b/base/trace_event/trace_event.h
index 0d6b3c9c..f5282a47 100644
--- a/base/trace_event/trace_event.h
+++ b/base/trace_event/trace_event.h
@@ -18,6 +18,7 @@
 #include "base/atomicops.h"
 #include "base/base_export.h"
 #include "base/debug/debugging_buildflags.h"
+#include "base/threading/platform_thread.h"
 #include "base/time/time.h"
 #include "base/time/time_override.h"
 #include "base/trace_event/builtin_categories.h"
diff --git a/base/trace_event/trace_log.h b/base/trace_event/trace_log.h
index bbf35dc..0f10426 100644
--- a/base/trace_event/trace_log.h
+++ b/base/trace_event/trace_log.h
@@ -20,6 +20,7 @@
 #include "base/memory/scoped_refptr.h"
 #include "base/no_destructor.h"
 #include "base/single_thread_task_runner.h"
+#include "base/threading/platform_thread.h"
 #include "base/time/time_override.h"
 #include "base/trace_event/category_registry.h"
 #include "base/trace_event/memory_dump_provider.h"
diff --git a/cc/animation/animation_timeline.cc b/cc/animation/animation_timeline.cc
index d7067c5..ac3a92e 100644
--- a/cc/animation/animation_timeline.cc
+++ b/cc/animation/animation_timeline.cc
@@ -5,7 +5,10 @@
 #include "cc/animation/animation_timeline.h"
 
 #include <algorithm>
+#include <utility>
+#include <vector>
 
+#include "base/time/time.h"
 #include "cc/animation/animation.h"
 #include "cc/animation/animation_host.h"
 #include "cc/trees/property_tree.h"
diff --git a/cc/animation/animation_timeline.h b/cc/animation/animation_timeline.h
index 6ff994a..3f23c39 100644
--- a/cc/animation/animation_timeline.h
+++ b/cc/animation/animation_timeline.h
@@ -7,10 +7,15 @@
 
 #include <memory>
 #include <unordered_map>
+#include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "cc/animation/animation_export.h"
 
+namespace base {
+class TimeTicks;
+}
+
 namespace cc {
 
 class Animation;
diff --git a/cc/layers/heads_up_display_layer_impl.cc b/cc/layers/heads_up_display_layer_impl.cc
index b79370c..4cec1f3 100644
--- a/cc/layers/heads_up_display_layer_impl.cc
+++ b/cc/layers/heads_up_display_layer_impl.cc
@@ -55,6 +55,7 @@
 #include "third_party/skia/include/core/SkFont.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
+#include "third_party/skia/include/core/SkTextBlob.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
 #include "ui/gfx/geometry/point.h"
diff --git a/cc/paint/display_item_list_unittest.cc b/cc/paint/display_item_list_unittest.cc
index 0363b5a..0717d5e 100644
--- a/cc/paint/display_item_list_unittest.cc
+++ b/cc/paint/display_item_list_unittest.cc
@@ -28,6 +28,7 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkSurface.h"
+#include "third_party/skia/include/core/SkTextBlob.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/skia_util.h"
diff --git a/cc/paint/paint_op_buffer.cc b/cc/paint/paint_op_buffer.cc
index 61992830..922cffe 100644
--- a/cc/paint/paint_op_buffer.cc
+++ b/cc/paint/paint_op_buffer.cc
@@ -25,6 +25,7 @@
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "third_party/skia/include/core/SkSerialProcs.h"
+#include "third_party/skia/include/core/SkTextBlob.h"
 #include "third_party/skia/include/docs/SkPDFDocument.h"
 #include "third_party/skia/include/gpu/GrRecordingContext.h"
 #include "ui/gfx/skia_util.h"
diff --git a/cc/paint/paint_op_helper_unittest.cc b/cc/paint/paint_op_helper_unittest.cc
index 108a416..e7f7fc9 100644
--- a/cc/paint/paint_op_helper_unittest.cc
+++ b/cc/paint/paint_op_helper_unittest.cc
@@ -6,6 +6,7 @@
 #include "cc/paint/paint_canvas.h"
 #include "cc/paint/paint_op_buffer.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/skia/include/core/SkTextBlob.h"
 
 namespace cc {
 namespace {
diff --git a/cc/paint/record_paint_canvas.cc b/cc/paint/record_paint_canvas.cc
index 63dfba2..8349dd9 100644
--- a/cc/paint/record_paint_canvas.cc
+++ b/cc/paint/record_paint_canvas.cc
@@ -12,6 +12,7 @@
 #include "cc/paint/paint_recorder.h"
 #include "cc/paint/skottie_wrapper.h"
 #include "third_party/skia/include/core/SkAnnotation.h"
+#include "third_party/skia/include/core/SkTextBlob.h"
 #include "third_party/skia/include/utils/SkNWayCanvas.h"
 
 namespace cc {
diff --git a/cc/paint/skia_paint_canvas.cc b/cc/paint/skia_paint_canvas.cc
index 48f9c4b..34e9cf4f 100644
--- a/cc/paint/skia_paint_canvas.cc
+++ b/cc/paint/skia_paint_canvas.cc
@@ -12,6 +12,7 @@
 #include "cc/paint/skottie_wrapper.h"
 #include "skia/ext/legacy_display_globals.h"
 #include "third_party/skia/include/core/SkAnnotation.h"
+#include "third_party/skia/include/core/SkTextBlob.h"
 #include "third_party/skia/include/docs/SkPDFDocument.h"
 
 namespace cc {
diff --git a/cc/test/fake_content_layer_client.cc b/cc/test/fake_content_layer_client.cc
index 289713a..9eb5557 100644
--- a/cc/test/fake_content_layer_client.cc
+++ b/cc/test/fake_content_layer_client.cc
@@ -8,6 +8,7 @@
 #include <cstddef>
 
 #include "cc/paint/paint_op_buffer.h"
+#include "third_party/skia/include/core/SkTextBlob.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/skia_util.h"
 
diff --git a/cc/trees/layer_tree_host_unittest_capture_content.cc b/cc/trees/layer_tree_host_unittest_capture_content.cc
index eb9c4a2..747063b 100644
--- a/cc/trees/layer_tree_host_unittest_capture_content.cc
+++ b/cc/trees/layer_tree_host_unittest_capture_content.cc
@@ -8,6 +8,7 @@
 #include "cc/test/fake_picture_layer.h"
 #include "cc/test/layer_tree_test.h"
 #include "cc/trees/transform_node.h"
+#include "third_party/skia/include/core/SkTextBlob.h"
 
 namespace cc {
 namespace {
diff --git a/chrome/browser/android/metrics/android_session_durations_service_factory.cc b/chrome/browser/android/metrics/android_session_durations_service_factory.cc
index 53b8ba4..29f3c66c 100644
--- a/chrome/browser/android/metrics/android_session_durations_service_factory.cc
+++ b/chrome/browser/android/metrics/android_session_durations_service_factory.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/android/metrics/android_session_durations_service_factory.h"
 
+#include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/android/metrics/android_session_durations_service.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
diff --git a/chrome/browser/android/metrics/android_session_durations_service_factory.h b/chrome/browser/android/metrics/android_session_durations_service_factory.h
index f38fe0de..5a8a2d7 100644
--- a/chrome/browser/android/metrics/android_session_durations_service_factory.h
+++ b/chrome/browser/android/metrics/android_session_durations_service_factory.h
@@ -11,6 +11,11 @@
 class AndroidSessionDurationsService;
 class Profile;
 
+namespace base {
+class TimeDelta;
+class TimeTicks;
+}  // namespace base
+
 class AndroidSessionDurationsServiceFactory
     : public BrowserContextKeyedServiceFactory {
  public:
diff --git a/chrome/browser/ash/arc/instance_throttle/arc_instance_throttle.cc b/chrome/browser/ash/arc/instance_throttle/arc_instance_throttle.cc
index 9603d19..756d11a8 100644
--- a/chrome/browser/ash/arc/instance_throttle/arc_instance_throttle.cc
+++ b/chrome/browser/ash/arc/instance_throttle/arc_instance_throttle.cc
@@ -7,6 +7,7 @@
 #include "base/logging.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/no_destructor.h"
+#include "base/time/time.h"
 #include "chrome/browser/ash/arc/boot_phase_monitor/arc_boot_phase_monitor_bridge.h"
 #include "chrome/browser/ash/arc/instance_throttle/arc_active_window_throttle_observer.h"
 #include "chrome/browser/ash/arc/instance_throttle/arc_app_launch_throttle_observer.h"
diff --git a/chrome/browser/ash/arc/instance_throttle/arc_instance_throttle.h b/chrome/browser/ash/arc/instance_throttle/arc_instance_throttle.h
index 986369a4..6367335 100644
--- a/chrome/browser/ash/arc/instance_throttle/arc_instance_throttle.h
+++ b/chrome/browser/ash/arc/instance_throttle/arc_instance_throttle.h
@@ -15,6 +15,10 @@
 #include "components/arc/arc_util.h"
 #include "components/keyed_service/core/keyed_service.h"
 
+namespace base {
+class TimeDelta;
+}
+
 namespace content {
 class BrowserContext;
 }
diff --git a/chrome/browser/ash/crostini/crostini_util.cc b/chrome/browser/ash/crostini/crostini_util.cc
index 5fb6ddd..7c02fca 100644
--- a/chrome/browser/ash/crostini/crostini_util.cc
+++ b/chrome/browser/ash/crostini/crostini_util.cc
@@ -17,6 +17,7 @@
 #include "base/strings/strcat.h"
 #include "base/strings/stringprintf.h"
 #include "base/task/post_task.h"
+#include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/ash/crostini/crostini_features.h"
 #include "chrome/browser/ash/crostini/crostini_installer.h"
diff --git a/chrome/browser/ash/crostini/crostini_util.h b/chrome/browser/ash/crostini/crostini_util.h
index 23f4ad9..421a71e 100644
--- a/chrome/browser/ash/crostini/crostini_util.h
+++ b/chrome/browser/ash/crostini/crostini_util.h
@@ -24,6 +24,7 @@
 
 namespace base {
 class FilePath;
+class TimeTicks;
 }  // namespace base
 
 namespace views {
diff --git a/chrome/browser/ash/login/screens/gesture_navigation_screen.h b/chrome/browser/ash/login/screens/gesture_navigation_screen.h
index a96d5bd..676e86d6 100644
--- a/chrome/browser/ash/login/screens/gesture_navigation_screen.h
+++ b/chrome/browser/ash/login/screens/gesture_navigation_screen.h
@@ -9,6 +9,7 @@
 #include <string>
 
 #include "base/callback.h"
+#include "base/time/time.h"
 #include "chrome/browser/ash/login/screens/base_screen.h"
 // TODO(https://crbug.com/1164001): move to forward declaration.
 #include "chrome/browser/ui/webui/chromeos/login/gesture_navigation_screen_handler.h"
diff --git a/chrome/browser/ash/web_applications/personalization_app/chrome_personalization_app_ui_delegate.h b/chrome/browser/ash/web_applications/personalization_app/chrome_personalization_app_ui_delegate.h
index dd37c7c1..6062739 100644
--- a/chrome/browser/ash/web_applications/personalization_app/chrome_personalization_app_ui_delegate.h
+++ b/chrome/browser/ash/web_applications/personalization_app/chrome_personalization_app_ui_delegate.h
@@ -12,6 +12,7 @@
 #include <memory>
 #include <string>
 
+#include "base/files/file.h"
 #include "base/memory/weak_ptr.h"
 #include "base/unguessable_token.h"
 #include "chromeos/components/personalization_app/mojom/personalization_app.mojom.h"
diff --git a/chrome/browser/chromeos/chromebox_for_meetings/device_info/device_info_service.cc b/chrome/browser/chromeos/chromebox_for_meetings/device_info/device_info_service.cc
index 8661e50..37baa0c 100644
--- a/chrome/browser/chromeos/chromebox_for_meetings/device_info/device_info_service.cc
+++ b/chrome/browser/chromeos/chromebox_for_meetings/device_info/device_info_service.cc
@@ -7,6 +7,7 @@
 #include <cstdint>
 
 #include "base/bind.h"
+#include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/system/sys_info.h"
diff --git a/chrome/browser/chromeos/policy/reporting/install_event_log_util.cc b/chrome/browser/chromeos/policy/reporting/install_event_log_util.cc
index 986043cd..7529c93 100644
--- a/chrome/browser/chromeos/policy/reporting/install_event_log_util.cc
+++ b/chrome/browser/chromeos/policy/reporting/install_event_log_util.cc
@@ -11,6 +11,7 @@
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
+#include "base/time/time.h"
 #include "base/values.h"
 #include "chromeos/system/statistics_provider.h"
 
diff --git a/chrome/browser/chromeos/policy/server_backed_state/server_backed_state_keys_broker.cc b/chrome/browser/chromeos/policy/server_backed_state/server_backed_state_keys_broker.cc
index df7b47be..8d389fe 100644
--- a/chrome/browser/chromeos/policy/server_backed_state/server_backed_state_keys_broker.cc
+++ b/chrome/browser/chromeos/policy/server_backed_state/server_backed_state_keys_broker.cc
@@ -9,6 +9,7 @@
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "base/time/time.h"
 #include "chromeos/dbus/session_manager/session_manager_client.h"
 
 namespace policy {
diff --git a/chrome/browser/chromeos/policy/server_backed_state/server_backed_state_keys_broker.h b/chrome/browser/chromeos/policy/server_backed_state/server_backed_state_keys_broker.h
index fa8bbc0..faf2ad5 100644
--- a/chrome/browser/chromeos/policy/server_backed_state/server_backed_state_keys_broker.h
+++ b/chrome/browser/chromeos/policy/server_backed_state/server_backed_state_keys_broker.h
@@ -14,6 +14,10 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 
+namespace base {
+class TimeDelta;
+}
+
 namespace chromeos {
 class SessionManagerClient;
 }
diff --git a/chrome/browser/chromeos/printing/history/print_job_history_cleaner.h b/chrome/browser/chromeos/printing/history/print_job_history_cleaner.h
index a30ccb2..5e5c337 100644
--- a/chrome/browser/chromeos/printing/history/print_job_history_cleaner.h
+++ b/chrome/browser/chromeos/printing/history/print_job_history_cleaner.h
@@ -7,6 +7,7 @@
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
+#include "base/time/time.h"
 #include "chrome/browser/chromeos/printing/history/print_job_database.h"
 
 class PrefService;
diff --git a/chrome/browser/chromeos/throttle_service.h b/chrome/browser/chromeos/throttle_service.h
index 90de598..49396b1e 100644
--- a/chrome/browser/chromeos/throttle_service.h
+++ b/chrome/browser/chromeos/throttle_service.h
@@ -12,6 +12,7 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
+#include "base/time/time.h"
 #include "chrome/browser/chromeos/throttle_observer.h"
 
 namespace content {
diff --git a/chrome/browser/device_identity/device_oauth2_token_service_factory.cc b/chrome/browser/device_identity/device_oauth2_token_service_factory.cc
index 99f0430..564bdc6 100644
--- a/chrome/browser/device_identity/device_oauth2_token_service_factory.cc
+++ b/chrome/browser/device_identity/device_oauth2_token_service_factory.cc
@@ -7,17 +7,18 @@
 #include <memory>
 
 #include "build/build_config.h"
-#if BUILDFLAG(IS_CHROMEOS_ASH)
-#include "chrome/browser/device_identity/chromeos/device_oauth2_token_store_chromeos.h"
-#else
-#include "chrome/browser/device_identity/device_oauth2_token_store_desktop.h"
-#endif
 #include "build/chromeos_buildflags.h"
 #include "chrome/browser/device_identity/device_oauth2_token_service.h"
 #include "components/policy/core/common/features.h"
 #include "content/public/browser/browser_thread.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"
 
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+#include "chrome/browser/device_identity/chromeos/device_oauth2_token_store_chromeos.h"
+#else
+#include "chrome/browser/device_identity/device_oauth2_token_store_desktop.h"
+#endif
+
 namespace {
 
 static DeviceOAuth2TokenService* g_device_oauth2_token_service_ = nullptr;
diff --git a/chrome/browser/extensions/install_signer.h b/chrome/browser/extensions/install_signer.h
index 2da3dc3e..a398a42 100644
--- a/chrome/browser/extensions/install_signer.h
+++ b/chrome/browser/extensions/install_signer.h
@@ -12,6 +12,7 @@
 
 #include "base/callback.h"
 #include "base/macros.h"
+#include "base/time/time.h"
 #include "extensions/common/extension_id.h"
 
 namespace base {
diff --git a/chrome/browser/federated_learning/floc_event_logger.h b/chrome/browser/federated_learning/floc_event_logger.h
index 6e01bba..54f1ce9 100644
--- a/chrome/browser/federated_learning/floc_event_logger.h
+++ b/chrome/browser/federated_learning/floc_event_logger.h
@@ -10,6 +10,7 @@
 #include "base/callback_forward.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/weak_ptr.h"
+#include "base/time/time.h"
 #include "components/sync/driver/sync_service_observer.h"
 
 namespace syncer {
diff --git a/chrome/browser/media/media_engagement_session.h b/chrome/browser/media/media_engagement_session.h
index 26920aec..5bd38b2 100644
--- a/chrome/browser/media/media_engagement_session.h
+++ b/chrome/browser/media/media_engagement_session.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_MEDIA_MEDIA_ENGAGEMENT_SESSION_H_
 
 #include "base/memory/ref_counted.h"
+#include "base/time/time.h"
 #include "services/metrics/public/cpp/ukm_source_id.h"
 #include "url/origin.h"
 
diff --git a/chrome/browser/notifications/scheduler/internal/background_task_coordinator.h b/chrome/browser/notifications/scheduler/internal/background_task_coordinator.h
index 3faf08b26..1a76509 100644
--- a/chrome/browser/notifications/scheduler/internal/background_task_coordinator.h
+++ b/chrome/browser/notifications/scheduler/internal/background_task_coordinator.h
@@ -15,6 +15,7 @@
 
 namespace base {
 class Clock;
+class TimeDelta;
 }  // namespace base
 
 namespace notifications {
diff --git a/chrome/browser/notifications/scheduler/public/impression_detail.h b/chrome/browser/notifications/scheduler/public/impression_detail.h
index c7c2835..6e0556c 100644
--- a/chrome/browser/notifications/scheduler/public/impression_detail.h
+++ b/chrome/browser/notifications/scheduler/public/impression_detail.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_NOTIFICATIONS_SCHEDULER_PUBLIC_IMPRESSION_DETAIL_H_
 
 #include "base/callback.h"
+#include "base/time/time.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
 namespace notifications {
diff --git a/chrome/browser/subresource_redirect/origin_robots_rules.cc b/chrome/browser/subresource_redirect/origin_robots_rules.cc
index 8ba8bef..95a256f 100644
--- a/chrome/browser/subresource_redirect/origin_robots_rules.cc
+++ b/chrome/browser/subresource_redirect/origin_robots_rules.cc
@@ -6,6 +6,7 @@
 
 #include "base/metrics/histogram_functions.h"
 #include "base/metrics/histogram_macros.h"
+#include "base/time/time.h"
 #include "chrome/browser/subresource_redirect/subresource_redirect_util.h"
 #include "components/variations/net/variations_http_headers.h"
 #include "net/http/http_request_headers.h"
diff --git a/chrome/browser/subresource_redirect/origin_robots_rules.h b/chrome/browser/subresource_redirect/origin_robots_rules.h
index 0c55d75..df282ad 100644
--- a/chrome/browser/subresource_redirect/origin_robots_rules.h
+++ b/chrome/browser/subresource_redirect/origin_robots_rules.h
@@ -15,6 +15,10 @@
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "url/origin.h"
 
+namespace base {
+class TimeDelta;
+}
+
 namespace network {
 class SharedURLLoaderFactory;
 class SimpleURLLoader;
diff --git a/chrome/browser/ui/signin_view_controller_delegate.h b/chrome/browser/ui/signin_view_controller_delegate.h
index 8d8dc83..431196b 100644
--- a/chrome/browser/ui/signin_view_controller_delegate.h
+++ b/chrome/browser/ui/signin_view_controller_delegate.h
@@ -9,6 +9,7 @@
 #include "base/observer_list.h"
 #include "base/observer_list_types.h"
 #include "build/build_config.h"
+#include "build/chromeos_buildflags.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 class Browser;
diff --git a/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos.h b/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos.h
index 87317ba..d890746 100644
--- a/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos.h
+++ b/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos.h
@@ -9,6 +9,7 @@
 
 #include "base/containers/flat_map.h"
 #include "base/macros.h"
+#include "build/chromeos_buildflags.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
 #include "chrome/browser/ui/views/frame/top_controls_slide_controller.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/ui/web_applications/web_app_metrics.h b/chrome/browser/ui/web_applications/web_app_metrics.h
index 21d9fa70..d0bb7cf3 100644
--- a/chrome/browser/ui/web_applications/web_app_metrics.h
+++ b/chrome/browser/ui/web_applications/web_app_metrics.h
@@ -8,6 +8,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/power_monitor/power_observer.h"
 #include "base/scoped_observation.h"
+#include "base/time/time.h"
 #include "chrome/browser/ui/browser_tab_strip_tracker.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
 #include "chrome/browser/web_applications/components/web_app_id.h"
diff --git a/chrome/browser/vr/sequence.h b/chrome/browser/vr/sequence.h
index ea0280d..33988b95 100644
--- a/chrome/browser/vr/sequence.h
+++ b/chrome/browser/vr/sequence.h
@@ -6,8 +6,10 @@
 #define CHROME_BROWSER_VR_SEQUENCE_H_
 
 #include <list>
+
 #include "base/bind.h"
 #include "base/callback.h"
+#include "base/time/time.h"
 
 namespace vr {
 
diff --git a/chrome/test/chromedriver/chrome/chrome_impl.cc b/chrome/test/chromedriver/chrome/chrome_impl.cc
index d0af983b..39b87c5 100644
--- a/chrome/test/chromedriver/chrome/chrome_impl.cc
+++ b/chrome/test/chromedriver/chrome/chrome_impl.cc
@@ -8,6 +8,8 @@
 #include <utility>
 
 #include "base/strings/string_number_conversions.h"
+#include "base/threading/platform_thread.h"
+#include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/test/chromedriver/chrome/devtools_client.h"
 #include "chrome/test/chromedriver/chrome/devtools_event_listener.h"
diff --git a/chromecast/media/cma/backend/fuchsia/mixer_output_stream_fuchsia.cc b/chromecast/media/cma/backend/fuchsia/mixer_output_stream_fuchsia.cc
index 42302ca..21a0f469 100644
--- a/chromecast/media/cma/backend/fuchsia/mixer_output_stream_fuchsia.cc
+++ b/chromecast/media/cma/backend/fuchsia/mixer_output_stream_fuchsia.cc
@@ -12,6 +12,7 @@
 #include "base/fuchsia/process_context.h"
 #include "base/logging.h"
 #include "base/memory/writable_shared_memory_region.h"
+#include "base/threading/platform_thread.h"
 #include "base/time/time.h"
 #include "chromecast/base/chromecast_switches.h"
 #include "media/base/audio_sample_types.h"
diff --git a/chromeos/dbus/shill/fake_shill_device_client.cc b/chromeos/dbus/shill/fake_shill_device_client.cc
index 7cf481d..d25583fb 100644
--- a/chromeos/dbus/shill/fake_shill_device_client.cc
+++ b/chromeos/dbus/shill/fake_shill_device_client.cc
@@ -18,6 +18,7 @@
 #include "base/single_thread_task_runner.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "base/time/time.h"
 #include "chromeos/dbus/shill/shill_manager_client.h"
 #include "chromeos/dbus/shill/shill_property_changed_observer.h"
 #include "dbus/bus.h"
diff --git a/chromeos/dbus/shill/fake_shill_device_client.h b/chromeos/dbus/shill/fake_shill_device_client.h
index 8d63b18..9bbc42c 100644
--- a/chromeos/dbus/shill/fake_shill_device_client.h
+++ b/chromeos/dbus/shill/fake_shill_device_client.h
@@ -13,6 +13,7 @@
 
 #include "base/component_export.h"
 #include "base/macros.h"
+#include "base/time/time.h"
 #include "base/values.h"
 #include "chromeos/dbus/shill/shill_device_client.h"
 
diff --git a/chromeos/dbus/shill/shill_device_client.h b/chromeos/dbus/shill/shill_device_client.h
index ab04432a..7c104507 100644
--- a/chromeos/dbus/shill/shill_device_client.h
+++ b/chromeos/dbus/shill/shill_device_client.h
@@ -15,6 +15,7 @@
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
 namespace base {
+class TimeDelta;
 class Value;
 }  // namespace base
 
diff --git a/chromeos/dbus/update_engine_client.h b/chromeos/dbus/update_engine_client.h
index 1ff9be3..7d8864d 100644
--- a/chromeos/dbus/update_engine_client.h
+++ b/chromeos/dbus/update_engine_client.h
@@ -12,6 +12,7 @@
 #include "base/callback.h"
 #include "base/component_export.h"
 #include "base/macros.h"
+#include "base/time/time.h"
 #include "chromeos/dbus/dbus_client.h"
 #include "chromeos/dbus/dbus_client_implementation_type.h"
 #include "chromeos/dbus/update_engine/update_engine.pb.h"
diff --git a/chromeos/services/device_sync/cryptauth_device_manager.h b/chromeos/services/device_sync/cryptauth_device_manager.h
index 1ef47c3..c2b04f5 100644
--- a/chromeos/services/device_sync/cryptauth_device_manager.h
+++ b/chromeos/services/device_sync/cryptauth_device_manager.h
@@ -13,6 +13,11 @@
 
 class PrefRegistrySimple;
 
+namespace base {
+class Time;
+class TimeDelta;
+}  // namespace base
+
 namespace chromeos {
 
 namespace device_sync {
diff --git a/chromeos/services/device_sync/fake_cryptauth_device_manager.h b/chromeos/services/device_sync/fake_cryptauth_device_manager.h
index de83c491..1a16719 100644
--- a/chromeos/services/device_sync/fake_cryptauth_device_manager.h
+++ b/chromeos/services/device_sync/fake_cryptauth_device_manager.h
@@ -8,6 +8,7 @@
 #include <memory>
 
 #include "base/macros.h"
+#include "base/time/time.h"
 #include "chromeos/services/device_sync/cryptauth_device_manager.h"
 #include "chromeos/services/device_sync/proto/cryptauth_api.pb.h"
 
diff --git a/chromeos/services/secure_channel/nearby_connection_metrics_recorder.h b/chromeos/services/secure_channel/nearby_connection_metrics_recorder.h
index cc31468..0ce0f4e 100644
--- a/chromeos/services/secure_channel/nearby_connection_metrics_recorder.h
+++ b/chromeos/services/secure_channel/nearby_connection_metrics_recorder.h
@@ -9,6 +9,10 @@
 #include "base/memory/weak_ptr.h"
 #include "chromeos/services/secure_channel/device_id_pair.h"
 
+namespace base {
+class Time;
+}
+
 namespace chromeos {
 namespace secure_channel {
 
diff --git a/components/account_manager_core/chromeos/account_manager.h b/components/account_manager_core/chromeos/account_manager.h
index 9a998f6..8a72406 100644
--- a/components/account_manager_core/chromeos/account_manager.h
+++ b/components/account_manager_core/chromeos/account_manager.h
@@ -30,6 +30,7 @@
 namespace base {
 class SequencedTaskRunner;
 class ImportantFileWriter;
+class TimeTicks;
 }  // namespace base
 
 namespace network {
diff --git a/components/accuracy_tips/accuracy_service.h b/components/accuracy_tips/accuracy_service.h
index d9aebe1..e686507c 100644
--- a/components/accuracy_tips/accuracy_service.h
+++ b/components/accuracy_tips/accuracy_service.h
@@ -12,6 +12,10 @@
 #include "components/keyed_service/core/keyed_service.h"
 #include "url/gurl.h"
 
+namespace base {
+class TimeTicks;
+}
+
 namespace content {
 class WebContents;
 }
diff --git a/components/arc/ime/key_event_result_receiver.h b/components/arc/ime/key_event_result_receiver.h
index f92b5d25..bf8c005 100644
--- a/components/arc/ime/key_event_result_receiver.h
+++ b/components/arc/ime/key_event_result_receiver.h
@@ -7,6 +7,7 @@
 
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
+#include "base/time/time.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "ui/base/ime/input_method_delegate.h"
 
diff --git a/components/arc/session/arc_vm_client_adapter.h b/components/arc/session/arc_vm_client_adapter.h
index 5149eeb..028ce5c 100644
--- a/components/arc/session/arc_vm_client_adapter.h
+++ b/components/arc/session/arc_vm_client_adapter.h
@@ -13,6 +13,10 @@
 #include "components/arc/session/file_system_status.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
+namespace base {
+class TimeDelta;
+}
+
 namespace arc {
 
 struct UpgradeParams;
diff --git a/components/data_reduction_proxy/core/browser/data_usage_store.h b/components/data_reduction_proxy/core/browser/data_usage_store.h
index 9ef594a..07f6599 100644
--- a/components/data_reduction_proxy/core/browser/data_usage_store.h
+++ b/components/data_reduction_proxy/core/browser/data_usage_store.h
@@ -11,12 +11,9 @@
 
 #include "base/macros.h"
 #include "base/sequence_checker.h"
+#include "base/time/time.h"
 #include "components/data_reduction_proxy/core/browser/data_store.h"
 
-namespace base {
-class Time;
-}
-
 namespace data_reduction_proxy {
 class DataStore;
 class DataUsageBucket;
diff --git a/components/data_reduction_proxy/core/browser/db_data_owner.h b/components/data_reduction_proxy/core/browser/db_data_owner.h
index bef1a15..ea1032b 100644
--- a/components/data_reduction_proxy/core/browser/db_data_owner.h
+++ b/components/data_reduction_proxy/core/browser/db_data_owner.h
@@ -13,6 +13,10 @@
 #include "base/memory/weak_ptr.h"
 #include "base/sequence_checker.h"
 
+namespace base {
+class Time;
+}
+
 namespace data_reduction_proxy {
 class DataStore;
 class DataUsageBucket;
diff --git a/components/dom_distiller/core/distiller_page.h b/components/dom_distiller/core/distiller_page.h
index deb3b34..bd4b833 100644
--- a/components/dom_distiller/core/distiller_page.h
+++ b/components/dom_distiller/core/distiller_page.h
@@ -11,6 +11,7 @@
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
+#include "base/time/time.h"
 #include "base/values.h"
 #include "third_party/dom_distiller_js/dom_distiller.pb.h"
 #include "ui/gfx/geometry/size.h"
diff --git a/components/download/internal/background_service/driver_entry.h b/components/download/internal/background_service/driver_entry.h
index 84f4295..9d03ec1 100644
--- a/components/download/internal/background_service/driver_entry.h
+++ b/components/download/internal/background_service/driver_entry.h
@@ -10,6 +10,7 @@
 
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
+#include "base/time/time.h"
 #include "storage/browser/blob/blob_data_handle.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "url/gurl.h"
diff --git a/components/image_fetcher/core/cache/image_cache.h b/components/image_fetcher/core/cache/image_cache.h
index 0a7a6b8..ecacf7c 100644
--- a/components/image_fetcher/core/cache/image_cache.h
+++ b/components/image_fetcher/core/cache/image_cache.h
@@ -21,6 +21,7 @@
 namespace base {
 class Clock;
 class SequencedTaskRunner;
+class TimeTicks;
 }  // namespace base
 
 namespace image_fetcher {
diff --git a/components/image_fetcher/core/cache/image_store_types.h b/components/image_fetcher/core/cache/image_store_types.h
index ef19c40..f493e010 100644
--- a/components/image_fetcher/core/cache/image_store_types.h
+++ b/components/image_fetcher/core/cache/image_store_types.h
@@ -12,6 +12,10 @@
 #include "components/image_fetcher/core/cache/proto/cached_image_metadata.pb.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
+namespace base {
+class TimeDelta;
+}
+
 namespace image_fetcher {
 
 // Represents the initialization status of a image storage module.
diff --git a/components/invalidation/impl/invalidation_logger.h b/components/invalidation/impl/invalidation_logger.h
index c1fab8b..1d979451 100644
--- a/components/invalidation/impl/invalidation_logger.h
+++ b/components/invalidation/impl/invalidation_logger.h
@@ -9,6 +9,7 @@
 #include <set>
 
 #include "base/observer_list.h"
+#include "base/time/time.h"
 #include "components/invalidation/public/invalidation_util.h"
 #include "components/invalidation/public/invalidator_state.h"
 
diff --git a/components/invalidation/impl/invalidation_logger_observer.h b/components/invalidation/impl/invalidation_logger_observer.h
index 4b6d0a9..1767b7e 100644
--- a/components/invalidation/impl/invalidation_logger_observer.h
+++ b/components/invalidation/impl/invalidation_logger_observer.h
@@ -5,11 +5,15 @@
 #ifndef COMPONENTS_INVALIDATION_IMPL_INVALIDATION_LOGGER_OBSERVER_H_
 #define COMPONENTS_INVALIDATION_IMPL_INVALIDATION_LOGGER_OBSERVER_H_
 
+#include <set>
+#include <string>
+
 #include "components/invalidation/public/invalidation_util.h"
 #include "components/invalidation/public/invalidator_state.h"
 
 namespace base {
 class DictionaryValue;
+class Time;
 }  // namespace base
 
 namespace invalidation {
diff --git a/components/offline_items_collection/core/throttled_offline_content_provider.h b/components/offline_items_collection/core/throttled_offline_content_provider.h
index 822e7b5b..5e463a5 100644
--- a/components/offline_items_collection/core/throttled_offline_content_provider.h
+++ b/components/offline_items_collection/core/throttled_offline_content_provider.h
@@ -10,6 +10,7 @@
 
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_observation.h"
+#include "base/time/time.h"
 #include "components/offline_items_collection/core/offline_content_provider.h"
 
 namespace base {
diff --git a/components/offline_pages/core/background/offliner_stub.h b/components/offline_pages/core/background/offliner_stub.h
index 845270b..496b067 100644
--- a/components/offline_pages/core/background/offliner_stub.h
+++ b/components/offline_pages/core/background/offliner_stub.h
@@ -8,6 +8,7 @@
 #include <memory>
 
 #include "base/callback_forward.h"
+#include "base/time/time.h"
 #include "components/offline_pages/core/background/offliner.h"
 
 namespace offline_pages {
diff --git a/components/offline_pages/core/model/mark_page_accessed_task.h b/components/offline_pages/core/model/mark_page_accessed_task.h
index c93e7f2..ab49591 100644
--- a/components/offline_pages/core/model/mark_page_accessed_task.h
+++ b/components/offline_pages/core/model/mark_page_accessed_task.h
@@ -7,12 +7,9 @@
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
+#include "base/time/time.h"
 #include "components/offline_pages/task/task.h"
 
-namespace base {
-class Time;
-}  // namespace base
-
 namespace offline_pages {
 
 class OfflinePageMetadataStore;
diff --git a/components/paint_preview/common/subset_font.cc b/components/paint_preview/common/subset_font.cc
index ba53917..8ff0540 100644
--- a/components/paint_preview/common/subset_font.cc
+++ b/components/paint_preview/common/subset_font.cc
@@ -14,6 +14,7 @@
 
 #include "base/bind.h"
 #include "base/callback.h"
+#include "base/numerics/safe_conversions.h"
 #include "third_party/harfbuzz-ng/utils/hb_scoped.h"
 #include "third_party/skia/include/core/SkStream.h"
 #include "third_party/skia/include/core/SkTypeface.h"
diff --git a/components/policy/core/browser/webui/policy_status_provider.h b/components/policy/core/browser/webui/policy_status_provider.h
index 4f07df9..d0cb45592 100644
--- a/components/policy/core/browser/webui/policy_status_provider.h
+++ b/components/policy/core/browser/webui/policy_status_provider.h
@@ -10,6 +10,7 @@
 
 namespace base {
 class DictionaryValue;
+class Time;
 }
 
 namespace policy {
diff --git a/components/safe_browsing/content/renderer/phishing_classifier/phishing_classifier.h b/components/safe_browsing/content/renderer/phishing_classifier/phishing_classifier.h
index e79b02f..e86d14e 100644
--- a/components/safe_browsing/content/renderer/phishing_classifier/phishing_classifier.h
+++ b/components/safe_browsing/content/renderer/phishing_classifier/phishing_classifier.h
@@ -27,6 +27,7 @@
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
+#include "base/time/time.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace content {
diff --git a/components/spellcheck/browser/spelling_service_client.cc b/components/spellcheck/browser/spelling_service_client.cc
index 1a80f8f4..ecebc3fd 100644
--- a/components/spellcheck/browser/spelling_service_client.cc
+++ b/components/spellcheck/browser/spelling_service_client.cc
@@ -18,6 +18,7 @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/time/time.h"
 #include "base/values.h"
 #include "components/prefs/pref_service.h"
 #include "components/spellcheck/browser/pref_names.h"
diff --git a/components/spellcheck/browser/spelling_service_client.h b/components/spellcheck/browser/spelling_service_client.h
index 1789b10..92706e1 100644
--- a/components/spellcheck/browser/spelling_service_client.h
+++ b/components/spellcheck/browser/spelling_service_client.h
@@ -17,6 +17,10 @@
 
 struct SpellCheckResult;
 
+namespace base {
+class TimeTicks;
+}
+
 namespace content {
 class BrowserContext;
 }
diff --git a/components/sync/driver/configure_context.h b/components/sync/driver/configure_context.h
index e87fb2b4..4bb70f6 100644
--- a/components/sync/driver/configure_context.h
+++ b/components/sync/driver/configure_context.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/time/time.h"
 #include "components/sync/base/sync_mode.h"
 #include "components/sync/engine/configure_reason.h"
 #include "google_apis/gaia/core_account_id.h"
diff --git a/components/system_media_controls/system_media_controls_observer.h b/components/system_media_controls/system_media_controls_observer.h
index 73d78a61..ff7b67d 100644
--- a/components/system_media_controls/system_media_controls_observer.h
+++ b/components/system_media_controls/system_media_controls_observer.h
@@ -8,6 +8,10 @@
 #include "base/component_export.h"
 #include "base/observer_list_types.h"
 
+namespace base {
+class TimeDelta;
+}
+
 namespace system_media_controls {
 
 // Interface to observe events on the SystemMediaControls.
diff --git a/components/translate/core/browser/translate_metrics_logger_impl.h b/components/translate/core/browser/translate_metrics_logger_impl.h
index 189c0ed..29827cf 100644
--- a/components/translate/core/browser/translate_metrics_logger_impl.h
+++ b/components/translate/core/browser/translate_metrics_logger_impl.h
@@ -9,6 +9,7 @@
 #include <string>
 
 #include "base/memory/weak_ptr.h"
+#include "base/time/time.h"
 #include "components/translate/core/browser/translate_metrics_logger.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
diff --git a/content/browser/accessibility/touch_passthrough_manager.h b/content/browser/accessibility/touch_passthrough_manager.h
index cf66a8d7..0d780970 100644
--- a/content/browser/accessibility/touch_passthrough_manager.h
+++ b/content/browser/accessibility/touch_passthrough_manager.h
@@ -14,6 +14,10 @@
 #include "ui/accessibility/ax_tree_id.h"
 #include "ui/gfx/geometry/point.h"
 
+namespace base {
+class TimeTicks;
+}
+
 namespace content {
 
 class BrowserAccessibilityManager;
diff --git a/content/browser/android/java/gin_java_script_to_java_types_coercion.cc b/content/browser/android/java/gin_java_script_to_java_types_coercion.cc
index 25403570..e5f0b20f 100644
--- a/content/browser/android/java/gin_java_script_to_java_types_coercion.cc
+++ b/content/browser/android/java/gin_java_script_to_java_types_coercion.cc
@@ -7,6 +7,7 @@
 #include <stdint.h>
 #include <unistd.h>
 
+#include <cmath>
 #include <limits>
 
 #include "base/android/jni_android.h"
@@ -32,7 +33,7 @@
   if (std::isnan(x)) {
     return 0.0;
   }
-  return x > 0.0 ? floor(x) : ceil(x);
+  return x > 0.0 ? std::floor(x) : std::ceil(x);
 }
 
 // Rounds to jlong using Java's type conversion rules.
diff --git a/content/browser/browsing_data/storage_partition_code_cache_data_remover.cc b/content/browser/browsing_data/storage_partition_code_cache_data_remover.cc
index fbaf4cd7..2a606249 100644
--- a/content/browser/browsing_data/storage_partition_code_cache_data_remover.cc
+++ b/content/browser/browsing_data/storage_partition_code_cache_data_remover.cc
@@ -11,6 +11,7 @@
 #include "base/single_thread_task_runner.h"
 #include "base/task/post_task.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "base/time/time.h"
 #include "content/browser/browsing_data/conditional_cache_deletion_helper.h"
 #include "content/browser/code_cache/generated_code_cache.h"
 #include "content/browser/code_cache/generated_code_cache_context.h"
diff --git a/content/browser/browsing_data/storage_partition_code_cache_data_remover.h b/content/browser/browsing_data/storage_partition_code_cache_data_remover.h
index 113d31d5e..108cd2fb 100644
--- a/content/browser/browsing_data/storage_partition_code_cache_data_remover.h
+++ b/content/browser/browsing_data/storage_partition_code_cache_data_remover.h
@@ -10,6 +10,7 @@
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/sequenced_task_runner_helpers.h"
+#include "base/time/time.h"
 #include "net/base/completion_once_callback.h"
 #include "url/gurl.h"
 
diff --git a/content/browser/network_service_instance_impl.h b/content/browser/network_service_instance_impl.h
index f519ad31..dba2c5b 100644
--- a/content/browser/network_service_instance_impl.h
+++ b/content/browser/network_service_instance_impl.h
@@ -9,6 +9,10 @@
 #include "base/callback_list.h"
 #include "content/common/content_export.h"
 
+namespace base {
+class TimeDelta;
+}
+
 namespace content {
 
 // Creates the network::NetworkService object on the IO thread directly instead
diff --git a/content/browser/notifications/platform_notification_service_proxy.h b/content/browser/notifications/platform_notification_service_proxy.h
index 57ea2b7..4c7c7c2 100644
--- a/content/browser/notifications/platform_notification_service_proxy.h
+++ b/content/browser/notifications/platform_notification_service_proxy.h
@@ -17,6 +17,10 @@
 
 class GURL;
 
+namespace base {
+class Time;
+}
+
 namespace blink {
 enum class ServiceWorkerStatusCode;
 }  // namespace blink
diff --git a/content/browser/renderer_host/recently_destroyed_hosts.h b/content/browser/renderer_host/recently_destroyed_hosts.h
index c5aa4bf1..0e7c31d 100644
--- a/content/browser/renderer_host/recently_destroyed_hosts.h
+++ b/content/browser/renderer_host/recently_destroyed_hosts.h
@@ -7,6 +7,7 @@
 
 #include "base/containers/flat_set.h"
 #include "base/supports_user_data.h"
+#include "base/time/time.h"
 #include "content/common/content_export.h"
 
 namespace base {
diff --git a/content/browser/scheduler/responsiveness/watcher.h b/content/browser/scheduler/responsiveness/watcher.h
index 2ff7aa1..09b39c5a 100644
--- a/content/browser/scheduler/responsiveness/watcher.h
+++ b/content/browser/scheduler/responsiveness/watcher.h
@@ -7,6 +7,7 @@
 
 #include <vector>
 
+#include "base/time/time.h"
 #include "content/browser/scheduler/responsiveness/metric_source.h"
 
 namespace content {
diff --git a/device/base/synchronization/one_writer_seqlock.cc b/device/base/synchronization/one_writer_seqlock.cc
index 213b6301..80fd26f 100644
--- a/device/base/synchronization/one_writer_seqlock.cc
+++ b/device/base/synchronization/one_writer_seqlock.cc
@@ -4,6 +4,8 @@
 
 #include "device/base/synchronization/one_writer_seqlock.h"
 
+#include "base/threading/platform_thread.h"
+
 namespace device {
 
 OneWriterSeqLock::OneWriterSeqLock() : sequence_(0) {}
diff --git a/device/base/synchronization/one_writer_seqlock.h b/device/base/synchronization/one_writer_seqlock.h
index 2ad75e8..a56bf7bc 100644
--- a/device/base/synchronization/one_writer_seqlock.h
+++ b/device/base/synchronization/one_writer_seqlock.h
@@ -8,6 +8,7 @@
 #include <atomic>
 
 #include "base/atomicops.h"
+#include "base/check.h"
 #include "base/macros.h"
 #include "base/threading/platform_thread.h"
 
diff --git a/device/vr/android/web_xr_presentation_state.h b/device/vr/android/web_xr_presentation_state.h
index 3bbc8e1..0af7431 100644
--- a/device/vr/android/web_xr_presentation_state.h
+++ b/device/vr/android/web_xr_presentation_state.h
@@ -13,6 +13,7 @@
 #include "base/containers/queue.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
+#include "base/time/time.h"
 #include "components/viz/common/resources/resource_id.h"
 #include "gpu/command_buffer/common/mailbox_holder.h"
 #include "ui/gfx/geometry/rect_f.h"
diff --git a/extensions/browser/content_verify_job.h b/extensions/browser/content_verify_job.h
index 740ba4c..3b178374 100644
--- a/extensions/browser/content_verify_job.h
+++ b/extensions/browser/content_verify_job.h
@@ -15,6 +15,7 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
+#include "base/time/time.h"
 #include "base/version.h"
 #include "extensions/browser/content_verifier/content_verifier_key.h"
 #include "extensions/common/extension_id.h"
diff --git a/extensions/browser/extension_pref_value_map.cc b/extensions/browser/extension_pref_value_map.cc
index 1368beb..479c3547 100644
--- a/extensions/browser/extension_pref_value_map.cc
+++ b/extensions/browser/extension_pref_value_map.cc
@@ -7,6 +7,7 @@
 #include <utility>
 
 #include "base/memory/ptr_util.h"
+#include "base/time/time.h"
 #include "base/values.h"
 #include "components/prefs/pref_value_map.h"
 
diff --git a/gpu/ipc/gpu_task_scheduler_helper.h b/gpu/ipc/gpu_task_scheduler_helper.h
index abe5f76..4315277 100644
--- a/gpu/ipc/gpu_task_scheduler_helper.h
+++ b/gpu/ipc/gpu_task_scheduler_helper.h
@@ -10,6 +10,10 @@
 #include "gpu/command_buffer/service/sequence_id.h"
 #include "gpu/ipc/gl_in_process_context_export.h"
 
+namespace base {
+class TimeTicks;
+}
+
 namespace viz {
 class VizProcessContextProvider;
 class DisplayCompositorMemoryAndTaskController;
diff --git a/gpu/ipc/single_task_sequence.h b/gpu/ipc/single_task_sequence.h
index 1026939..8055b42 100644
--- a/gpu/ipc/single_task_sequence.h
+++ b/gpu/ipc/single_task_sequence.h
@@ -14,6 +14,10 @@
 #include "gpu/command_buffer/service/sequence_id.h"
 #include "gpu/ipc/gl_in_process_context_export.h"
 
+namespace base {
+class TimeTicks;
+}
+
 namespace gpu {
 // Represents a single task execution sequence. Tasks posted to a sequence are
 // run in order. Tasks across sequences should be synchronized using sync
diff --git a/ipc/ipc_message_attachment.cc b/ipc/ipc_message_attachment.cc
index da62ef60..557f92d 100644
--- a/ipc/ipc_message_attachment.cc
+++ b/ipc/ipc_message_attachment.cc
@@ -11,6 +11,8 @@
 #include "mojo/public/cpp/system/platform_handle.h"
 
 #if defined(OS_POSIX) || defined(OS_FUCHSIA)
+#include <unistd.h>
+
 #include "base/posix/eintr_wrapper.h"
 #include "ipc/ipc_platform_file_attachment_posix.h"
 #endif
diff --git a/media/base/fake_audio_worker.h b/media/base/fake_audio_worker.h
index 72debb9..13ba742 100644
--- a/media/base/fake_audio_worker.h
+++ b/media/base/fake_audio_worker.h
@@ -12,6 +12,8 @@
 
 namespace base {
 class SingleThreadTaskRunner;
+class TimeDelta;
+class TimeTicks;
 }
 
 namespace media {
diff --git a/media/base/video_encoder.h b/media/base/video_encoder.h
index 2d80329..a6e4712e 100644
--- a/media/base/video_encoder.h
+++ b/media/base/video_encoder.h
@@ -6,6 +6,7 @@
 #define MEDIA_BASE_VIDEO_ENCODER_H_
 
 #include "base/callback.h"
+#include "base/time/time.h"
 #include "media/base/media_export.h"
 #include "media/base/status.h"
 #include "media/base/video_codecs.h"
diff --git a/media/base/video_util.cc b/media/base/video_util.cc
index f791630cd..c3f60de 100644
--- a/media/base/video_util.cc
+++ b/media/base/video_util.cc
@@ -13,6 +13,7 @@
 #include "base/notreached.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/numerics/safe_math.h"
+#include "base/time/time.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/raster_interface.h"
 #include "media/base/status_codes.h"
diff --git a/media/base/video_util.h b/media/base/video_util.h
index e673c01..c19b5b1 100644
--- a/media/base/video_util.h
+++ b/media/base/video_util.h
@@ -19,6 +19,10 @@
 
 class GrDirectContext;
 
+namespace base {
+class TimeDelta;
+}
+
 namespace gpu {
 namespace raster {
 class RasterInterface;
diff --git a/media/gpu/test/video_encoder/video_encoder.h b/media/gpu/test/video_encoder/video_encoder.h
index a10dc32..068d7189 100644
--- a/media/gpu/test/video_encoder/video_encoder.h
+++ b/media/gpu/test/video_encoder/video_encoder.h
@@ -17,6 +17,7 @@
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
 #include "base/thread_annotations.h"
+#include "base/time/time.h"
 
 namespace gpu {
 class GpuMemoryBufferFactory;
diff --git a/mojo/core/core_unittest.cc b/mojo/core/core_unittest.cc
index 0d2024cc..546aba0 100644
--- a/mojo/core/core_unittest.cc
+++ b/mojo/core/core_unittest.cc
@@ -9,6 +9,7 @@
 #include <limits>
 
 #include "base/bind.h"
+#include "base/threading/platform_thread.h"
 #include "build/build_config.h"
 #include "mojo/core/core_test_base.h"
 #include "mojo/public/cpp/system/wait.h"
diff --git a/mojo/public/cpp/bindings/lib/control_message_proxy.cc b/mojo/public/cpp/bindings/lib/control_message_proxy.cc
index 321bbe2e2..57b61edc 100644
--- a/mojo/public/cpp/bindings/lib/control_message_proxy.cc
+++ b/mojo/public/cpp/bindings/lib/control_message_proxy.cc
@@ -13,6 +13,7 @@
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/threading/sequenced_task_runner_handle.h"
+#include "base/time/time.h"
 #include "mojo/public/cpp/bindings/interface_endpoint_client.h"
 #include "mojo/public/cpp/bindings/lib/serialization.h"
 #include "mojo/public/cpp/bindings/lib/validation_util.h"
diff --git a/mojo/public/cpp/bindings/lib/control_message_proxy.h b/mojo/public/cpp/bindings/lib/control_message_proxy.h
index 7510bb99..b6d7cc8 100644
--- a/mojo/public/cpp/bindings/lib/control_message_proxy.h
+++ b/mojo/public/cpp/bindings/lib/control_message_proxy.h
@@ -11,6 +11,10 @@
 #include "base/component_export.h"
 #include "base/macros.h"
 
+namespace base {
+class TimeDelta;
+}
+
 namespace mojo {
 
 class InterfaceEndpointClient;
diff --git a/net/cert/cert_verify_proc_builtin.h b/net/cert/cert_verify_proc_builtin.h
index eae8d61..d0a88f6 100644
--- a/net/cert/cert_verify_proc_builtin.h
+++ b/net/cert/cert_verify_proc_builtin.h
@@ -9,6 +9,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/supports_user_data.h"
+#include "base/time/time.h"
 #include "net/base/net_export.h"
 #include "net/der/parse_values.h"
 
diff --git a/net/cert/internal/path_builder.h b/net/cert/internal/path_builder.h
index 0a358ced..e4463fd 100644
--- a/net/cert/internal/path_builder.h
+++ b/net/cert/internal/path_builder.h
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "base/supports_user_data.h"
+#include "base/time/time.h"
 #include "net/base/net_export.h"
 #include "net/cert/internal/cert_errors.h"
 #include "net/cert/internal/parsed_certificate.h"
diff --git a/net/cert/internal/revocation_checker.h b/net/cert/internal/revocation_checker.h
index cb26b87..7472da6 100644
--- a/net/cert/internal/revocation_checker.h
+++ b/net/cert/internal/revocation_checker.h
@@ -6,6 +6,7 @@
 #define NET_CERT_INTERNAL_REVOCATION_CHECKER_H_
 
 #include "base/strings/string_piece_forward.h"
+#include "base/time/time.h"
 #include "net/base/net_export.h"
 #include "net/cert/crl_set.h"
 #include "net/cert/internal/parsed_certificate.h"
diff --git a/net/quic/quic_context.h b/net/quic/quic_context.h
index 8c055b26..403b4a5 100644
--- a/net/quic/quic_context.h
+++ b/net/quic/quic_context.h
@@ -7,6 +7,7 @@
 
 #include <memory>
 
+#include "base/time/time.h"
 #include "net/base/host_port_pair.h"
 #include "net/third_party/quiche/src/quic/core/quic_connection.h"
 
diff --git a/printing/metafile_skia_unittest.cc b/printing/metafile_skia_unittest.cc
index 472cd47..9e61556 100644
--- a/printing/metafile_skia_unittest.cc
+++ b/printing/metafile_skia_unittest.cc
@@ -12,6 +12,7 @@
 #include "printing/mojom/print.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
+#include "third_party/skia/include/core/SkTextBlob.h"
 
 namespace printing {
 
diff --git a/remoting/client/audio/audio_player.cc b/remoting/client/audio/audio_player.cc
index f14cd59..26e4c42 100644
--- a/remoting/client/audio/audio_player.cc
+++ b/remoting/client/audio/audio_player.cc
@@ -10,6 +10,7 @@
 
 #include "base/callback_helpers.h"
 #include "base/check_op.h"
+#include "base/time/time.h"
 
 // If queue grows bigger than 150ms we start dropping packets.
 const int kMaxQueueLatencyMs = 150;
diff --git a/remoting/client/ui/desktop_viewport.cc b/remoting/client/ui/desktop_viewport.cc
index 6d2f530..c53781f 100644
--- a/remoting/client/ui/desktop_viewport.cc
+++ b/remoting/client/ui/desktop_viewport.cc
@@ -5,6 +5,7 @@
 #include "remoting/client/ui/desktop_viewport.h"
 
 #include <algorithm>
+#include <cmath>
 
 #include "base/logging.h"
 
diff --git a/services/network/resource_scheduler/resource_scheduler_params_manager.h b/services/network/resource_scheduler/resource_scheduler_params_manager.h
index 44afdc8..3ecc06e2 100644
--- a/services/network/resource_scheduler/resource_scheduler_params_manager.h
+++ b/services/network/resource_scheduler/resource_scheduler_params_manager.h
@@ -14,6 +14,7 @@
 
 #include "base/component_export.h"
 #include "base/sequence_checker.h"
+#include "base/time/time.h"
 #include "net/nqe/effective_connection_type.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
diff --git a/third_party/blink/renderer/modules/webaudio/analyser_node.cc b/third_party/blink/renderer/modules/webaudio/analyser_node.cc
index 5359bec..7d717a83 100644
--- a/third_party/blink/renderer/modules/webaudio/analyser_node.cc
+++ b/third_party/blink/renderer/modules/webaudio/analyser_node.cc
@@ -26,6 +26,7 @@
 #include "third_party/blink/renderer/modules/webaudio/analyser_node.h"
 
 #include "third_party/blink/renderer/bindings/modules/v8/v8_analyser_options.h"
+#include "third_party/blink/renderer/modules/webaudio/audio_graph_tracer.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_node_input.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_node_output.h"
 #include "third_party/blink/renderer/platform/bindings/exception_messages.h"
diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer_source_node.cc b/third_party/blink/renderer/modules/webaudio/audio_buffer_source_node.cc
index 948e7672..6487453f 100644
--- a/third_party/blink/renderer/modules/webaudio/audio_buffer_source_node.cc
+++ b/third_party/blink/renderer/modules/webaudio/audio_buffer_source_node.cc
@@ -28,6 +28,7 @@
 #include "base/numerics/safe_conversions.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_audio_buffer_source_options.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_buffer_source_node.h"
+#include "third_party/blink/renderer/modules/webaudio/audio_graph_tracer.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_node_output.h"
 #include "third_party/blink/renderer/modules/webaudio/base_audio_context.h"
 #include "third_party/blink/renderer/platform/audio/audio_utilities.h"
diff --git a/third_party/blink/renderer/modules/webaudio/audio_destination_node.cc b/third_party/blink/renderer/modules/webaudio/audio_destination_node.cc
index c85f6d2..86c269520 100644
--- a/third_party/blink/renderer/modules/webaudio/audio_destination_node.cc
+++ b/third_party/blink/renderer/modules/webaudio/audio_destination_node.cc
@@ -25,6 +25,7 @@
 
 #include "third_party/blink/renderer/modules/webaudio/audio_destination_node.h"
 
+#include "third_party/blink/renderer/modules/webaudio/audio_graph_tracer.h"
 #include "third_party/blink/renderer/modules/webaudio/base_audio_context.h"
 
 namespace blink {
diff --git a/third_party/blink/renderer/modules/webaudio/audio_scheduled_source_node.h b/third_party/blink/renderer/modules/webaudio/audio_scheduled_source_node.h
index e1bff29..56df4d3 100644
--- a/third_party/blink/renderer/modules/webaudio/audio_scheduled_source_node.h
+++ b/third_party/blink/renderer/modules/webaudio/audio_scheduled_source_node.h
@@ -34,6 +34,10 @@
 #include "third_party/blink/renderer/bindings/core/v8/active_script_wrappable.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_node.h"
 
+namespace base {
+class SingleThreadTaskRunner;
+}
+
 namespace blink {
 
 class BaseAudioContext;
diff --git a/third_party/blink/renderer/modules/webaudio/audio_worklet_node.cc b/third_party/blink/renderer/modules/webaudio/audio_worklet_node.cc
index b536966..dcc8cbd2 100644
--- a/third_party/blink/renderer/modules/webaudio/audio_worklet_node.cc
+++ b/third_party/blink/renderer/modules/webaudio/audio_worklet_node.cc
@@ -13,6 +13,7 @@
 #include "third_party/blink/renderer/core/messaging/message_port.h"
 #include "third_party/blink/renderer/modules/event_modules.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_buffer.h"
+#include "third_party/blink/renderer/modules/webaudio/audio_graph_tracer.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_node_input.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_node_output.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_worklet.h"
diff --git a/third_party/blink/renderer/modules/webaudio/biquad_filter_node.cc b/third_party/blink/renderer/modules/webaudio/biquad_filter_node.cc
index 89e5060..e4233bc 100644
--- a/third_party/blink/renderer/modules/webaudio/biquad_filter_node.cc
+++ b/third_party/blink/renderer/modules/webaudio/biquad_filter_node.cc
@@ -31,6 +31,7 @@
 #include "third_party/blink/renderer/bindings/modules/v8/v8_biquad_filter_options.h"
 #include "third_party/blink/renderer/core/inspector/console_message.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_basic_processor_handler.h"
+#include "third_party/blink/renderer/modules/webaudio/audio_graph_tracer.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_node_output.h"
 #include "third_party/blink/renderer/platform/bindings/exception_messages.h"
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
diff --git a/third_party/blink/renderer/modules/webaudio/channel_merger_node.cc b/third_party/blink/renderer/modules/webaudio/channel_merger_node.cc
index 38eb0578..9ac2332a 100644
--- a/third_party/blink/renderer/modules/webaudio/channel_merger_node.cc
+++ b/third_party/blink/renderer/modules/webaudio/channel_merger_node.cc
@@ -30,6 +30,7 @@
 
 #include "third_party/blink/renderer/bindings/modules/v8/v8_channel_merger_options.h"
 #include "third_party/blink/renderer/core/execution_context/execution_context.h"
+#include "third_party/blink/renderer/modules/webaudio/audio_graph_tracer.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_node_input.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_node_output.h"
 #include "third_party/blink/renderer/modules/webaudio/base_audio_context.h"
diff --git a/third_party/blink/renderer/modules/webaudio/channel_splitter_node.cc b/third_party/blink/renderer/modules/webaudio/channel_splitter_node.cc
index dd72c09b..7a426e6a 100644
--- a/third_party/blink/renderer/modules/webaudio/channel_splitter_node.cc
+++ b/third_party/blink/renderer/modules/webaudio/channel_splitter_node.cc
@@ -26,6 +26,7 @@
 #include "third_party/blink/renderer/modules/webaudio/channel_splitter_node.h"
 
 #include "third_party/blink/renderer/bindings/modules/v8/v8_channel_splitter_options.h"
+#include "third_party/blink/renderer/modules/webaudio/audio_graph_tracer.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_node_input.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_node_output.h"
 #include "third_party/blink/renderer/modules/webaudio/base_audio_context.h"
diff --git a/third_party/blink/renderer/modules/webaudio/constant_source_node.cc b/third_party/blink/renderer/modules/webaudio/constant_source_node.cc
index 1393ad1f..ef77f3a 100644
--- a/third_party/blink/renderer/modules/webaudio/constant_source_node.cc
+++ b/third_party/blink/renderer/modules/webaudio/constant_source_node.cc
@@ -7,6 +7,7 @@
 #include <algorithm>
 
 #include "third_party/blink/renderer/bindings/modules/v8/v8_constant_source_options.h"
+#include "third_party/blink/renderer/modules/webaudio/audio_graph_tracer.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_node_output.h"
 #include "third_party/blink/renderer/platform/audio/audio_utilities.h"
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
diff --git a/third_party/blink/renderer/modules/webaudio/convolver_node.cc b/third_party/blink/renderer/modules/webaudio/convolver_node.cc
index 686630e..d0f5e9a 100644
--- a/third_party/blink/renderer/modules/webaudio/convolver_node.cc
+++ b/third_party/blink/renderer/modules/webaudio/convolver_node.cc
@@ -30,6 +30,7 @@
 #include "base/metrics/histogram_macros.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_convolver_options.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_buffer.h"
+#include "third_party/blink/renderer/modules/webaudio/audio_graph_tracer.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_node_input.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_node_output.h"
 #include "third_party/blink/renderer/platform/audio/reverb.h"
diff --git a/third_party/blink/renderer/modules/webaudio/delay_node.cc b/third_party/blink/renderer/modules/webaudio/delay_node.cc
index 3e62c31..9b0e61c 100644
--- a/third_party/blink/renderer/modules/webaudio/delay_node.cc
+++ b/third_party/blink/renderer/modules/webaudio/delay_node.cc
@@ -29,6 +29,7 @@
 
 #include "third_party/blink/renderer/bindings/modules/v8/v8_delay_options.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_basic_processor_handler.h"
+#include "third_party/blink/renderer/modules/webaudio/audio_graph_tracer.h"
 #include "third_party/blink/renderer/modules/webaudio/delay_processor.h"
 #include "third_party/blink/renderer/platform/bindings/exception_messages.h"
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
diff --git a/third_party/blink/renderer/modules/webaudio/dynamics_compressor_node.cc b/third_party/blink/renderer/modules/webaudio/dynamics_compressor_node.cc
index 46803a8..cf4127c 100644
--- a/third_party/blink/renderer/modules/webaudio/dynamics_compressor_node.cc
+++ b/third_party/blink/renderer/modules/webaudio/dynamics_compressor_node.cc
@@ -26,6 +26,7 @@
 #include "third_party/blink/renderer/modules/webaudio/dynamics_compressor_node.h"
 
 #include "third_party/blink/renderer/bindings/modules/v8/v8_dynamics_compressor_options.h"
+#include "third_party/blink/renderer/modules/webaudio/audio_graph_tracer.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_node_input.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_node_output.h"
 #include "third_party/blink/renderer/platform/audio/audio_utilities.h"
diff --git a/third_party/blink/renderer/modules/webaudio/gain_node.cc b/third_party/blink/renderer/modules/webaudio/gain_node.cc
index 46aa865..ed374a4 100644
--- a/third_party/blink/renderer/modules/webaudio/gain_node.cc
+++ b/third_party/blink/renderer/modules/webaudio/gain_node.cc
@@ -24,7 +24,9 @@
  */
 
 #include "third_party/blink/renderer/modules/webaudio/gain_node.h"
+
 #include "third_party/blink/renderer/bindings/modules/v8/v8_gain_options.h"
+#include "third_party/blink/renderer/modules/webaudio/audio_graph_tracer.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_node_input.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_node_output.h"
 #include "third_party/blink/renderer/platform/audio/audio_bus.h"
diff --git a/third_party/blink/renderer/modules/webaudio/iir_filter_node.cc b/third_party/blink/renderer/modules/webaudio/iir_filter_node.cc
index 0b61c25..56148a3 100644
--- a/third_party/blink/renderer/modules/webaudio/iir_filter_node.cc
+++ b/third_party/blink/renderer/modules/webaudio/iir_filter_node.cc
@@ -9,6 +9,7 @@
 #include "base/metrics/histogram_functions.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_iir_filter_options.h"
 #include "third_party/blink/renderer/core/inspector/console_message.h"
+#include "third_party/blink/renderer/modules/webaudio/audio_graph_tracer.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_node_output.h"
 #include "third_party/blink/renderer/modules/webaudio/base_audio_context.h"
 #include "third_party/blink/renderer/platform/bindings/exception_messages.h"
diff --git a/third_party/blink/renderer/modules/webaudio/media_element_audio_source_node.cc b/third_party/blink/renderer/modules/webaudio/media_element_audio_source_node.cc
index 1f179e1..15169c6 100644
--- a/third_party/blink/renderer/modules/webaudio/media_element_audio_source_node.cc
+++ b/third_party/blink/renderer/modules/webaudio/media_element_audio_source_node.cc
@@ -33,6 +33,7 @@
 #include "third_party/blink/renderer/core/html/media/html_media_element.h"
 #include "third_party/blink/renderer/core/inspector/console_message.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_context.h"
+#include "third_party/blink/renderer/modules/webaudio/audio_graph_tracer.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_node_output.h"
 #include "third_party/blink/renderer/platform/audio/audio_utilities.h"
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
diff --git a/third_party/blink/renderer/modules/webaudio/media_element_audio_source_node.h b/third_party/blink/renderer/modules/webaudio/media_element_audio_source_node.h
index b977f3ea..909c42b 100644
--- a/third_party/blink/renderer/modules/webaudio/media_element_audio_source_node.h
+++ b/third_party/blink/renderer/modules/webaudio/media_element_audio_source_node.h
@@ -30,6 +30,7 @@
 #include "base/memory/scoped_refptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_annotations.h"
+#include "third_party/blink/renderer/bindings/core/v8/active_script_wrappable.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_node.h"
 #include "third_party/blink/renderer/platform/audio/audio_source_provider_client.h"
 #include "third_party/blink/renderer/platform/audio/media_multi_channel_resampler.h"
diff --git a/third_party/blink/renderer/modules/webaudio/media_stream_audio_destination_node.cc b/third_party/blink/renderer/modules/webaudio/media_stream_audio_destination_node.cc
index 0725fe2..2f232ae 100644
--- a/third_party/blink/renderer/modules/webaudio/media_stream_audio_destination_node.cc
+++ b/third_party/blink/renderer/modules/webaudio/media_stream_audio_destination_node.cc
@@ -29,6 +29,7 @@
 #include "third_party/blink/renderer/bindings/modules/v8/v8_audio_node_options.h"
 #include "third_party/blink/renderer/modules/mediastream/media_stream_utils.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_context.h"
+#include "third_party/blink/renderer/modules/webaudio/audio_graph_tracer.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_node_input.h"
 #include "third_party/blink/renderer/modules/webaudio/base_audio_context.h"
 #include "third_party/blink/renderer/platform/bindings/exception_messages.h"
diff --git a/third_party/blink/renderer/modules/webaudio/media_stream_audio_source_node.cc b/third_party/blink/renderer/modules/webaudio/media_stream_audio_source_node.cc
index dfad08b2..ad2f683 100644
--- a/third_party/blink/renderer/modules/webaudio/media_stream_audio_source_node.cc
+++ b/third_party/blink/renderer/modules/webaudio/media_stream_audio_source_node.cc
@@ -29,6 +29,7 @@
 #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_media_stream_audio_source_options.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_context.h"
+#include "third_party/blink/renderer/modules/webaudio/audio_graph_tracer.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_node_output.h"
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
 #include "third_party/blink/renderer/platform/instrumentation/tracing/trace_event.h"
diff --git a/third_party/blink/renderer/modules/webaudio/oscillator_node.cc b/third_party/blink/renderer/modules/webaudio/oscillator_node.cc
index 62edb21..de4d147 100644
--- a/third_party/blink/renderer/modules/webaudio/oscillator_node.cc
+++ b/third_party/blink/renderer/modules/webaudio/oscillator_node.cc
@@ -27,6 +27,7 @@
 #include <limits>
 
 #include "build/build_config.h"
+#include "third_party/blink/renderer/modules/webaudio/audio_graph_tracer.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_node_output.h"
 #include "third_party/blink/renderer/modules/webaudio/oscillator_node.h"
 #include "third_party/blink/renderer/modules/webaudio/periodic_wave.h"
diff --git a/third_party/blink/renderer/modules/webaudio/panner_node.cc b/third_party/blink/renderer/modules/webaudio/panner_node.cc
index 1d8c2083..b8c3745 100644
--- a/third_party/blink/renderer/modules/webaudio/panner_node.cc
+++ b/third_party/blink/renderer/modules/webaudio/panner_node.cc
@@ -29,6 +29,7 @@
 #include "third_party/blink/renderer/bindings/modules/v8/v8_panner_options.h"
 #include "third_party/blink/renderer/core/execution_context/execution_context.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_buffer_source_node.h"
+#include "third_party/blink/renderer/modules/webaudio/audio_graph_tracer.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_node_input.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_node_output.h"
 #include "third_party/blink/renderer/modules/webaudio/base_audio_context.h"
diff --git a/third_party/blink/renderer/modules/webaudio/script_processor_node.cc b/third_party/blink/renderer/modules/webaudio/script_processor_node.cc
index 2d79a73..d713bd49 100644
--- a/third_party/blink/renderer/modules/webaudio/script_processor_node.cc
+++ b/third_party/blink/renderer/modules/webaudio/script_processor_node.cc
@@ -34,6 +34,7 @@
 #include "third_party/blink/renderer/core/frame/local_dom_window.h"
 #include "third_party/blink/renderer/core/inspector/console_message.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_buffer.h"
+#include "third_party/blink/renderer/modules/webaudio/audio_graph_tracer.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_node_input.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_node_output.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_processing_event.h"
diff --git a/third_party/blink/renderer/modules/webaudio/script_processor_node.h b/third_party/blink/renderer/modules/webaudio/script_processor_node.h
index 708378d..d720fea 100644
--- a/third_party/blink/renderer/modules/webaudio/script_processor_node.h
+++ b/third_party/blink/renderer/modules/webaudio/script_processor_node.h
@@ -37,6 +37,10 @@
 #include "third_party/blink/renderer/platform/wtf/forward.h"
 #include "third_party/blink/renderer/platform/wtf/vector.h"
 
+namespace base {
+class SingleThreadTaskRunner;
+}
+
 namespace blink {
 
 class AudioBuffer;
diff --git a/third_party/blink/renderer/modules/webaudio/stereo_panner_node.cc b/third_party/blink/renderer/modules/webaudio/stereo_panner_node.cc
index caeba117..f922794 100644
--- a/third_party/blink/renderer/modules/webaudio/stereo_panner_node.cc
+++ b/third_party/blink/renderer/modules/webaudio/stereo_panner_node.cc
@@ -6,6 +6,7 @@
 
 #include "third_party/blink/renderer/bindings/modules/v8/v8_stereo_panner_options.h"
 #include "third_party/blink/renderer/core/execution_context/execution_context.h"
+#include "third_party/blink/renderer/modules/webaudio/audio_graph_tracer.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_node_input.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_node_output.h"
 #include "third_party/blink/renderer/modules/webaudio/base_audio_context.h"
diff --git a/third_party/blink/renderer/modules/webaudio/wave_shaper_dsp_kernel.cc b/third_party/blink/renderer/modules/webaudio/wave_shaper_dsp_kernel.cc
index fc2e1c6..175371b 100644
--- a/third_party/blink/renderer/modules/webaudio/wave_shaper_dsp_kernel.cc
+++ b/third_party/blink/renderer/modules/webaudio/wave_shaper_dsp_kernel.cc
@@ -31,6 +31,7 @@
 #include "build/build_config.h"
 #include "third_party/blink/renderer/platform/audio/audio_utilities.h"
 #include "third_party/blink/renderer/platform/audio/vector_math.h"
+#include "third_party/blink/renderer/platform/wtf/math_extras.h"
 #include "third_party/blink/renderer/platform/wtf/threading.h"
 
 #if defined(ARCH_CPU_X86_FAMILY)
diff --git a/third_party/blink/renderer/modules/webaudio/wave_shaper_node.cc b/third_party/blink/renderer/modules/webaudio/wave_shaper_node.cc
index 5828029..f3debc4 100644
--- a/third_party/blink/renderer/modules/webaudio/wave_shaper_node.cc
+++ b/third_party/blink/renderer/modules/webaudio/wave_shaper_node.cc
@@ -28,6 +28,7 @@
 #include <memory>
 
 #include "third_party/blink/renderer/bindings/modules/v8/v8_wave_shaper_options.h"
+#include "third_party/blink/renderer/modules/webaudio/audio_graph_tracer.h"
 #include "third_party/blink/renderer/modules/webaudio/base_audio_context.h"
 #include "third_party/blink/renderer/platform/bindings/exception_messages.h"
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
diff --git a/third_party/blink/renderer/platform/graphics/test/mock_paint_canvas.h b/third_party/blink/renderer/platform/graphics/test/mock_paint_canvas.h
index 74871e6..6682a2c 100644
--- a/third_party/blink/renderer/platform/graphics/test/mock_paint_canvas.h
+++ b/third_party/blink/renderer/platform/graphics/test/mock_paint_canvas.h
@@ -9,6 +9,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "third_party/blink/renderer/platform/graphics/paint/paint_flags.h"
 #include "third_party/blink/renderer/platform/graphics/paint/paint_image.h"
+#include "third_party/skia/include/core/SkTextBlob.h"
 
 namespace cc {
 class SkottieWrapper;
diff --git a/third_party/blink/renderer/platform/media/cdm_session_adapter.h b/third_party/blink/renderer/platform/media/cdm_session_adapter.h
index 61a4701..e0733da 100644
--- a/third_party/blink/renderer/platform/media/cdm_session_adapter.h
+++ b/third_party/blink/renderer/platform/media/cdm_session_adapter.h
@@ -21,6 +21,11 @@
 #include "third_party/blink/renderer/platform/media/web_content_decryption_module_impl.h"
 #include "third_party/blink/renderer/platform/platform_export.h"
 
+namespace base {
+class Time;
+class TimeTicks;
+}  // namespace base
+
 namespace media {
 
 struct CdmConfig;
diff --git a/ui/base/x/x11_move_loop_delegate.h b/ui/base/x/x11_move_loop_delegate.h
index a9ac233..b78e3874 100644
--- a/ui/base/x/x11_move_loop_delegate.h
+++ b/ui/base/x/x11_move_loop_delegate.h
@@ -5,6 +5,10 @@
 #ifndef UI_BASE_X_X11_MOVE_LOOP_DELEGATE_H_
 #define UI_BASE_X_X11_MOVE_LOOP_DELEGATE_H_
 
+namespace base {
+class TimeTicks;
+}
+
 namespace gfx {
 class Point;
 }
diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc
index e54ce60..06b218f 100644
--- a/ui/gfx/render_text.cc
+++ b/ui/gfx/render_text.cc
@@ -27,6 +27,7 @@
 #include "third_party/icu/source/common/unicode/utf16.h"
 #include "third_party/skia/include/core/SkDrawLooper.h"
 #include "third_party/skia/include/core/SkFontStyle.h"
+#include "third_party/skia/include/core/SkTextBlob.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/gfx/canvas.h"
diff --git a/ui/gfx/render_text_unittest.cc b/ui/gfx/render_text_unittest.cc
index 141650a..e1399bc 100644
--- a/ui/gfx/render_text_unittest.cc
+++ b/ui/gfx/render_text_unittest.cc
@@ -31,6 +31,7 @@
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkFontStyle.h"
 #include "third_party/skia/include/core/SkSurface.h"
+#include "third_party/skia/include/core/SkTextBlob.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "ui/gfx/break_list.h"
 #include "ui/gfx/canvas.h"
diff --git a/ui/ozone/platform/drm/host/gpu_thread_adapter.h b/ui/ozone/platform/drm/host/gpu_thread_adapter.h
index aa64e27..2612803 100644
--- a/ui/ozone/platform/drm/host/gpu_thread_adapter.h
+++ b/ui/ozone/platform/drm/host/gpu_thread_adapter.h
@@ -13,6 +13,10 @@
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/native_widget_types.h"
 
+namespace base {
+class FilePath;
+}
+
 namespace ui {
 
 class DrmDisplayHostManager;
diff --git a/ui/ozone/platform/wayland/emulate/wayland_input_emulate.cc b/ui/ozone/platform/wayland/emulate/wayland_input_emulate.cc
index d365526..15d5da14 100644
--- a/ui/ozone/platform/wayland/emulate/wayland_input_emulate.cc
+++ b/ui/ozone/platform/wayland/emulate/wayland_input_emulate.cc
@@ -11,6 +11,7 @@
 #include <memory>
 
 #include "base/logging.h"
+#include "base/time/time.h"
 #include "ui/events/keycodes/dom/keycode_converter.h"
 #include "ui/platform_window/common/platform_window_defaults.h"
 
diff --git a/ui/ozone/platform/wayland/host/wayland_data_drag_controller.h b/ui/ozone/platform/wayland/host/wayland_data_drag_controller.h
index 17c9605..cc033b9 100644
--- a/ui/ozone/platform/wayland/host/wayland_data_drag_controller.h
+++ b/ui/ozone/platform/wayland/host/wayland_data_drag_controller.h
@@ -19,6 +19,10 @@
 
 class SkBitmap;
 
+namespace base {
+class TimeTicks;
+}
+
 namespace ui {
 
 class OSExchangeData;