From a9ff98d59f57c53b1e64c690ed2ef8ec8d005cfc Mon Sep 17 00:00:00 2001
From: Andrew Wolfers <aswolfers@google.com>
Date: Tue, 11 Nov 2025 17:31:25 +0000
Subject: [PATCH] Cleanup includes in hwc3/ per IWYU style

Change-Id: I7a700723f495b24cd91524d0dae99177e35e447e
---
 hwc3/CommandResultWriter.h | 16 +++++++++-------
 hwc3/ComposerClient.cpp    |  4 ++++
 hwc3/ComposerClient.h      | 16 +++++++++++-----
 hwc3/DrmHwcThree.cpp       |  8 +++++---
 hwc3/service.cpp           |  2 +-
 5 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/hwc3/CommandResultWriter.h b/hwc3/CommandResultWriter.h
index 3c0ccd7..43999c4 100644
--- a/hwc3/CommandResultWriter.h
+++ b/hwc3/CommandResultWriter.h
@@ -17,17 +17,19 @@
 #include <unordered_map>
 #include <vector>
 
+#include <aidl/android/hardware/graphics/composer3/CommandError.h>
+#include <aidl/android/hardware/graphics/composer3/CommandResultPayload.h>
+#include <aidl/android/hardware/graphics/composer3/PresentFence.h>
+#include <aidl/android/hardware/graphics/composer3/PresentOrValidate.h>
+#include <aidl/android/hardware/graphics/composer3/ReleaseFences.h>
 #include <android-base/unique_fd.h>
 
-#include "Utils.h"
-#include "aidl/android/hardware/graphics/composer3/CommandError.h"
-#include "aidl/android/hardware/graphics/composer3/CommandResultPayload.h"
-#include "aidl/android/hardware/graphics/composer3/PresentFence.h"
-#include "aidl/android/hardware/graphics/composer3/PresentOrValidate.h"
-#include "aidl/android/hardware/graphics/composer3/ReleaseFences.h"
-
 namespace aidl::android::hardware::graphics::composer3 {
 
+namespace hwc3 {
+enum class Error;
+}  // namespace hwc3
+
 struct DisplayChanges {
   std::optional<ChangedCompositionTypes> composition_changes;
   std::optional<DisplayRequest> display_request_changes;
diff --git a/hwc3/ComposerClient.cpp b/hwc3/ComposerClient.cpp
index 9a1604c..0051e54 100644
--- a/hwc3/ComposerClient.cpp
+++ b/hwc3/ComposerClient.cpp
@@ -41,15 +41,19 @@
 #include <utils/Trace.h>
 
 #include "bufferinfo/BufferInfo.h"
+#include "bufferinfo/BufferInfoGetter.h"
 #include "compositor/DisplayInfo.h"
 #include "hwc/HwcDisplay.h"
 #include "hwc/HwcDisplayConfigs.h"
 #include "hwc/HwcLayer.h"
+#include "hwc3/CommandResultWriter.h"
 #include "hwc3/DrmHwcThree.h"
 #include "hwc3/Utils.h"
 #include "stats/CompositionStatsAtomReporter.h"
 #include "stats/CompositionStatsPoller.h"
+#include "utils/fd.h"
 #include "utils/log.h"
+#include "utils/properties.h"
 
 using ::android::drm_hwcomposer::BufferBlendMode;
 using ::android::drm_hwcomposer::BufferColorSpace;
diff --git a/hwc3/ComposerClient.h b/hwc3/ComposerClient.h
index a2ddf4b..9e598c4 100644
--- a/hwc3/ComposerClient.h
+++ b/hwc3/ComposerClient.h
@@ -18,12 +18,10 @@
 
 #include <memory>
 
-#include "aidl/android/hardware/graphics/composer3/BnComposerClient.h"
-#include "aidl/android/hardware/graphics/composer3/LayerCommand.h"
+#include <aidl/android/hardware/graphics/composer3/BnComposerClient.h>
+#include <aidl/android/hardware/graphics/composer3/LayerCommand.h>
+
 #include "hwc/HwcLayer.h"
-#include "hwc3/CommandResultWriter.h"
-#include "hwc3/Utils.h"
-#include "utils/Mutex.h"
 
 using AidlPixelFormat = aidl::android::hardware::graphics::common::PixelFormat;
 using AidlNativeHandle = aidl::android::hardware::common::NativeHandle;
@@ -33,6 +31,14 @@ class CompositionStatsPoller;
 class HwcDisplay;
 }  // namespace android::drm_hwcomposer
 
+namespace aidl::android::hardware::graphics::composer3 {
+class CommandResultWriter;
+
+namespace hwc3 {
+enum class Error;
+}  // namespace hwc3
+}  // namespace aidl::android::hardware::graphics::composer3
+
 namespace aidl::android::hardware::graphics::composer3::impl {
 using AidlColorMode = ColorMode;
 
diff --git a/hwc3/DrmHwcThree.cpp b/hwc3/DrmHwcThree.cpp
index 0f15f73..daee85b 100644
--- a/hwc3/DrmHwcThree.cpp
+++ b/hwc3/DrmHwcThree.cpp
@@ -20,9 +20,11 @@
 
 #include <cinttypes>
 
-#include "Utils.h"
-#include "aidl/android/hardware/graphics/common/Dataspace.h"
-#include "aidl/android/hardware/graphics/common/DisplayHotplugEvent.h"
+#include <aidl/android/hardware/graphics/common/Dataspace.h>
+#include <aidl/android/hardware/graphics/common/DisplayHotplugEvent.h>
+
+#include "drm/DrmHwc.h"
+#include "hwc/HwcDisplay.h"
 
 namespace aidl::android::hardware::graphics::composer3::impl {
 
diff --git a/hwc3/service.cpp b/hwc3/service.cpp
index 4f69f1e..ac8cfb9 100644
--- a/hwc3/service.cpp
+++ b/hwc3/service.cpp
@@ -21,7 +21,7 @@
 #include <android/binder_process.h>
 #include <sched.h>
 
-#include "Composer.h"
+#include "hwc3/Composer.h"
 #include "utils/log.h"
 
 using aidl::android::hardware::graphics::composer3::impl::Composer;